From: <eg...@us...> - 2007-03-21 15:03:42
|
Revision: 8153 http://svn.sourceforge.net/cdk/?rev=8153&view=rev Author: egonw Date: 2007-03-21 08:03:39 -0700 (Wed, 21 Mar 2007) Log Message: ----------- Added more tests; Not all silicon things are working, neither is things with phosphate groups. Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/structgen/deterministic/GENMDeterministicGeneratorTest.java Modified: trunk/cdk/src/org/openscience/cdk/test/structgen/deterministic/GENMDeterministicGeneratorTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/structgen/deterministic/GENMDeterministicGeneratorTest.java 2007-03-21 11:32:54 UTC (rev 8152) +++ trunk/cdk/src/org/openscience/cdk/test/structgen/deterministic/GENMDeterministicGeneratorTest.java 2007-03-21 15:03:39 UTC (rev 8153) @@ -93,7 +93,6 @@ public void testAnotherOne() throws Exception { if (runSlowTests()) { GENMDeterministicGenerator gdg = new GENMDeterministicGenerator("C6H13O2N1",""); - MyStructureGenerationListener myListener = new MyStructureGenerationListener(); gdg.generate(); assertEquals(23946, gdg.getNumberOfStructures()); } @@ -147,6 +146,74 @@ assertTrue(uniqueSMILES.contains("CC(C)C")); } + /** + * @cdk.bug 1678346 + */ + public void testPhosphate() throws Exception { + GENMDeterministicGenerator gdg = new GENMDeterministicGenerator("H2P1O4",""); + MyStructureGenerationListener myListener = new MyStructureGenerationListener(); + gdg.addListener(myListener); + gdg.generate(); + List structures = myListener.getStructures(); + assertEquals(2, structures.size()); + assertOK(structures); + List uniqueSMILES = assertUnique(structures); +// System.out.println("List: " + uniqueSMILES); + assertTrue(uniqueSMILES.contains("OP(=O)(=O)O")); + } + + public void testDichloroEthane() throws Exception { + GENMDeterministicGenerator gdg = new GENMDeterministicGenerator("C2H4F2",""); + MyStructureGenerationListener myListener = new MyStructureGenerationListener(); + gdg.addListener(myListener); + gdg.generate(); + List structures = myListener.getStructures(); + assertEquals(2, structures.size()); + assertOK(structures); + List uniqueSMILES = assertUnique(structures); + System.out.println("List: " + uniqueSMILES); + assertTrue(uniqueSMILES.contains("FCCF")); + } + + public void testTMS() throws Exception { + GENMDeterministicGenerator gdg = new GENMDeterministicGenerator("C4H12Si1",""); + MyStructureGenerationListener myListener = new MyStructureGenerationListener(); + gdg.addListener(myListener); + gdg.generate(); + List structures = myListener.getStructures(); + assertEquals(1, structures.size()); + assertOK(structures); + List uniqueSMILES = assertUnique(structures); + System.out.println("List: " + uniqueSMILES); + assertTrue(uniqueSMILES.contains("C[Si](C)(C)C")); + } + + public void testMMS() throws Exception { + GENMDeterministicGenerator gdg = new GENMDeterministicGenerator("C1H6Si1",""); + MyStructureGenerationListener myListener = new MyStructureGenerationListener(); + gdg.addListener(myListener); + gdg.generate(); + List structures = myListener.getStructures(); + assertEquals(1, structures.size()); + assertOK(structures); + List uniqueSMILES = assertUnique(structures); + System.out.println("List: " + uniqueSMILES); + assertTrue(uniqueSMILES.contains("C[Si](C)(C)C")); + } + + public void testDMS() throws Exception { + GENMDeterministicGenerator gdg = new GENMDeterministicGenerator("C2H8Si1",""); + MyStructureGenerationListener myListener = new MyStructureGenerationListener(); + gdg.addListener(myListener); + gdg.generate(); + List structures = myListener.getStructures(); + assertEquals(1, structures.size()); + assertOK(structures); + List uniqueSMILES = assertUnique(structures); + System.out.println("List: " + uniqueSMILES); + assertTrue(uniqueSMILES.contains("C[Si](C)(C)C")); + } + private List assertUnique(List structures) { List uniques = new ArrayList(); Iterator structs = structures.iterator(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |