From: <eg...@us...> - 2008-10-28 21:51:49
|
Revision: 12862 http://cdk.svn.sourceforge.net/cdk/?rev=12862&view=rev Author: egonw Date: 2008-10-28 21:51:39 +0000 (Tue, 28 Oct 2008) Log Message: ----------- Fixed a few test class instantiation problems Modified Paths: -------------- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/graph/invariant/ConjugatedPiSystemsDetectorTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/modulesuites/MreactionTests.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionChainTest.java cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionEngineTest.java Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/graph/invariant/ConjugatedPiSystemsDetectorTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/graph/invariant/ConjugatedPiSystemsDetectorTest.java 2008-10-28 21:51:22 UTC (rev 12861) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/graph/invariant/ConjugatedPiSystemsDetectorTest.java 2008-10-28 21:51:39 UTC (rev 12862) @@ -24,15 +24,24 @@ */ package org.openscience.cdk.graph.invariant; +import java.io.InputStream; + import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; +import org.openscience.cdk.CDKTestCase; import org.openscience.cdk.ChemFile; import org.openscience.cdk.ChemObject; -import org.openscience.cdk.CDKTestCase; import org.openscience.cdk.aromaticity.CDKHueckelAromaticityDetector; import org.openscience.cdk.exception.CDKException; -import org.openscience.cdk.interfaces.*; +import org.openscience.cdk.interfaces.IAtomContainer; +import org.openscience.cdk.interfaces.IAtomContainerSet; +import org.openscience.cdk.interfaces.IChemFile; +import org.openscience.cdk.interfaces.IChemModel; +import org.openscience.cdk.interfaces.IChemObjectBuilder; +import org.openscience.cdk.interfaces.IChemSequence; +import org.openscience.cdk.interfaces.IMolecule; +import org.openscience.cdk.interfaces.IMoleculeSet; import org.openscience.cdk.io.CMLReader; import org.openscience.cdk.io.MDLReader; import org.openscience.cdk.io.MDLV2000Reader; @@ -42,8 +51,6 @@ import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.AtomContainerManipulator; -import java.io.InputStream; - /** * Checks the functionality of the ConjugatedPiSystemsCalculator. * @@ -51,16 +58,17 @@ */ public class ConjugatedPiSystemsDetectorTest extends CDKTestCase { - private final static IChemObjectBuilder builder = NoNotificationChemObjectBuilder.getInstance(); - LonePairElectronChecker lpcheck = new LonePairElectronChecker(); + private static IChemObjectBuilder builder; + private static LonePairElectronChecker lpcheck; - private LoggingTool logger; + private static LoggingTool logger; - @Before - public void ConjugatedPiSystemsDetectorTest(String name) - { - logger = new LoggingTool(this); - } + @BeforeClass + public static void setup() { + logger = new LoggingTool(ConjugatedPiSystemsDetectorTest.class); + builder = NoNotificationChemObjectBuilder.getInstance(); + lpcheck = new LonePairElectronChecker(); + } @Test public void testDetectButadiene() throws Exception Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/modulesuites/MreactionTests.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/modulesuites/MreactionTests.java 2008-10-28 21:51:22 UTC (rev 12861) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/modulesuites/MreactionTests.java 2008-10-28 21:51:39 UTC (rev 12862) @@ -33,7 +33,6 @@ import org.openscience.cdk.graph.invariant.ConjugatedPiSystemsDetectorTest; import org.openscience.cdk.reaction.ReactionChainTest; import org.openscience.cdk.reaction.ReactionEngineTest; -import org.openscience.cdk.reaction.ReactionMechanismTest; import org.openscience.cdk.reaction.ReactionSpecificationTest; import org.openscience.cdk.reaction.mechanism.AdductionLPMechanismTest; import org.openscience.cdk.reaction.mechanism.AdductionPBMechanismTest; @@ -99,7 +98,6 @@ // Individual Tests suite.addTest(new JUnit4TestAdapter(ReactionChainTest.class)); suite.addTest(new JUnit4TestAdapter(ReactionEngineTest.class)); - suite.addTest(new JUnit4TestAdapter(ReactionMechanismTest.class)); suite.addTest(new JUnit4TestAdapter(ReactionSpecificationTest.class)); // from cdk.test.reaction.mechanism Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionChainTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionChainTest.java 2008-10-28 21:51:22 UTC (rev 12861) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionChainTest.java 2008-10-28 21:51:39 UTC (rev 12862) @@ -33,7 +33,7 @@ * * @cdk.module test-reaction */ -public abstract class ReactionChainTest extends CDKTestCase { +public class ReactionChainTest extends CDKTestCase { private final static IChemObjectBuilder builder = NoNotificationChemObjectBuilder.getInstance(); Modified: cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionEngineTest.java =================================================================== --- cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionEngineTest.java 2008-10-28 21:51:22 UTC (rev 12861) +++ cdk/branches/cdk-1.2.x/src/test/org/openscience/cdk/reaction/ReactionEngineTest.java 2008-10-28 21:51:39 UTC (rev 12862) @@ -31,7 +31,7 @@ * * @cdk.module test-reaction */ -public abstract class ReactionEngineTest extends CDKTestCase { +public class ReactionEngineTest extends CDKTestCase { /** * Constructor for the ReactionEngineTest object. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |