From: <eg...@us...> - 2008-12-09 07:12:39
|
Revision: 13512 http://cdk.svn.sourceforge.net/cdk/?rev=13512&view=rev Author: egonw Date: 2008-12-09 07:12:34 +0000 (Tue, 09 Dec 2008) Log Message: ----------- IElectronContainer batch of test fixes with get/setBuilder approach Modified Paths: -------------- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/BondTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/ElectronContainerTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/LonePairTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/SingleElectronTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugBondTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugElectronContainerTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugLonePairTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugSingleElectronTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNBondTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNElectronContainerTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNLonePairTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNSingleElectronTest.java Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/BondTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/BondTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/BondTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -24,35 +24,33 @@ */ package org.openscience.cdk; +import java.util.Iterator; + +import javax.vecmath.Point2d; +import javax.vecmath.Point3d; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IBond; -import org.openscience.cdk.interfaces.IChemObjectBuilder; -import javax.vecmath.Point2d; -import javax.vecmath.Point3d; -import java.util.Iterator; - /** * Checks the functionality of the Bond class. * * @cdk.module test-data * @see org.openscience.cdk.Bond */ -public class BondTest extends CDKTestCase { +public class BondTest extends ChemObjectTest { - protected static IChemObjectBuilder builder; - @BeforeClass public static void setUp() { - builder = DefaultChemObjectBuilder.getInstance(); + setBuilder(DefaultChemObjectBuilder.getInstance()); } @Test public void testBond() { - IBond bond = builder.newBond(); + IBond bond = getBuilder().newBond(); Assert.assertEquals(2, bond.getAtomCount()); Assert.assertNull(bond.getAtom(0)); Assert.assertNull(bond.getAtom(1)); @@ -62,13 +60,13 @@ @Test public void testBond_arrayIAtom() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); - IAtom atom4 = builder.newAtom("C"); - IAtom atom5 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); + IAtom atom4 = getBuilder().newAtom("C"); + IAtom atom5 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3, atom4, atom5}); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3, atom4, atom5}); Assert.assertEquals(5, bond1.getAtomCount()); Assert.assertEquals(atom1, bond1.getAtom(0)); Assert.assertEquals(atom2, bond1.getAtom(1)); @@ -76,13 +74,13 @@ @Test public void testBond_arrayIAtom_IBond_Order() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); - IAtom atom4 = builder.newAtom("C"); - IAtom atom5 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); + IAtom atom4 = getBuilder().newAtom("C"); + IAtom atom5 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3, atom4, atom5}, IBond.Order.SINGLE); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3, atom4, atom5}, IBond.Order.SINGLE); Assert.assertEquals(5, bond1.getAtomCount()); Assert.assertEquals(atom1, bond1.getAtom(0)); Assert.assertEquals(atom2, bond1.getAtom(1)); @@ -91,9 +89,9 @@ @Test public void testBond_IAtom_IAtom() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); - IBond bond = builder.newBond(c, o); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); + IBond bond = getBuilder().newBond(c, o); Assert.assertEquals(2, bond.getAtomCount()); Assert.assertEquals(c, bond.getAtom(0)); @@ -104,9 +102,9 @@ @Test public void testBond_IAtom_IAtom_IBond_Order() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); - IBond bond = builder.newBond(c, o, IBond.Order.DOUBLE); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); + IBond bond = getBuilder().newBond(c, o, IBond.Order.DOUBLE); Assert.assertEquals(2, bond.getAtomCount()); Assert.assertEquals(c, bond.getAtom(0)); @@ -117,9 +115,9 @@ @Test public void testBond_IAtom_IAtom_IBond_Order_int() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); - IBond bond = builder.newBond(c, o, IBond.Order.SINGLE, CDKConstants.STEREO_BOND_UP); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); + IBond bond = getBuilder().newBond(c, o, IBond.Order.SINGLE, CDKConstants.STEREO_BOND_UP); Assert.assertEquals(2, bond.getAtomCount()); Assert.assertEquals(c, bond.getAtom(0)); @@ -130,21 +128,21 @@ @Test public void testCompare_Object() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE); // C=O bond - IBond b2 = builder.newBond(c, o, IBond.Order.DOUBLE); // same C=O bond + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // C=O bond + IBond b2 = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // same C=O bond Assert.assertTrue(b.compare(b2)); } @Test public void testContains_IAtom() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // C=O bond Assert.assertTrue(b.contains(c)); Assert.assertTrue(b.contains(o)); @@ -152,10 +150,10 @@ @Test public void testGetAtomCount() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // C=O bond Assert.assertEquals(2.0, b.getAtomCount(), 0.001); } @@ -163,10 +161,10 @@ @Test public void testSetAtoms_arrayIAtom() { IAtom[] atomsToAdd = new IAtom[2]; - atomsToAdd[0] = builder.newAtom("C"); - atomsToAdd[1] = builder.newAtom("O"); + atomsToAdd[0] = getBuilder().newAtom("C"); + atomsToAdd[1] = getBuilder().newAtom("O"); - IBond b = builder.newBond(); + IBond b = getBuilder().newBond(); b.setAtoms(atomsToAdd); Assert.assertEquals(2, b.getAtomCount()); @@ -176,10 +174,10 @@ @Test public void testAtoms() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // C=O bond java.util.Iterator atoms = b.atoms().iterator(); Assert.assertEquals(2, b.getAtomCount()); @@ -192,10 +190,10 @@ @Test public void testGetAtom_int() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // C=O bond Assert.assertEquals(c, b.getAtom(0)); Assert.assertEquals(o, b.getAtom(1)); @@ -203,10 +201,10 @@ @Test public void testSetAtom_IAtom_int() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(); + IBond b = getBuilder().newBond(); b.setAtom(c, 0); b.setAtom(o, 1); @@ -216,26 +214,26 @@ @Test public void testGetConnectedAtom_IAtom() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE); // C=O bond Assert.assertEquals(c, b.getConnectedAtom(o)); Assert.assertEquals(o, b.getConnectedAtom(c)); // test default return value - Assert.assertNull(b.getConnectedAtom(builder.newAtom())); + Assert.assertNull(b.getConnectedAtom(getBuilder().newAtom())); } @Test public void testGetConnectedAtoms_IAtom() { IAtom[] atoms = new IAtom[3]; - atoms[0] = builder.newAtom("B"); - atoms[1] = builder.newAtom("H"); - atoms[2] = builder.newAtom("B"); + atoms[0] = getBuilder().newAtom("B"); + atoms[1] = getBuilder().newAtom("H"); + atoms[2] = getBuilder().newAtom("B"); - IBond b = builder.newBond(); + IBond b = getBuilder().newBond(); b.setAtoms(atoms); b.setOrder(IBond.Order.SINGLE); // C=O bond @@ -246,20 +244,20 @@ Assert.assertNotNull(connectedAtoms[1]); // test default return value - connectedAtoms = b.getConnectedAtoms(builder.newAtom()); + connectedAtoms = b.getConnectedAtoms(getBuilder().newAtom()); Assert.assertNull(connectedAtoms); } @Test public void testIsConnectedTo_IBond() { - IAtom c1 = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); - IAtom c2 = builder.newAtom("C"); - IAtom c3 = builder.newAtom("C"); + IAtom c1 = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); + IAtom c2 = getBuilder().newAtom("C"); + IAtom c3 = getBuilder().newAtom("C"); - IBond b1 = builder.newBond(c1, o); - IBond b2 = builder.newBond(o, c2); - IBond b3 = builder.newBond(c2, c3); + IBond b1 = getBuilder().newBond(c1, o); + IBond b2 = getBuilder().newBond(o, c2); + IBond b3 = getBuilder().newBond(c2, c3); Assert.assertTrue(b1.isConnectedTo(b2)); Assert.assertTrue(b2.isConnectedTo(b1)); @@ -271,14 +269,14 @@ @Test public void testGetOrder() { - IBond b = builder.newBond(builder.newAtom("C"), builder.newAtom("O"), IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(getBuilder().newAtom("C"), getBuilder().newAtom("O"), IBond.Order.DOUBLE); // C=O bond Assert.assertEquals(IBond.Order.DOUBLE, b.getOrder()); } @Test public void testSetOrder_IBond_Order() { - IBond b = builder.newBond(builder.newAtom("C"), builder.newAtom("O"), IBond.Order.DOUBLE); // C=O bond + IBond b = getBuilder().newBond(getBuilder().newAtom("C"), getBuilder().newAtom("O"), IBond.Order.DOUBLE); // C=O bond Assert.assertEquals(IBond.Order.DOUBLE, b.getOrder()); @@ -288,10 +286,10 @@ @Test public void testSetStereo_int() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE, CDKConstants.STEREO_BOND_DOWN); + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE, CDKConstants.STEREO_BOND_DOWN); b.setStereo(CDKConstants.STEREO_BOND_UP); Assert.assertEquals(CDKConstants.STEREO_BOND_UP, b.getStereo()); @@ -299,18 +297,18 @@ @Test public void testGetStereo() { - IAtom c = builder.newAtom("C"); - IAtom o = builder.newAtom("O"); + IAtom c = getBuilder().newAtom("C"); + IAtom o = getBuilder().newAtom("O"); - IBond b = builder.newBond(c, o, IBond.Order.DOUBLE, CDKConstants.STEREO_BOND_UP); + IBond b = getBuilder().newBond(c, o, IBond.Order.DOUBLE, CDKConstants.STEREO_BOND_UP); Assert.assertEquals(CDKConstants.STEREO_BOND_UP, b.getStereo()); } @Test public void testGet2DCenter() { - IAtom o = builder.newAtom("O", new Point2d(0.0, 0.0)); - IAtom c = builder.newAtom("C", new Point2d(1.0, 1.0)); - IBond b = builder.newBond(c, o); + IAtom o = getBuilder().newAtom("O", new Point2d(0.0, 0.0)); + IAtom c = getBuilder().newAtom("C", new Point2d(1.0, 1.0)); + IBond b = getBuilder().newBond(c, o); Assert.assertEquals(0.5, b.get2DCenter().x, 0.001); Assert.assertEquals(0.5, b.get2DCenter().y, 0.001); @@ -318,9 +316,9 @@ @Test public void testGet3DCenter() { - IAtom o = builder.newAtom("O", new Point3d(0.0, 0.0, 0.0)); - IAtom c = builder.newAtom("C", new Point3d(1.0, 1.0, 1.0)); - IBond b = builder.newBond(c, o); + IAtom o = getBuilder().newAtom("O", new Point3d(0.0, 0.0, 0.0)); + IAtom c = getBuilder().newAtom("C", new Point3d(1.0, 1.0, 1.0)); + IBond b = getBuilder().newBond(c, o); Assert.assertEquals(0.5, b.get3DCenter().x, 0.001); Assert.assertEquals(0.5, b.get3DCenter().y, 0.001); @@ -329,7 +327,7 @@ @Test public void testClone() throws Exception { - IBond bond = builder.newBond(); + IBond bond = getBuilder().newBond(); Object clone = bond.clone(); Assert.assertNotNull(clone); Assert.assertTrue(clone instanceof org.openscience.cdk.interfaces.IBond); @@ -337,9 +335,9 @@ @Test public void testClone_IAtom() throws Exception { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IBond bond = builder.newBond(atom1, atom2); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IBond bond = getBuilder().newBond(atom1, atom2); IBond clone = (IBond) bond.clone(); // test cloning of atoms @@ -349,9 +347,9 @@ @Test public void testClone_Order() throws Exception { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IBond bond = builder.newBond(atom1, atom2, IBond.Order.SINGLE); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IBond bond = getBuilder().newBond(atom1, atom2, IBond.Order.SINGLE); IBond clone = (IBond) bond.clone(); // test cloning of bond order @@ -361,9 +359,9 @@ @Test public void testClone_Stereo() throws Exception { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IBond bond = builder.newBond(atom1, atom2, IBond.Order.SINGLE, 1); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IBond bond = getBuilder().newBond(atom1, atom2, IBond.Order.SINGLE, 1); IBond clone = (IBond) bond.clone(); // test cloning of bond order @@ -376,7 +374,7 @@ */ @Test public void testToString() { - IBond bond = builder.newBond(); + IBond bond = getBuilder().newBond(); String description = bond.toString(); for (int i = 0; i < description.length(); i++) { Assert.assertTrue(description.charAt(i) != '\n'); @@ -386,11 +384,11 @@ @Test public void testMultiCenter1() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); - IBond bond = builder.newBond(new IAtom[]{atom1, atom2, atom3}); + IBond bond = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3}); Assert.assertEquals(3, bond.getAtomCount()); Assert.assertEquals(atom1, bond.getAtom(0)); Assert.assertEquals(atom2, bond.getAtom(1)); @@ -401,28 +399,28 @@ @Test public void testMultiCenterCompare() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3}); - IBond bond2 = builder.newBond(new IAtom[]{atom1, atom2, atom3}); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3}); + IBond bond2 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3}); Assert.assertTrue(bond1.compare(bond2)); - IAtom atom4 = builder.newAtom("C"); - IBond bond3 = builder.newBond(new IAtom[]{atom1, atom2, atom4}); + IAtom atom4 = getBuilder().newAtom("C"); + IBond bond3 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom4}); Assert.assertFalse(bond1.compare(bond3)); } @Test public void testMltiCenterContains() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); - IAtom atom4 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); + IAtom atom4 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3}); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3}); Assert.assertTrue(bond1.contains(atom1)); Assert.assertTrue(bond1.contains(atom2)); Assert.assertTrue(bond1.contains(atom3)); @@ -431,12 +429,12 @@ @Test public void testMultiCenterIterator() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); - IAtom atom4 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); + IAtom atom4 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3, atom4}); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3, atom4}); Iterator<IAtom> atoms = bond1.atoms().iterator(); int natom = 0; while (atoms.hasNext()) { @@ -448,14 +446,14 @@ @Test public void testMultiCenterConnectedAtoms() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); - IAtom atom4 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); + IAtom atom4 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3, atom4}); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3, atom4}); Assert.assertEquals(atom2, bond1.getConnectedAtom(atom1)); - Assert.assertNull(bond1.getConnectedAtom(builder.newAtom())); + Assert.assertNull(bond1.getConnectedAtom(getBuilder().newAtom())); IAtom[] conAtoms = bond1.getConnectedAtoms(atom1); boolean correct = true; @@ -481,16 +479,16 @@ @Test public void testMultiCenterIsConnectedTo() { - IAtom atom1 = builder.newAtom("C"); - IAtom atom2 = builder.newAtom("O"); - IAtom atom3 = builder.newAtom("C"); - IAtom atom4 = builder.newAtom("C"); - IAtom atom5 = builder.newAtom("C"); + IAtom atom1 = getBuilder().newAtom("C"); + IAtom atom2 = getBuilder().newAtom("O"); + IAtom atom3 = getBuilder().newAtom("C"); + IAtom atom4 = getBuilder().newAtom("C"); + IAtom atom5 = getBuilder().newAtom("C"); - IBond bond1 = builder.newBond(new IAtom[]{atom1, atom2, atom3}); - IBond bond2 = builder.newBond(new IAtom[]{atom2, atom3, atom4}); - IBond bond3 = builder.newBond(new IAtom[]{atom2, atom4}); - IBond bond4 = builder.newBond(new IAtom[]{atom5, atom4}); + IBond bond1 = getBuilder().newBond(new IAtom[]{atom1, atom2, atom3}); + IBond bond2 = getBuilder().newBond(new IAtom[]{atom2, atom3, atom4}); + IBond bond3 = getBuilder().newBond(new IAtom[]{atom2, atom4}); + IBond bond4 = getBuilder().newBond(new IAtom[]{atom5, atom4}); Assert.assertTrue(bond1.isConnectedTo(bond2)); Assert.assertTrue(bond2.isConnectedTo(bond1)); Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/ElectronContainerTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/ElectronContainerTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/ElectronContainerTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -28,8 +28,6 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openscience.cdk.DefaultChemObjectBuilder; -import org.openscience.cdk.interfaces.IChemObjectBuilder; import org.openscience.cdk.interfaces.IElectronContainer; /** @@ -39,22 +37,20 @@ * * @see org.openscience.cdk.ElectronContainer */ -public class ElectronContainerTest extends CDKTestCase { +public class ElectronContainerTest extends ChemObjectTest { - protected static IChemObjectBuilder builder; - @BeforeClass public static void setUp() { - builder = DefaultChemObjectBuilder.getInstance(); + setBuilder(DefaultChemObjectBuilder.getInstance()); } @Test public void testElectronContainer() { - IElectronContainer ec = builder.newElectronContainer(); + IElectronContainer ec = getBuilder().newElectronContainer(); Assert.assertNotNull(ec); Assert.assertEquals(0, ec.getElectronCount().intValue()); } @Test public void testSetElectronCount_Integer() { - IElectronContainer ec = builder.newElectronContainer(); + IElectronContainer ec = getBuilder().newElectronContainer(); ec.setElectronCount(3); Assert.assertEquals(3, ec.getElectronCount().intValue()); } @@ -63,19 +59,18 @@ } @Test public void testClone() throws Exception { - IElectronContainer ec = builder.newElectronContainer(); + IElectronContainer ec = getBuilder().newElectronContainer(); ec.setElectronCount(2); Object clone = ec.clone(); Assert.assertNotNull(clone); Assert.assertTrue(clone instanceof IElectronContainer); - Assert.assertEquals(ec.getElectronCount(), ((IElectronContainer)clone).getElectronCount()); } /** * Method to test whether the class complies with RFC #9. */ @Test public void testToString() { - IElectronContainer at = builder.newElectronContainer(); + IElectronContainer at = getBuilder().newElectronContainer(); String description = at.toString(); for (int i=0; i< description.length(); i++) { Assert.assertTrue(description.charAt(i) != '\n'); Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/LonePairTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/LonePairTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/LonePairTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -27,9 +27,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.interfaces.IChemObjectBuilder; import org.openscience.cdk.interfaces.ILonePair; /** @@ -39,67 +37,65 @@ * * @cdk.module test-data */ -public class LonePairTest extends CDKTestCase { +public class LonePairTest extends ElectronContainerTest { - protected static IChemObjectBuilder builder; - @BeforeClass public static void setUp() { - builder = DefaultChemObjectBuilder.getInstance(); + setBuilder(DefaultChemObjectBuilder.getInstance()); } @Test public void testLonePair() { - ILonePair lp = builder.newLonePair(); + ILonePair lp = getBuilder().newLonePair(); Assert.assertTrue(lp.getAtom() == null); Assert.assertEquals(2, lp.getElectronCount().intValue()); } @Test public void testLonePair_IAtom() { - IAtom atom = builder.newAtom("N"); - ILonePair lp = builder.newLonePair(atom); + IAtom atom = getBuilder().newAtom("N"); + ILonePair lp = getBuilder().newLonePair(atom); Assert.assertEquals(2, lp.getElectronCount().intValue()); Assert.assertEquals(atom, lp.getAtom()); Assert.assertTrue(lp.contains(atom)); } @Test public void testSetAtom_IAtom() { - IAtom atom = builder.newAtom("N"); - ILonePair lp = builder.newLonePair(); + IAtom atom = getBuilder().newAtom("N"); + ILonePair lp = getBuilder().newLonePair(); lp.setAtom(atom); Assert.assertEquals(atom, lp.getAtom()); } @Test public void testGetAtom() { - IAtom atom = builder.newAtom("N"); - ILonePair lp = builder.newLonePair(); + IAtom atom = getBuilder().newAtom("N"); + ILonePair lp = getBuilder().newLonePair(); Assert.assertNull(lp.getAtom()); lp.setAtom(atom); Assert.assertEquals(atom, lp.getAtom()); } @Test public void testGetElectronCount() { - ILonePair lp = builder.newLonePair(); + ILonePair lp = getBuilder().newLonePair(); Assert.assertEquals(2, lp.getElectronCount().intValue()); - lp = builder.newLonePair(builder.newAtom("N")); + lp = getBuilder().newLonePair(getBuilder().newAtom("N")); Assert.assertEquals(2, lp.getElectronCount().intValue()); } @Test public void testContains_IAtom() { - IAtom atom = builder.newAtom("N"); - ILonePair lp = builder.newLonePair(); + IAtom atom = getBuilder().newAtom("N"); + ILonePair lp = getBuilder().newLonePair(); lp.setAtom(atom); Assert.assertTrue(lp.contains(atom)); } @Test public void testClone() throws Exception { - ILonePair lp = builder.newLonePair(); + ILonePair lp = getBuilder().newLonePair(); Object clone = lp.clone(); Assert.assertTrue(clone instanceof ILonePair); } @Test public void testClone_IAtom() throws Exception { - IAtom atom = builder.newAtom("N"); - ILonePair lp = builder.newLonePair(); + IAtom atom = getBuilder().newAtom("N"); + ILonePair lp = getBuilder().newLonePair(); lp.setAtom(atom); // test cloning of atom @@ -109,7 +105,7 @@ /** Test for RFC #9 */ @Test public void testToString() { - ILonePair lp = builder.newLonePair(); + ILonePair lp = getBuilder().newLonePair(); String description = lp.toString(); for (int i=0; i< description.length(); i++) { Assert.assertTrue(description.charAt(i) != '\n'); Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/SingleElectronTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/SingleElectronTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/SingleElectronTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -27,9 +27,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.interfaces.IChemObjectBuilder; import org.openscience.cdk.interfaces.ISingleElectron; /** @@ -39,63 +37,61 @@ * * @cdk.module test-data */ -public class SingleElectronTest extends CDKTestCase { +public class SingleElectronTest extends ElectronContainerTest { - protected static IChemObjectBuilder builder; - @BeforeClass public static void setUp() { - builder = DefaultChemObjectBuilder.getInstance(); + setBuilder(DefaultChemObjectBuilder.getInstance()); } @Test public void testSingleElectron() { - ISingleElectron radical = builder.newSingleElectron(); + ISingleElectron radical = getBuilder().newSingleElectron(); Assert.assertTrue(radical.getAtom() == null); Assert.assertEquals(1, radical.getElectronCount().intValue()); } @Test public void testSingleElectron_IAtom() { - IAtom atom = builder.newAtom("N"); - ISingleElectron radical = builder.newSingleElectron(atom); + IAtom atom = getBuilder().newAtom("N"); + ISingleElectron radical = getBuilder().newSingleElectron(atom); Assert.assertEquals(1, radical.getElectronCount().intValue()); Assert.assertEquals(atom, radical.getAtom()); Assert.assertTrue(radical.contains(atom)); } @Test public void testGetElectronCount() { - ISingleElectron radical = builder.newSingleElectron(); + ISingleElectron radical = getBuilder().newSingleElectron(); Assert.assertEquals(1, radical.getElectronCount().intValue()); } @Test public void testContains_IAtom() { - IAtom atom = builder.newAtom("N"); - ISingleElectron radical = builder.newSingleElectron(atom); + IAtom atom = getBuilder().newAtom("N"); + ISingleElectron radical = getBuilder().newSingleElectron(atom); Assert.assertTrue(radical.contains(atom)); } @Test public void testSetAtom_IAtom() { - IAtom atom = builder.newAtom("N"); - ISingleElectron radical = builder.newSingleElectron(); + IAtom atom = getBuilder().newAtom("N"); + ISingleElectron radical = getBuilder().newSingleElectron(); Assert.assertNull(radical.getAtom()); radical.setAtom(atom); Assert.assertEquals(atom, radical.getAtom()); } @Test public void testGetAtom() { - IAtom atom = builder.newAtom("N"); - ISingleElectron radical = builder.newSingleElectron(atom); + IAtom atom = getBuilder().newAtom("N"); + ISingleElectron radical = getBuilder().newSingleElectron(atom); Assert.assertEquals(atom, radical.getAtom()); } @Test public void testClone() throws Exception { - ISingleElectron radical = builder.newSingleElectron(); + ISingleElectron radical = getBuilder().newSingleElectron(); Object clone = radical.clone(); Assert.assertNotNull(clone); Assert.assertTrue(clone instanceof ISingleElectron); } @Test public void testClone_IAtom() throws Exception { - IAtom atom = builder.newAtom("N"); - ISingleElectron radical = builder.newSingleElectron(); + IAtom atom = getBuilder().newAtom("N"); + ISingleElectron radical = getBuilder().newSingleElectron(); radical.setAtom(atom); // test cloning of atom @@ -105,7 +101,7 @@ /** Test for RFC #9 */ @Test public void testToString() { - ISingleElectron radical = builder.newSingleElectron(); + ISingleElectron radical = getBuilder().newSingleElectron(); String description = radical.toString(); for (int i=0; i< description.length(); i++) { Assert.assertTrue(description.charAt(i) != '\n'); Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugBondTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugBondTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugBondTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -25,7 +25,6 @@ package org.openscience.cdk.debug; import org.junit.BeforeClass; -import org.openscience.cdk.debug.DebugChemObjectBuilder; import org.openscience.cdk.BondTest; /** @@ -36,7 +35,7 @@ public class DebugBondTest extends BondTest { @BeforeClass public static void setUp() { - BondTest.builder = DebugChemObjectBuilder.getInstance(); + setBuilder(DebugChemObjectBuilder.getInstance()); } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugElectronContainerTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugElectronContainerTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugElectronContainerTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -36,7 +36,7 @@ public class DebugElectronContainerTest extends ElectronContainerTest { @BeforeClass public static void setUp() { - ElectronContainerTest.builder = DebugChemObjectBuilder.getInstance(); + setBuilder(DebugChemObjectBuilder.getInstance()); } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugLonePairTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugLonePairTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugLonePairTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -36,7 +36,7 @@ public class DebugLonePairTest extends LonePairTest { @BeforeClass public static void setUp() { - LonePairTest.builder = DebugChemObjectBuilder.getInstance(); + setBuilder(DebugChemObjectBuilder.getInstance()); } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugSingleElectronTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugSingleElectronTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/debug/DebugSingleElectronTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -36,7 +36,7 @@ public class DebugSingleElectronTest extends SingleElectronTest { @BeforeClass public static void setUp() { - SingleElectronTest.builder = DebugChemObjectBuilder.getInstance(); + setBuilder(DebugChemObjectBuilder.getInstance()); } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNBondTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNBondTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNBondTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -25,6 +25,7 @@ package org.openscience.cdk.nonotify; import org.junit.BeforeClass; +import org.junit.Test; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.BondTest; @@ -36,7 +37,33 @@ public class NNBondTest extends BondTest { @BeforeClass public static void setUp() { - BondTest.builder = NoNotificationChemObjectBuilder.getInstance(); + setBuilder(NoNotificationChemObjectBuilder.getInstance()); } + // Overwrite default methods: no notifications are expected! + + @Test public void testNotifyChanged() { + NNChemObjectTestHelper.testNotifyChanged(getBuilder()); + } + @Test public void testNotifyChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testNotifyChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testStateChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testStateChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testClone_ChemObjectListeners() throws Exception { + NNChemObjectTestHelper.testClone_ChemObjectListeners(getBuilder()); + } + @Test public void testAddListener_IChemObjectListener() { + NNChemObjectTestHelper.testAddListener_IChemObjectListener(getBuilder()); + } + @Test public void testGetListenerCount() { + NNChemObjectTestHelper.testGetListenerCount(getBuilder()); + } + @Test public void testRemoveListener_IChemObjectListener() { + NNChemObjectTestHelper.testRemoveListener_IChemObjectListener(getBuilder()); + } + @Test public void testSetNotification_true() { + NNChemObjectTestHelper.testSetNotification_true(getBuilder()); + } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNElectronContainerTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNElectronContainerTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNElectronContainerTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -25,6 +25,7 @@ package org.openscience.cdk.nonotify; import org.junit.BeforeClass; +import org.junit.Test; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.ElectronContainerTest; @@ -36,7 +37,33 @@ public class NNElectronContainerTest extends ElectronContainerTest { @BeforeClass public static void setUp() { - ElectronContainerTest.builder = NoNotificationChemObjectBuilder.getInstance(); + setBuilder(NoNotificationChemObjectBuilder.getInstance()); } + // Overwrite default methods: no notifications are expected! + + @Test public void testNotifyChanged() { + NNChemObjectTestHelper.testNotifyChanged(getBuilder()); + } + @Test public void testNotifyChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testNotifyChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testStateChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testStateChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testClone_ChemObjectListeners() throws Exception { + NNChemObjectTestHelper.testClone_ChemObjectListeners(getBuilder()); + } + @Test public void testAddListener_IChemObjectListener() { + NNChemObjectTestHelper.testAddListener_IChemObjectListener(getBuilder()); + } + @Test public void testGetListenerCount() { + NNChemObjectTestHelper.testGetListenerCount(getBuilder()); + } + @Test public void testRemoveListener_IChemObjectListener() { + NNChemObjectTestHelper.testRemoveListener_IChemObjectListener(getBuilder()); + } + @Test public void testSetNotification_true() { + NNChemObjectTestHelper.testSetNotification_true(getBuilder()); + } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNLonePairTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNLonePairTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNLonePairTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -25,6 +25,7 @@ package org.openscience.cdk.nonotify; import org.junit.BeforeClass; +import org.junit.Test; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.LonePairTest; @@ -36,7 +37,33 @@ public class NNLonePairTest extends LonePairTest { @BeforeClass public static void setUp() { - LonePairTest.builder = NoNotificationChemObjectBuilder.getInstance(); + setBuilder(NoNotificationChemObjectBuilder.getInstance()); } + // Overwrite default methods: no notifications are expected! + + @Test public void testNotifyChanged() { + NNChemObjectTestHelper.testNotifyChanged(getBuilder()); + } + @Test public void testNotifyChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testNotifyChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testStateChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testStateChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testClone_ChemObjectListeners() throws Exception { + NNChemObjectTestHelper.testClone_ChemObjectListeners(getBuilder()); + } + @Test public void testAddListener_IChemObjectListener() { + NNChemObjectTestHelper.testAddListener_IChemObjectListener(getBuilder()); + } + @Test public void testGetListenerCount() { + NNChemObjectTestHelper.testGetListenerCount(getBuilder()); + } + @Test public void testRemoveListener_IChemObjectListener() { + NNChemObjectTestHelper.testRemoveListener_IChemObjectListener(getBuilder()); + } + @Test public void testSetNotification_true() { + NNChemObjectTestHelper.testSetNotification_true(getBuilder()); + } } Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNSingleElectronTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNSingleElectronTest.java 2008-12-09 07:11:02 UTC (rev 13511) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/nonotify/NNSingleElectronTest.java 2008-12-09 07:12:34 UTC (rev 13512) @@ -25,6 +25,7 @@ package org.openscience.cdk.nonotify; import org.junit.BeforeClass; +import org.junit.Test; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.SingleElectronTest; @@ -36,7 +37,33 @@ public class NNSingleElectronTest extends SingleElectronTest { @BeforeClass public static void setUp() { - SingleElectronTest.builder = NoNotificationChemObjectBuilder.getInstance(); + setBuilder(NoNotificationChemObjectBuilder.getInstance()); } + // Overwrite default methods: no notifications are expected! + + @Test public void testNotifyChanged() { + NNChemObjectTestHelper.testNotifyChanged(getBuilder()); + } + @Test public void testNotifyChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testNotifyChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testStateChanged_IChemObjectChangeEvent() { + NNChemObjectTestHelper.testStateChanged_IChemObjectChangeEvent(getBuilder()); + } + @Test public void testClone_ChemObjectListeners() throws Exception { + NNChemObjectTestHelper.testClone_ChemObjectListeners(getBuilder()); + } + @Test public void testAddListener_IChemObjectListener() { + NNChemObjectTestHelper.testAddListener_IChemObjectListener(getBuilder()); + } + @Test public void testGetListenerCount() { + NNChemObjectTestHelper.testGetListenerCount(getBuilder()); + } + @Test public void testRemoveListener_IChemObjectListener() { + NNChemObjectTestHelper.testRemoveListener_IChemObjectListener(getBuilder()); + } + @Test public void testSetNotification_true() { + NNChemObjectTestHelper.testSetNotification_true(getBuilder()); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |