Eliminate testdata from cdk-formula moving all resources to the modul…

…e (and package) where they are used.
cdk · Dec 29, 2021 · 6a4ee0f · 6a4ee0f
1 parent c2066cc
commit 6a4ee0f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
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-testdata</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>            
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/.../src/test/java/org/openscience/cdk/tools/manipulator/MolecularFormulaManipulatorTest.java b/.../src/test/java/org/openscience/cdk/tools/manipulator/MolecularFormulaManipulatorTest.java
@@ -1148,8 +1148,8 @@ public void testWithH_Initial() {
      */
     @Test
     public void testFromMol() throws Exception {
-        String filename = "data/mdl/formulatest.mol";
-        InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
+        String filename = "formulatest.mol";
+        InputStream ins = this.getClass().getResourceAsStream(filename);
         MDLV2000Reader reader = new MDLV2000Reader(ins);
         ChemFile chemFile = reader.read(new ChemFile());
         reader.close();

diff --git a/...c/test/resources/data/mdl/formulatest.mol → ...nce/cdk/tools/manipulator/formulatest.mol b/...c/test/resources/data/mdl/formulatest.mol → ...nce/cdk/tools/manipulator/formulatest.mol