From 17b5f5bbf1e77656c53c9ec0a997a9033c36c1ba Mon Sep 17 00:00:00 2001
From: John May <john.wilkinsonmay@gmail.com>
Date: Tue, 18 Feb 2014 11:06:37 +0000
Subject: [PATCH] We can remove the dependence on cdk-extra and valency check
 by not use the MoleculeFactory. Using cdk-data (test) isn't ideal but is
 better than extra.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
---
 tool/group/pom.xml                            | 19 +++++++------------
 .../AtomDiscretePartitionRefinerTest.java     |  8 ++++----
 .../BondDiscretePartitionRefinerTest.java     |  8 ++++----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/tool/group/pom.xml b/tool/group/pom.xml
index ef797eaedc5..b31aeacb996 100644
--- a/tool/group/pom.xml
+++ b/tool/group/pom.xml
@@ -48,35 +48,30 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-test</artifactId>
+            <artifactId>cdk-data</artifactId>
             <version>${project.parent.version}</version>
             <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-silent</artifactId>
-            <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-smiles</artifactId>
+            <artifactId>cdk-test</artifactId>
             <version>${project.parent.version}</version>
-            <scope>test</scope>
+            <type>test-jar</type>
+            <scope>test</scope>            
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-valencycheck</artifactId>
+            <artifactId>cdk-silent</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-extra</artifactId>
+            <artifactId>cdk-smiles</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
-        </dependency>
+        </dependency>              
     </dependencies>
 
 </project>
diff --git a/tool/group/src/test/java/org/openscience/cdk/group/AtomDiscretePartitionRefinerTest.java b/tool/group/src/test/java/org/openscience/cdk/group/AtomDiscretePartitionRefinerTest.java
index 395952fd110..f3bbcf3cee6 100644
--- a/tool/group/src/test/java/org/openscience/cdk/group/AtomDiscretePartitionRefinerTest.java
+++ b/tool/group/src/test/java/org/openscience/cdk/group/AtomDiscretePartitionRefinerTest.java
@@ -33,7 +33,7 @@
 import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IChemObjectBuilder;
 import org.openscience.cdk.silent.SilentChemObjectBuilder;
-import org.openscience.cdk.templates.MoleculeFactory;
+import org.openscience.cdk.templates.TestMoleculeFactory;
 import org.openscience.cdk.tools.manipulator.AtomContainerManipulator;
 
 /**
@@ -208,7 +208,7 @@ public void getAutomorphismPartitionTest() {
     @Test
     public void testAzulene() throws Exception {
 
-        IAtomContainer mol = MoleculeFactory.makeAzulene();
+        IAtomContainer mol = TestMoleculeFactory.makeAzulene();
         Assert.assertNotNull("Created molecule was null", mol);
 
         AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
@@ -233,7 +233,7 @@ public void testAzulene() throws Exception {
      */
     @Test
     public void testPyrimidine() throws Exception {
-        IAtomContainer mol = MoleculeFactory.makePyrimidine();
+        IAtomContainer mol = TestMoleculeFactory.makePyrimidine();
         AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
         CDKHueckelAromaticityDetector.detectAromaticity(mol);
         Assert.assertNotNull("Created molecule was null", mol);
@@ -255,7 +255,7 @@ public void testPyrimidine() throws Exception {
      */
     @Test
     public void testBiphenyl() throws Exception {
-        IAtomContainer mol = MoleculeFactory.makeBiphenyl();
+        IAtomContainer mol = TestMoleculeFactory.makeBiphenyl();
         AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
         CDKHueckelAromaticityDetector.detectAromaticity(mol);
         Assert.assertNotNull("Created molecule was null", mol);
diff --git a/tool/group/src/test/java/org/openscience/cdk/group/BondDiscretePartitionRefinerTest.java b/tool/group/src/test/java/org/openscience/cdk/group/BondDiscretePartitionRefinerTest.java
index fe5e850ef37..7e00303b169 100644
--- a/tool/group/src/test/java/org/openscience/cdk/group/BondDiscretePartitionRefinerTest.java
+++ b/tool/group/src/test/java/org/openscience/cdk/group/BondDiscretePartitionRefinerTest.java
@@ -32,7 +32,7 @@
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IChemObjectBuilder;
 import org.openscience.cdk.silent.SilentChemObjectBuilder;
-import org.openscience.cdk.templates.MoleculeFactory;
+import org.openscience.cdk.templates.TestMoleculeFactory;
 import org.openscience.cdk.tools.manipulator.AtomContainerManipulator;
 
 /**
@@ -215,7 +215,7 @@ public void getAutomorphismPartitionTest() {
     @Test
     public void testAzulene() throws Exception {
 
-        IAtomContainer mol = MoleculeFactory.makeAzulene();
+        IAtomContainer mol = TestMoleculeFactory.makeAzulene();
         Assert.assertNotNull("Created molecule was null", mol);
         AtomContainerPrinter.print(mol);
 
@@ -240,7 +240,7 @@ public void testAzulene() throws Exception {
      */
     @Test
     public void testPyrimidine() throws Exception {
-        IAtomContainer mol = MoleculeFactory.makePyrimidine();
+        IAtomContainer mol = TestMoleculeFactory.makePyrimidine();
         AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
         CDKHueckelAromaticityDetector.detectAromaticity(mol);
         Assert.assertNotNull("Created molecule was null", mol);
@@ -262,7 +262,7 @@ public void testPyrimidine() throws Exception {
      */
     @Test
     public void testBiphenyl() throws Exception {
-        IAtomContainer mol = MoleculeFactory.makeBiphenyl();
+        IAtomContainer mol = TestMoleculeFactory.makeBiphenyl();
         AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
         CDKHueckelAromaticityDetector.detectAromaticity(mol);
         Assert.assertNotNull("Created molecule was null", mol);