From: <eg...@us...> - 2006-11-01 14:41:43
|
Revision: 7209 http://svn.sourceforge.net/cdk/?rev=7209&view=rev Author: egonw Date: 2006-11-01 06:41:33 -0800 (Wed, 01 Nov 2006) Log Message: ----------- Removed DescriptorEngine test. Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/MqsarAtomicTests.java trunk/cdk/src/org/openscience/cdk/test/MqsarBondTests.java trunk/cdk/src/org/openscience/cdk/test/MqsarMolecularTests.java Modified: trunk/cdk/src/org/openscience/cdk/test/MqsarAtomicTests.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/MqsarAtomicTests.java 2006-11-01 14:28:26 UTC (rev 7208) +++ trunk/cdk/src/org/openscience/cdk/test/MqsarAtomicTests.java 2006-11-01 14:41:33 UTC (rev 7209) @@ -27,13 +27,28 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.openscience.cdk.test.qsar.DescriptorEngineTest; -import org.openscience.cdk.test.qsar.descriptors.atomic.*; -import org.openscience.cdk.test.qsar.descriptors.bond.*; -import org.openscience.cdk.test.qsar.descriptors.molecular.*; -import org.openscience.cdk.test.qsar.model.R.*; -import org.openscience.cdk.test.qsar.model.R2.*; -import org.openscience.cdk.test.qsar.model.weka.*; +import org.openscience.cdk.test.qsar.descriptors.atomic.AtomDegreeDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.AtomHybridizationDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.AtomHybridizationVSEPRDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.AtomValenceDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.BondsToAtomDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.CovalentRadiusDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.DistanceToAtomDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.EffectiveAtomPolarizabilityDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.InductiveAtomicHardnessDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.InductiveAtomicSoftnessDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.IsProtonInAromaticSystemDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.IsProtonInConjugatedPiSystemDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.PartialPiChargeDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.PartialSigmaChargeDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.PartialTChargeMMFF94DescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.PartialTChargePEOEDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.PeriodicTablePositionDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.PiElectronegativityDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.ProtonTotalPartialChargeDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.RDFProtonDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.SigmaElectronegativityDescriptorTest; +import org.openscience.cdk.test.qsar.descriptors.atomic.VdWRadiusDescriptorTest; /** * TestSuite that runs all the sample tests. @@ -50,9 +65,6 @@ // Individual Tests - Please add correlatively - suite.addTest(DescriptorEngineTest.suite()); - - // from cdk.test.qsar.atomic suite.addTest(AtomDegreeDescriptorTest.suite()); suite.addTest(AtomHybridizationDescriptorTest.suite()); Modified: trunk/cdk/src/org/openscience/cdk/test/MqsarBondTests.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/MqsarBondTests.java 2006-11-01 14:28:26 UTC (rev 7208) +++ trunk/cdk/src/org/openscience/cdk/test/MqsarBondTests.java 2006-11-01 14:41:33 UTC (rev 7209) @@ -27,7 +27,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.openscience.cdk.test.qsar.DescriptorEngineTest; import org.openscience.cdk.test.qsar.descriptors.bond.BondPartialPiChargeDescriptorTest; import org.openscience.cdk.test.qsar.descriptors.bond.BondPartialSigmaChargeDescriptorTest; import org.openscience.cdk.test.qsar.descriptors.bond.BondPartialTChargeDescriptorTest; @@ -49,8 +48,6 @@ // Individual Tests - Please add correlatively - suite.addTest(DescriptorEngineTest.suite()); - // from cdk.test.qsar.bond suite.addTest(BondPartialPiChargeDescriptorTest.suite()); suite.addTest(BondPartialSigmaChargeDescriptorTest.suite()); Modified: trunk/cdk/src/org/openscience/cdk/test/MqsarMolecularTests.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/MqsarMolecularTests.java 2006-11-01 14:28:26 UTC (rev 7208) +++ trunk/cdk/src/org/openscience/cdk/test/MqsarMolecularTests.java 2006-11-01 14:41:33 UTC (rev 7209) @@ -27,7 +27,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.openscience.cdk.test.qsar.DescriptorEngineTest; import org.openscience.cdk.test.qsar.descriptors.molecular.APolDescriptorTest; import org.openscience.cdk.test.qsar.descriptors.molecular.AminoAcidCountDescriptorTest; import org.openscience.cdk.test.qsar.descriptors.molecular.AromaticAtomsCountDescriptorTest; @@ -83,8 +82,6 @@ TestSuite suite = new TestSuite("All QSAR Tests"); // Individual Tests - Please add correlatively - - suite.addTest(DescriptorEngineTest.suite()); // from cdk.test.qsar.molecular suite.addTest(AminoAcidCountDescriptorTest.suite()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |