cdk
diff --git a/‎base/test-atomtype/pom.xml
Lines changed: 0 additions & 7 deletions b/‎base/test-atomtype/pom.xml
Lines changed: 0 additions & 7 deletions
diff --git a/‎base/test-atomtype/src/test/java/org/openscience/cdk/atomtype/SybylAtomTypeMatcherTest.java
Lines changed: 10 additions & 10 deletions b/‎base/test-atomtype/src/test/java/org/openscience/cdk/atomtype/SybylAtomTypeMatcherTest.java
Lines changed: 10 additions & 10 deletions
diff --git a/‎base/testdata/src/test/resources/data/mol2/atomtyping.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping.mol2 b/‎base/testdata/src/test/resources/data/mol2/atomtyping.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping.mol2
diff --git a/‎base/testdata/src/test/resources/data/mol2/atomtyping2.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping2.mol2 b/‎base/testdata/src/test/resources/data/mol2/atomtyping2.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping2.mol2
diff --git a/‎base/testdata/src/test/resources/data/mol2/atomtyping3.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping3.mol2 b/‎base/testdata/src/test/resources/data/mol2/atomtyping3.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping3.mol2
diff --git a/‎base/testdata/src/test/resources/data/mol2/atomtyping4.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping4.mol2 b/‎base/testdata/src/test/resources/data/mol2/atomtyping4.mol2 renamed to ‎base/test-atomtype/src/test/resources/org/openscience/cdk/atomtype/atomtyping4.mol2
@@ -73,13 +73,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>
 
     <build>
 
@@ -89,8 +89,8 @@ public void testFindMatchingAtomType_IAtomContainer_IAtom() throws Exception {
 
     @Test
     public void testFindMatchingAtomType_IAtomContainer() throws Exception {
-        String filename = "data/mol2/atomtyping.mol2";
-        InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
+        String filename = "atomtyping.mol2";
+        InputStream ins = this.getClass().getResourceAsStream(filename);
         Mol2Reader reader = new Mol2Reader(ins);
         IAtomContainer mol = (IAtomContainer) reader.read(new AtomContainer());
 
@@ -105,8 +105,8 @@ public void testFindMatchingAtomType_IAtomContainer() throws Exception {
 
     @Test
     public void testAtomTyping() throws Exception {
-        String filename = "data/mol2/atomtyping.mol2";
-        InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
+        String filename = "atomtyping.mol2";
+        InputStream ins = this.getClass().getResourceAsStream(filename);
         Mol2Reader reader = new Mol2Reader(ins);
         IAtomContainer molecule = (IAtomContainer) reader.read(new AtomContainer());
         Assert.assertNotNull(molecule);
@@ -166,8 +166,8 @@ public void testBenzene_AtomContainer() throws Exception {
 
     @Test
     public void testAtomTyping4() throws Exception {
-        String filename = "data/mol2/atomtyping4.mol2";
-        InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
+        String filename = "atomtyping4.mol2";
+        InputStream ins = this.getClass().getResourceAsStream(filename);
         Mol2Reader reader = new Mol2Reader(ins);
         IAtomContainer molecule = (IAtomContainer) reader.read(new AtomContainer());
         Assert.assertNotNull(molecule);
@@ -201,8 +201,8 @@ public void testNonExistingType() throws Exception {
 
     @Test
     public void testAtomTyping2() throws Exception {
-        String filename = "data/mol2/atomtyping2.mol2";
-        InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
+        String filename = "atomtyping2.mol2";
+        InputStream ins = this.getClass().getResourceAsStream(filename);
         Mol2Reader reader = new Mol2Reader(ins);
         IAtomContainer molecule = (IAtomContainer) reader.read(new AtomContainer());
         Assert.assertNotNull(molecule);
@@ -222,8 +222,8 @@ public void testAtomTyping2() throws Exception {
 
     @Test
     public void testAtomTyping3() throws Exception {
-        String filename = "data/mol2/atomtyping3.mol2";
-        InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
+        String filename = "atomtyping3.mol2";
+        InputStream ins = this.getClass().getResourceAsStream(filename);
         Mol2Reader reader = new Mol2Reader(ins);
         IAtomContainer molecule = (IAtomContainer) reader.read(new AtomContainer());
         Assert.assertNotNull(molecule);