From: <raj...@us...> - 2006-11-13 17:00:54
|
Revision: 7290 http://svn.sourceforge.net/cdk/?rev=7290&view=rev Author: rajarshi Date: 2006-11-13 07:13:37 -0800 (Mon, 13 Nov 2006) Log Message: ----------- Added a test case for the new bonds() method of AtomContainer Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/AtomContainerTest.java Modified: trunk/cdk/src/org/openscience/cdk/test/AtomContainerTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/AtomContainerTest.java 2006-11-13 15:03:21 UTC (rev 7289) +++ trunk/cdk/src/org/openscience/cdk/test/AtomContainerTest.java 2006-11-13 15:13:37 UTC (rev 7290) @@ -24,27 +24,15 @@ */ package org.openscience.cdk.test; -import java.util.Enumeration; -import javax.vecmath.Point2d; - import junit.framework.Test; import junit.framework.TestSuite; - import org.openscience.cdk.CDKConstants; import org.openscience.cdk.DefaultChemObjectBuilder; -import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.interfaces.IAtomContainer; -import org.openscience.cdk.interfaces.IAtomParity; -import org.openscience.cdk.interfaces.IBond; -import org.openscience.cdk.interfaces.IChemObjectBuilder; -import org.openscience.cdk.interfaces.IChemObjectListener; -import org.openscience.cdk.interfaces.IElectronContainer; -import org.openscience.cdk.interfaces.ILonePair; -import org.openscience.cdk.interfaces.IMolecule; -import org.openscience.cdk.interfaces.ISingleElectron; -import org.openscience.cdk.interfaces.IChemObjectChangeEvent; +import org.openscience.cdk.interfaces.*; +import javax.vecmath.Point2d; + /** * Checks the funcitonality of the AtomContainer. * @@ -819,6 +807,44 @@ assertFalse(atomIter.hasNext()); } + public void testBonds() { + // acetone molecule + IMolecule acetone = builder.newMolecule(); + IAtom c1 = builder.newAtom("C"); + IAtom c2 = builder.newAtom("C"); + IAtom o = builder.newAtom("O"); + IAtom c3 = builder.newAtom("C"); + acetone.addAtom(c1); + acetone.addAtom(c2); + acetone.addAtom(c3); + acetone.addAtom(o); + + IBond bond1 = builder.newBond(c1,c2,1); + IBond bond2 = builder.newBond(c2,o,2); + IBond bond3 = builder.newBond(c2,c3,1); + acetone.addBond(bond1); + acetone.addBond(bond2); + acetone.addBond(bond3); + + java.util.Iterator bonds = acetone.bonds(); + assertNotNull(bonds); + assertTrue(bonds.hasNext()); + + IBond next = (IBond) bonds.next(); + assertTrue(next instanceof IBond); + assertEquals(bond1, next); + + next = (IBond) bonds.next(); + assertTrue(next instanceof IBond); + assertEquals(bond2, next); + + next = (IBond) bonds.next(); + assertTrue(next instanceof IBond); + assertEquals(bond3, next); + + assertFalse(bonds.hasNext()); + } + public void testContains_IAtom() { // acetone molecule IMolecule acetone = builder.newMolecule(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |