From: <eg...@us...> - 2008-07-27 06:41:06
|
Revision: 11781 http://cdk.svn.sourceforge.net/cdk/?rev=11781&view=rev Author: egonw Date: 2008-07-27 06:41:04 +0000 (Sun, 27 Jul 2008) Log Message: ----------- Fixed Nightly builds: moved tests to correct suite Modified Paths: -------------- cdk/trunk/src/test/org/openscience/cdk/modulesuites/MexperimentalTests.java cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java Modified: cdk/trunk/src/test/org/openscience/cdk/modulesuites/MexperimentalTests.java =================================================================== --- cdk/trunk/src/test/org/openscience/cdk/modulesuites/MexperimentalTests.java 2008-07-27 02:52:44 UTC (rev 11780) +++ cdk/trunk/src/test/org/openscience/cdk/modulesuites/MexperimentalTests.java 2008-07-27 06:41:04 UTC (rev 11781) @@ -23,11 +23,10 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestSuite; + import org.openscience.cdk.AssociationTest; import org.openscience.cdk.atomtype.MM2AtomTypeMatcherTest; import org.openscience.cdk.atomtype.MMFF94AtomTypeMatcherTest; -import org.openscience.cdk.fingerprint.EStateFingerprinterTest; -import org.openscience.cdk.fingerprint.MACCSFingerprinterTest; import org.openscience.cdk.io.VASPReaderTest; import org.openscience.cdk.tools.GenerateFragmentsTest; @@ -49,9 +48,6 @@ suite.addTest(MMFF94AtomTypeMatcherTest.suite()); suite.addTest(MM2AtomTypeMatcherTest.suite()); - suite.addTest(new JUnit4TestAdapter(MACCSFingerprinterTest.class)); - suite.addTest(new JUnit4TestAdapter(EStateFingerprinterTest.class)); - return suite; } Modified: cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java =================================================================== --- cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java 2008-07-27 02:52:44 UTC (rev 11780) +++ cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java 2008-07-27 06:41:04 UTC (rev 11781) @@ -27,7 +27,9 @@ import org.openscience.cdk.CloneAtomContainerTest; import org.openscience.cdk.VariousTests; import org.openscience.cdk.applications.APIVersionTesterTest; +import org.openscience.cdk.fingerprint.EStateFingerprinterTest; import org.openscience.cdk.fingerprint.ExtendedFingerprinterTest; +import org.openscience.cdk.fingerprint.MACCSFingerprinterTest; import org.openscience.cdk.fingerprint.StandardSubstructureSetsTest; import org.openscience.cdk.fingerprint.SubstructureFingerprinterTest; import org.openscience.cdk.geometry.RDFCalculatorTest; @@ -84,7 +86,10 @@ suite.addTest(new JUnit4TestAdapter(StandardSubstructureSetsTest.class)); suite.addTest(new JUnit4TestAdapter(DeAromatizationToolTest.class)); suite.addTest(ShelXWriterTest.suite()); - + + suite.addTest(new JUnit4TestAdapter(MACCSFingerprinterTest.class)); + suite.addTest(new JUnit4TestAdapter(EStateFingerprinterTest.class)); + // Below are the tests that are not always possible to execute, because // the class might not be compiled (depeding on Ant and Java VM versions). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |