Skip to content

Commit 72921f0

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Eliminate testdata dependency from cdk-libiocml
1 parent ce6d7df commit 72921f0

36 files changed

+66
-73
lines changed

‎storage/libiocml/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,6 @@
112112
<version>${project.parent.version}</version>
113113
<scope>test</scope>
114114
</dependency>
115-
<dependency>
116-
<groupId>${project.groupId}</groupId>
117-
<artifactId>cdk-testdata</artifactId>
118-
<version>${project.parent.version}</version>
119-
<type>test-jar</type>
120-
<scope>test</scope>
121-
</dependency>
122115
<dependency>
123116
<groupId>${project.groupId}</groupId>
124117
<artifactId>cdk-diff</artifactId>

‎storage/libiocml/src/test/java/org/openscience/cdk/io/MDLCMLRoundtripTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public MDLCMLRoundtripTest() {
5050
@Test
5151
public void testBug1649526() throws Exception {
5252
//Read the original
53-
String filename = "data/mdl/bug-1649526.mol";
54-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
53+
String filename = "bug-1649526.mol";
54+
InputStream ins = this.getClass().getResourceAsStream(filename);
5555
MDLReader reader = new MDLReader(ins);
5656
IAtomContainer mol = reader.read(new AtomContainer());
5757
reader.close();

‎storage/libiocml/src/test/java/org/openscience/cdk/io/cml/CML2Test.java

Lines changed: 62 additions & 62 deletions
Large diffs are not rendered by default.

‎storage/libiocml/src/test/java/org/openscience/cdk/io/cml/CMLRoundTripTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ public void testMoleculeSet() throws Exception {
706706
*/
707707
@Test
708708
public void testAtomProperties() throws Exception {
709-
String filename = "data/cml/custompropertiestest.cml";
710-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
709+
String filename = "custompropertiestest.cml";
710+
InputStream ins = this.getClass().getResourceAsStream(filename);
711711
CMLReader reader = new CMLReader(ins);
712712
ChemFile chemFile = (ChemFile) reader.read((ChemFile) new ChemFile());
713713
reader.close();

‎base/testdata/src/test/resources/data/mdl/bug-1649526.mol renamed to ‎storage/libiocml/src/test/resources/org/openscience/cdk/io/bug-1649526.mol

File renamed without changes.

‎base/testdata/src/test/resources/data/cml/3.cml renamed to ‎storage/libiocml/src/test/resources/org/openscience/cdk/io/cml/3.cml

File renamed without changes.

‎base/testdata/src/test/resources/data/cml/AlanineTree.cml renamed to ‎storage/libiocml/src/test/resources/org/openscience/cdk/io/cml/AlanineTree.cml

File renamed without changes.

‎base/testdata/src/test/resources/data/cml/AlanineTreeReverse.cml renamed to ‎storage/libiocml/src/test/resources/org/openscience/cdk/io/cml/AlanineTreeReverse.cml

File renamed without changes.

‎base/testdata/src/test/resources/data/cml/COONa.cml renamed to ‎storage/libiocml/src/test/resources/org/openscience/cdk/io/cml/COONa.cml

File renamed without changes.

‎base/testdata/src/test/resources/data/cml/cmlConciseFormula.cml renamed to ‎storage/libiocml/src/test/resources/org/openscience/cdk/io/cml/cmlConciseFormula.cml

File renamed without changes.

0 commit comments

Comments
 (0)