From: <eg...@us...> - 2007-07-01 18:15:57
|
Revision: 8471 http://svn.sourceforge.net/cdk/?rev=8471&view=rev Author: egonw Date: 2007-07-01 11:15:55 -0700 (Sun, 01 Jul 2007) Log Message: ----------- Now correctely moved to test-experimental Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/MexperimentalTests.java trunk/cdk/src/org/openscience/cdk/test/MextraTests.java trunk/cdk/src/org/openscience/cdk/test/atomtype/MM2AtomTypeMatcherTest.java Modified: trunk/cdk/src/org/openscience/cdk/test/MexperimentalTests.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/MexperimentalTests.java 2007-07-01 18:03:46 UTC (rev 8470) +++ trunk/cdk/src/org/openscience/cdk/test/MexperimentalTests.java 2007-07-01 18:15:55 UTC (rev 8471) @@ -23,6 +23,8 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.openscience.cdk.test.atomtype.MM2AtomTypeMatcherTest; +import org.openscience.cdk.test.atomtype.MMFF94AtomTypeMatcherTest; import org.openscience.cdk.test.io.VASPReaderTest; import org.openscience.cdk.test.tools.GenerateFragmentsTest; @@ -35,9 +37,14 @@ public static Test suite () { TestSuite suite= new TestSuite("The cdk.experimental Tests"); + suite.addTest(AssociationTest.suite()); suite.addTest(VASPReaderTest.suite()); suite.addTest(GenerateFragmentsTest.suite()); + // from cdk.test.atomtype + suite.addTest(MMFF94AtomTypeMatcherTest.suite()); + suite.addTest(MM2AtomTypeMatcherTest.suite()); + return suite; } Modified: trunk/cdk/src/org/openscience/cdk/test/MextraTests.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/MextraTests.java 2007-07-01 18:03:46 UTC (rev 8470) +++ trunk/cdk/src/org/openscience/cdk/test/MextraTests.java 2007-07-01 18:15:55 UTC (rev 8471) @@ -22,10 +22,19 @@ import junit.framework.Test; import junit.framework.TestSuite; + import org.openscience.cdk.applications.swing.MoleculeListViewer; -import org.openscience.cdk.test.applications.undoredo.*; -import org.openscience.cdk.test.atomtype.MM2AtomTypeMatcherTest; -import org.openscience.cdk.test.atomtype.MMFF94AtomTypeMatcherTest; +import org.openscience.cdk.test.applications.undoredo.AddAtomsAndBondsEditTest; +import org.openscience.cdk.test.applications.undoredo.AddHydrogenEditTest; +import org.openscience.cdk.test.applications.undoredo.AdjustBondOrdersEditTest; +import org.openscience.cdk.test.applications.undoredo.ChangeAtomSymbolEditTest; +import org.openscience.cdk.test.applications.undoredo.ChangeChargeEditTest; +import org.openscience.cdk.test.applications.undoredo.ChangeIsotopeEditTest; +import org.openscience.cdk.test.applications.undoredo.CleanUpEditTest; +import org.openscience.cdk.test.applications.undoredo.ConvertToPseudoAtomEditTest; +import org.openscience.cdk.test.applications.undoredo.ConvertToRadicalEditTest; +import org.openscience.cdk.test.applications.undoredo.FlipEditTest; +import org.openscience.cdk.test.applications.undoredo.RemoveAtomsAndBondsEditTest; import org.openscience.cdk.test.charges.GasteigerMarsiliPartialChargesTest; import org.openscience.cdk.test.charges.InductivePartialChargesTest; import org.openscience.cdk.test.charges.MMFF94PartialChargesTest; @@ -61,9 +70,6 @@ // Individual Tests // from cdk.test.applications // from cdk.test.aromaticity - // from cdk.test.atomtype - suite.addTest(MMFF94AtomTypeMatcherTest.suite()); - suite.addTest(MM2AtomTypeMatcherTest.suite()); // from cdk.test.dict suite.addTest(DictDBTest.suite()); // from cdk.test.charges Modified: trunk/cdk/src/org/openscience/cdk/test/atomtype/MM2AtomTypeMatcherTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/atomtype/MM2AtomTypeMatcherTest.java 2007-07-01 18:03:46 UTC (rev 8470) +++ trunk/cdk/src/org/openscience/cdk/test/atomtype/MM2AtomTypeMatcherTest.java 2007-07-01 18:15:55 UTC (rev 8471) @@ -20,7 +20,10 @@ */ package org.openscience.cdk.test.atomtype; +import java.io.InputStream; + import junit.framework.JUnit4TestAdapter; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -36,8 +39,6 @@ import org.openscience.cdk.tools.LoggingTool; import org.openscience.cdk.tools.manipulator.AtomTypeManipulator; -import java.io.InputStream; - /** * Checks the functionality of the AtomType-MMFF2AtomTypeMatcher. * @@ -55,7 +56,7 @@ } @BeforeClass public static void setUp() throws Exception { - logger = new LoggingTool(MM2AtomTypeMatcher.class); + logger = new LoggingTool(MM2AtomTypeMatcherTest.class); if (testMolecule == null) { // read the test file and percieve atom types This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |