From: <eg...@us...> - 2008-01-20 21:11:29
|
Revision: 9936 http://cdk.svn.sourceforge.net/cdk/?rev=9936&view=rev Author: egonw Date: 2008-01-20 13:11:25 -0800 (Sun, 20 Jan 2008) Log Message: ----------- All IReactionProcess tests now extend ReactionProcessTest Modified Paths: -------------- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CarbonylEliminationReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondMultiReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromAcceptorReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromDonorReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactNBEReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactPDBReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementDeltaReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementGammaReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HyperconjugationReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationHReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion1ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion2ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion3ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation1ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation2ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation3ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical1ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical2ReactionTest.java branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical3ReactionTest.java Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CarbonylEliminationReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CarbonylEliminationReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CarbonylEliminationReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -40,7 +40,7 @@ import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator; import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.CarbonylEliminationReaction; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -49,7 +49,7 @@ * * @cdk.module test-reaction */ -public class CarbonylEliminationReactionTest extends CDKTestCase { +public class CarbonylEliminationReactionTest extends ReactionProcessTest { private IReactionProcess type; private DefaultChemObjectBuilder builder; @@ -57,9 +57,10 @@ * Constructor of the CarbonylEliminationReactionTest object. * */ - public CarbonylEliminationReactionTest() { + public CarbonylEliminationReactionTest() throws Exception { builder = DefaultChemObjectBuilder.getInstance(); type = new CarbonylEliminationReaction(); + super.setReaction(CarbonylEliminationReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondMultiReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondMultiReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondMultiReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -41,7 +41,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.CleavageBondMultiReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.ReactionSetManipulator; @@ -50,7 +50,7 @@ * * @cdk.module test-reaction */ -public class CleavageBondMultiReactionTest extends CDKTestCase { +public class CleavageBondMultiReactionTest extends ReactionProcessTest { private IReactionProcess type; @@ -58,8 +58,9 @@ * Constructor of the CleavageBondMultiReactionTest object * */ - public CleavageBondMultiReactionTest() { + public CleavageBondMultiReactionTest() throws Exception { type = new CleavageBondMultiReaction(); + super.setReaction(CleavageBondMultiReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/CleavageBondReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -41,7 +41,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.CleavageBondReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; /** @@ -50,7 +50,7 @@ * * @cdk.module test-reaction */ -public class CleavageBondReactionTest extends CDKTestCase { +public class CleavageBondReactionTest extends ReactionProcessTest { private IReactionProcess type; @@ -58,8 +58,9 @@ * Constructor of the CleavageBondReactionTest object * */ - public CleavageBondReactionTest() { + public CleavageBondReactionTest() throws Exception { type = new CleavageBondReaction(); + super.setReaction(CleavageBondReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromAcceptorReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromAcceptorReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromAcceptorReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator; import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.DisplacementChargeFromAcceptorReaction; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.AtomContainerManipulator; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -53,7 +53,7 @@ * * @cdk.module test-reaction */ -public class DisplacementChargeFromAcceptorReactionTest extends CDKTestCase { +public class DisplacementChargeFromAcceptorReactionTest extends ReactionProcessTest { private IReactionProcess type; private DefaultChemObjectBuilder builder; @@ -62,9 +62,10 @@ * Constructor of the DisplacementChargeFromAcceptorReactionTest object. * */ - public DisplacementChargeFromAcceptorReactionTest() { + public DisplacementChargeFromAcceptorReactionTest() throws Exception { builder = DefaultChemObjectBuilder.getInstance(); type = new DisplacementChargeFromAcceptorReaction(); + super.setReaction(DisplacementChargeFromAcceptorReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromDonorReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromDonorReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/DisplacementChargeFromDonorReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.isomorphism.matchers.QueryAtomContainerCreator; import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.DisplacementChargeFromDonorReaction; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.AtomContainerManipulator; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -54,7 +54,7 @@ * * @cdk.module test-reaction */ -public class DisplacementChargeFromDonorReactionTest extends CDKTestCase { +public class DisplacementChargeFromDonorReactionTest extends ReactionProcessTest { private static DefaultChemObjectBuilder builder; private IReactionProcess type; @@ -63,8 +63,9 @@ * Constructor of the DisplacementChargeFromDonorReactionTest object. * */ - public DisplacementChargeFromDonorReactionTest() { + public DisplacementChargeFromDonorReactionTest() throws Exception { type = new DisplacementChargeFromDonorReaction(); + super.setReaction(DisplacementChargeFromDonorReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactNBEReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactNBEReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactNBEReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -40,7 +40,7 @@ import org.openscience.cdk.interfaces.IReactionSet; import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.ElectronImpactNBEReaction; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; /** @@ -49,15 +49,16 @@ * @cdk.module test-reaction */ -public class ElectronImpactNBEReactionTest extends CDKTestCase { +public class ElectronImpactNBEReactionTest extends ReactionProcessTest { private DefaultChemObjectBuilder builder; /** * Constructor of the ElectronImpactNBEReactionTest object. * */ - public ElectronImpactNBEReactionTest() { + public ElectronImpactNBEReactionTest() throws Exception { builder = DefaultChemObjectBuilder.getInstance(); + super.setReaction(ElectronImpactNBEReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactPDBReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactPDBReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/ElectronImpactPDBReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -39,7 +39,7 @@ import org.openscience.cdk.interfaces.IReactionSet; import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.ElectronImpactPDBReaction; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; /** * TestSuite that runs a test for the ElectronImpactPDBReactionTest. @@ -47,15 +47,16 @@ * @cdk.module test-reaction */ -public class ElectronImpactPDBReactionTest extends CDKTestCase { +public class ElectronImpactPDBReactionTest extends ReactionProcessTest { private DefaultChemObjectBuilder builder; /** * Constructor of the ElectronImpactPDBReactionTest object. * */ - public ElectronImpactPDBReactionTest() { + public ElectronImpactPDBReactionTest() throws Exception { builder = DefaultChemObjectBuilder.getInstance(); + super.setReaction(ElectronImpactPDBReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementDeltaReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementDeltaReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementDeltaReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -41,7 +41,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.HydrogenRearrangementDeltaReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -50,15 +50,16 @@ * * @cdk.module test-reaction */ -public class HydrogenRearrangementDeltaReactionTest extends CDKTestCase { +public class HydrogenRearrangementDeltaReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the HydrogenRearrangement5ReactionTest object * */ - public HydrogenRearrangementDeltaReactionTest() { + public HydrogenRearrangementDeltaReactionTest() throws Exception { type = new HydrogenRearrangementDeltaReaction(); + super.setReaction(HydrogenRearrangementDeltaReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementGammaReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementGammaReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HydrogenRearrangementGammaReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -41,7 +41,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.HydrogenRearrangementGammaReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -50,15 +50,16 @@ * * @cdk.module test-reaction */ -public class HydrogenRearrangementGammaReactionTest extends CDKTestCase { +public class HydrogenRearrangementGammaReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the HydrogenRearrangementGammaReactionTest object * */ - public HydrogenRearrangementGammaReactionTest() { + public HydrogenRearrangementGammaReactionTest() throws Exception { type = new HydrogenRearrangementGammaReaction(); + super.setReaction(HydrogenRearrangementGammaReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HyperconjugationReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HyperconjugationReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/HyperconjugationReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -41,7 +41,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.HyperconjugationReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; /** * TestSuite that runs a test for the HyperconjugationReactionTest. @@ -49,7 +49,7 @@ * * @cdk.module test-reaction */ -public class HyperconjugationReactionTest extends CDKTestCase { +public class HyperconjugationReactionTest extends ReactionProcessTest { private IReactionProcess type; @@ -57,8 +57,9 @@ * Constructror of the HyperconjugationReactionTest object * */ - public HyperconjugationReactionTest() { + public HyperconjugationReactionTest() throws Exception { type = new HyperconjugationReaction(); + super.setReaction(HyperconjugationReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationHReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationHReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationHReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -44,7 +44,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RadicalSiteInitiationHReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -53,15 +53,16 @@ * * @cdk.module test-reaction */ -public class RadicalSiteInitiationHReactionTest extends CDKTestCase { +public class RadicalSiteInitiationHReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RadicalSiteInitiationHReactionTest object * */ - public RadicalSiteInitiationHReactionTest() { + public RadicalSiteInitiationHReactionTest() throws Exception { type = new RadicalSiteInitiationHReaction(); + super.setReaction(RadicalSiteInitiationHReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RadicalSiteInitiationReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RadicalSiteInitiationReaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -51,15 +51,16 @@ * * @cdk.module test-reaction */ -public class RadicalSiteInitiationReactionTest extends CDKTestCase { +public class RadicalSiteInitiationReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RadicalSiteInitiationReactionTest object * */ - public RadicalSiteInitiationReactionTest() { + public RadicalSiteInitiationReactionTest() throws Exception { type = new RadicalSiteInitiationReaction(); + super.setReaction(RadicalSiteInitiationReaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion1ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion1ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion1ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementAnion1Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -52,7 +52,7 @@ * * @cdk.module test-reaction */ -public class RearrangementAnion1ReactionTest extends CDKTestCase { +public class RearrangementAnion1ReactionTest extends ReactionProcessTest { private IReactionProcess type; @@ -60,8 +60,9 @@ * Constructror of the RearrangementAnion1ReactionTest object * */ - public RearrangementAnion1ReactionTest() { + public RearrangementAnion1ReactionTest() throws Exception { type = new RearrangementAnion1Reaction(); + super.setReaction(RearrangementAnion1Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion2ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion2ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion2ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementAnion2Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -81,16 +81,18 @@ * @cdk.module test-reaction */ -public class RearrangementAnion2ReactionTest extends CDKTestCase { +public class RearrangementAnion2ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RearrangementAnion2ReactionTest object + * @throws Exception * */ - public RearrangementAnion2ReactionTest() { + public RearrangementAnion2ReactionTest() throws Exception { type = new RearrangementAnion2Reaction(); + super.setReaction(RearrangementAnion2Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion3ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion3ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementAnion3ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -43,7 +43,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementAnion3Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -52,15 +52,17 @@ * * @cdk.module test-reaction */ -public class RearrangementAnion3ReactionTest extends CDKTestCase { +public class RearrangementAnion3ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructor of the RearrangementAnion3ReactionTest object + * @throws Exception * */ - public RearrangementAnion3ReactionTest() { + public RearrangementAnion3ReactionTest() throws Exception { type = new RearrangementAnion3Reaction(); + super.setReaction(RearrangementAnion3Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation1ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation1ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation1ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementCation1Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -53,15 +53,17 @@ * @cdk.module test-reaction */ -public class RearrangementCation1ReactionTest extends CDKTestCase { +public class RearrangementCation1ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RearrangementAnion1ReactionTest object + * @throws Exception * */ - public RearrangementCation1ReactionTest() { + public RearrangementCation1ReactionTest() throws Exception { type = new RearrangementCation1Reaction(); + super.setReaction(RearrangementCation1Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation2ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation2ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation2ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementCation2Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -52,16 +52,18 @@ * * @cdk.module test-reaction */ -public class RearrangementCation2ReactionTest extends CDKTestCase { +public class RearrangementCation2ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RearrangementCation2ReactionTest object + * @throws Exception * */ - public RearrangementCation2ReactionTest() { + public RearrangementCation2ReactionTest() throws Exception { type = new RearrangementCation2Reaction(); + super.setReaction(RearrangementCation2Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation3ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation3ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementCation3ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -42,7 +42,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementCation3Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -52,15 +52,17 @@ * * @cdk.module test-reaction */ -public class RearrangementCation3ReactionTest extends CDKTestCase { +public class RearrangementCation3ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RearrangementCation3ReactionTest object + * @throws Exception * */ - public RearrangementCation3ReactionTest() { + public RearrangementCation3ReactionTest() throws Exception { type = new RearrangementCation3Reaction(); + super.setReaction(RearrangementCation3Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical1ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical1ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical1ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -46,7 +46,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementRadical1Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.LonePairElectronChecker; import org.openscience.cdk.tools.manipulator.ReactionManipulator; @@ -56,7 +56,7 @@ * * @cdk.module test-reaction */ -public class RearrangementRadical1ReactionTest extends CDKTestCase { +public class RearrangementRadical1ReactionTest extends ReactionProcessTest { private IReactionProcess type; @@ -64,9 +64,9 @@ * Constructor of the RearrangementRadical1ReactionTest object * */ - public RearrangementRadical1ReactionTest() { - + public RearrangementRadical1ReactionTest() throws Exception { type = new RearrangementRadical1Reaction(); + super.setReaction(RearrangementRadical1Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical2ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical2ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical2ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -43,7 +43,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementRadical2Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -52,15 +52,16 @@ * * @cdk.module test-reaction */ -public class RearrangementRadical2ReactionTest extends CDKTestCase { +public class RearrangementRadical2ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructror of the RearrangementRadical2ReactionTest object * */ - public RearrangementRadical2ReactionTest() { + public RearrangementRadical2ReactionTest() throws Exception { type = new RearrangementRadical2Reaction(); + super.setReaction(RearrangementRadical2Reaction.class); } public static Test suite() { Modified: branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical3ReactionTest.java =================================================================== --- branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical3ReactionTest.java 2008-01-20 20:57:53 UTC (rev 9935) +++ branches/miguelrojasch/reaction/src/org/openscience/cdk/test/reaction/type/RearrangementRadical3ReactionTest.java 2008-01-20 21:11:25 UTC (rev 9936) @@ -44,7 +44,7 @@ import org.openscience.cdk.reaction.IReactionProcess; import org.openscience.cdk.reaction.type.RearrangementRadical3Reaction; import org.openscience.cdk.smiles.SmilesParser; -import org.openscience.cdk.test.CDKTestCase; +import org.openscience.cdk.test.reaction.ReactionProcessTest; import org.openscience.cdk.tools.manipulator.ReactionManipulator; /** @@ -53,15 +53,16 @@ * * @cdk.module test-reaction */ -public class RearrangementRadical3ReactionTest extends CDKTestCase { +public class RearrangementRadical3ReactionTest extends ReactionProcessTest { private IReactionProcess type; /** * Constructor of the RearrangementRadical2ReactionTest object * */ - public RearrangementRadical3ReactionTest() { + public RearrangementRadical3ReactionTest() throws Exception { type = new RearrangementRadical3Reaction(); + super.setReaction(RearrangementRadical3Reaction.class); } public static Test suite() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |