Move the TestMoleculeFactory to cdk-data/main. I'm not super happy ab…

…out this but seems like the simplest solution. The other being to make the tests pass in a builder, or have the test molecule factory dynamically find the IChemObjectBuilder - that would be good except for now Java really doesn't like reflective access between modules.
cdk · Dec 24, 2021 · db19f62 · db19f62
1 parent 190a957
commit db19f62
Show file tree

Hide file tree

Showing 27 changed files with 1 addition and 176 deletions.
diff --git a/...ce/cdk/templates/TestMoleculeFactory.java → ...ce/cdk/templates/TestMoleculeFactory.java b/...ce/cdk/templates/TestMoleculeFactory.java → ...ce/cdk/templates/TestMoleculeFactory.java
diff --git a/base/isomorphism/pom.xml b/base/isomorphism/pom.xml
@@ -58,13 +58,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-test</artifactId>

diff --git a/base/reaction/pom.xml b/base/reaction/pom.xml
@@ -86,13 +86,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-testdata</artifactId>

diff --git a/base/test-atomtype/pom.xml b/base/test-atomtype/pom.xml
@@ -80,13 +80,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/base/test-core/pom.xml b/base/test-core/pom.xml
@@ -58,13 +58,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-standard</artifactId>

diff --git a/base/test-standard/pom.xml b/base/test-standard/pom.xml
@@ -63,13 +63,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <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>

diff --git a/base/test-valencycheck/pom.xml b/base/test-valencycheck/pom.xml
@@ -101,7 +101,7 @@
             <artifactId>cdk-testdata</artifactId>
             <version>${project.parent.version}</version>
             <type>test-jar</type>
-            <scope>test</scope>            
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/descriptor/fingerprint/pom.xml b/descriptor/fingerprint/pom.xml
@@ -80,13 +80,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-smiles</artifactId>

diff --git a/descriptor/qsarcml/pom.xml b/descriptor/qsarcml/pom.xml
@@ -85,13 +85,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/descriptor/qsarmolecular/pom.xml b/descriptor/qsarmolecular/pom.xml
@@ -141,13 +141,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-qsar</artifactId>

diff --git a/descriptor/qsarprotein/pom.xml b/descriptor/qsarprotein/pom.xml
@@ -29,13 +29,6 @@
             <artifactId>cdk-data</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-standard</artifactId>

diff --git a/descriptor/signature/pom.xml b/descriptor/signature/pom.xml
@@ -64,13 +64,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-fingerprint</artifactId>

diff --git a/display/renderbasic/pom.xml b/display/renderbasic/pom.xml
@@ -81,13 +81,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -147,13 +147,6 @@
             <artifactId>cdk-charges</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.openscience.cdk</groupId>
             <artifactId>cdk-qsar</artifactId>

diff --git a/misc/test-extra/pom.xml b/misc/test-extra/pom.xml
@@ -69,13 +69,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-datadebug</artifactId>

diff --git a/storage/ctab/pom.xml b/storage/ctab/pom.xml
@@ -81,13 +81,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.openscience.cdk</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.openscience.cdk</groupId>
             <artifactId>cdk-silent</artifactId>

diff --git a/storage/inchi/pom.xml b/storage/inchi/pom.xml
@@ -90,13 +90,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-test</artifactId>

diff --git a/storage/io/pom.xml b/storage/io/pom.xml
@@ -89,13 +89,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-datadebug</artifactId>

diff --git a/storage/libiocml/pom.xml b/storage/libiocml/pom.xml
@@ -99,13 +99,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-io</artifactId>

diff --git a/storage/pdb/pom.xml b/storage/pdb/pom.xml
@@ -58,13 +58,6 @@
             <artifactId>cdk-standard</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-datadebug</artifactId>

diff --git a/storage/smiles/pom.xml b/storage/smiles/pom.xml
@@ -87,13 +87,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-datadebug</artifactId>

diff --git a/tool/builder3d/pom.xml b/tool/builder3d/pom.xml
@@ -81,13 +81,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-testdata</artifactId>

diff --git a/tool/formula/pom.xml b/tool/formula/pom.xml
@@ -76,13 +76,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-testdata</artifactId>

diff --git a/tool/fragment/pom.xml b/tool/fragment/pom.xml
@@ -67,13 +67,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <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>

diff --git a/tool/group/pom.xml b/tool/group/pom.xml
@@ -35,13 +35,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-test</artifactId>

diff --git a/tool/sdg/pom.xml b/tool/sdg/pom.xml
@@ -68,13 +68,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <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>

diff --git a/tool/structgen/pom.xml b/tool/structgen/pom.xml
@@ -74,13 +74,6 @@
             <type>test-jar</type>
             <scope>test</scope>            
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-sdg</artifactId>