From: <mig...@us...> - 2008-03-18 12:25:26
|
Revision: 10439 http://cdk.svn.sourceforge.net/cdk/?rev=10439&view=rev Author: miguelrojasch Date: 2008-03-18 05:24:42 -0700 (Tue, 18 Mar 2008) Log Message: ----------- added parameters to the List objects Modified Paths: -------------- cdk/trunk/src/test/org/openscience/cdk/tools/manipulator/ReactionSetManipulatorTest.java Modified: cdk/trunk/src/test/org/openscience/cdk/tools/manipulator/ReactionSetManipulatorTest.java =================================================================== --- cdk/trunk/src/test/org/openscience/cdk/tools/manipulator/ReactionSetManipulatorTest.java 2008-03-18 12:08:14 UTC (rev 10438) +++ cdk/trunk/src/test/org/openscience/cdk/tools/manipulator/ReactionSetManipulatorTest.java 2008-03-18 12:24:42 UTC (rev 10439) @@ -79,9 +79,9 @@ } @Test public void testGetRelevantReaction_IReactionSet_IAtom() { - Iterator atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); + Iterator<IAtomContainer> atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); while (atomContainers.hasNext()) { - IAtomContainer container = (IAtomContainer)atomContainers.next(); + IAtomContainer container = atomContainers.next(); IAtom anAtom = container.getAtom(0); Assert.assertEquals( set.getReaction(0), @@ -91,9 +91,9 @@ } @Test public void testGetRelevantReaction_IReactionSet_IBond() { - Iterator atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); + Iterator<IAtomContainer> atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); while (atomContainers.hasNext()) { - IAtomContainer container = (IAtomContainer)atomContainers.next(); + IAtomContainer container = atomContainers.next(); IBond aBond = container.getBond(0); Assert.assertEquals( set.getReaction(0), @@ -103,9 +103,9 @@ } @Test public void testGetRelevantAtomContainer_IReactionSet_IAtom() { - Iterator atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); + Iterator<IAtomContainer> atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); while (atomContainers.hasNext()) { - IAtomContainer container = (IAtomContainer)atomContainers.next(); + IAtomContainer container = atomContainers.next(); IAtom anAtom = container.getAtom(0); Assert.assertEquals( container, @@ -115,9 +115,9 @@ } @Test public void testGetRelevantAtomContainer_IReactionSet_IBond() { - Iterator atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); + Iterator<IAtomContainer> atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); while (atomContainers.hasNext()) { - IAtomContainer container = (IAtomContainer)atomContainers.next(); + IAtomContainer container = atomContainers.next(); IBond aBond = container.getBond(0); Assert.assertEquals( container, @@ -128,12 +128,12 @@ @Test public void testSetAtomProperties_IReactionSet_Object_Object() throws Exception { ReactionSetManipulator.setAtomProperties(set, "test", "ok"); - Iterator atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); + Iterator<IAtomContainer> atomContainers = ReactionSetManipulator.getAllAtomContainers(set).iterator(); while (atomContainers.hasNext()) { - IAtomContainer container = (IAtomContainer)atomContainers.next(); - Iterator atoms = container.atoms(); + IAtomContainer container = atomContainers.next(); + Iterator<IAtom> atoms = container.atoms(); while (atoms.hasNext()) { - IAtom atom = (IAtom)atoms.next(); + IAtom atom = atoms.next(); Assert.assertNotNull(atom.getProperty("test")); Assert.assertEquals("ok", atom.getProperty("test")); } @@ -143,7 +143,7 @@ } @Test public void testGetAllChemObjects_IReactionSet() { - List allObjects = ReactionSetManipulator.getAllChemObjects(set); + List<IChemObject> allObjects = ReactionSetManipulator.getAllChemObjects(set); // does not recurse beyond the IAtomContainer, so: // set, reaction, 2xreactant, 1xproduct Assert.assertEquals(5, allObjects.size()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |