Skip to content

Commit 0e2fff6

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Eliminate testdata dependency from cdk-ioformats, we need some duplication in core/extra an io.
1 parent e7cf804 commit 0e2fff6

File tree

64 files changed

+55736
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+55736
-91
lines changed

‎base/testdata/src/test/resources/data/asn/pubchem/cid1.asn renamed to ‎base/test-core/src/test/resources/data/asn/pubchem/cid1.asn

File renamed without changes.

‎base/testdata/src/test/resources/data/mol2/fromWebsite.mol2 renamed to ‎base/test-core/src/test/resources/data/mol2/fromWebsite.mol2

File renamed without changes.

‎misc/test-extra/src/test/java/org/openscience/cdk/io/ExtraReaderFactoryTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ void expectReader(String filename,
7676

7777
@Test
7878
public void testINChI() throws Exception {
79-
expectReader("data/inchi/guanine.inchi.xml", INChIFormat.getInstance());
79+
expectReader("org/openscience/cdk/io/guanine.inchi.xml", INChIFormat.getInstance());
8080
}
8181

8282
@Test
8383
public void testINChIPlainText() throws Exception {
84-
expectReader("data/inchi/guanine.inchi", INChIPlainTextFormat.getInstance());
84+
expectReader("org/openscience/cdk/io/guanine.inchi", INChIPlainTextFormat.getInstance());
8585
}
8686

8787
@Test
8888
public void testVASP() throws Exception {
89-
expectReader("data/vasp/LiMoS2_optimisation_ISIF3.vasp", VASPFormat.getInstance());
89+
expectReader("org/openscience/cdk/io/LiMoS2_optimisation_ISIF3.vasp", VASPFormat.getInstance());
9090
}
9191

9292
@Test
9393
public void testGamess() throws Exception {
94-
expectReader("data/gamess/ch3oh_gam.out", GamessFormat.getInstance());
94+
expectReader("org/openscience/cdk/io/ch3oh_gam.out", GamessFormat.getInstance());
9595
}
9696

9797
}

‎misc/test-extra/src/test/java/org/openscience/cdk/io/INChIPlainTextReaderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class INChIPlainTextReaderTest extends SimpleChemObjectReaderTest {
5050

5151
@BeforeClass
5252
public static void setup() {
53-
setSimpleChemObjectReader(new INChIPlainTextReader(), "data/inchi/guanine.inchi");
53+
setSimpleChemObjectReader(new INChIPlainTextReader(), "guanine.inchi");
5454
}
5555

5656
@Test
@@ -66,9 +66,9 @@ public void testAccepts() throws IOException {
6666
*/
6767
@Test
6868
public void testGuanine() throws Exception {
69-
String filename = "data/inchi/guanine.inchi";
69+
String filename = "guanine.inchi";
7070
logger.info("Testing: ", filename);
71-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
71+
InputStream ins = this.getClass().getResourceAsStream(filename);
7272
INChIPlainTextReader reader = new INChIPlainTextReader(ins);
7373
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
7474
reader.close();

‎misc/test-extra/src/test/java/org/openscience/cdk/io/INChIReaderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class INChIReaderTest extends SimpleChemObjectReaderTest {
4949

5050
@BeforeClass
5151
public static void setup() {
52-
setSimpleChemObjectReader(new INChIReader(), "data/inchi/guanine.inchi.xml");
52+
setSimpleChemObjectReader(new INChIReader(), "guanine.inchi.xml");
5353
}
5454

5555
@Test
@@ -63,9 +63,9 @@ public void testAccepts() {
6363
*/
6464
@Test
6565
public void testGuanine() throws Exception {
66-
String filename = "data/inchi/guanine.inchi.xml";
66+
String filename = "guanine.inchi.xml";
6767
logger.info("Testing: ", filename);
68-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
68+
InputStream ins = this.getClass().getResourceAsStream(filename);
6969
INChIReader reader = new INChIReader(ins);
7070
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
7171

‎misc/test-extra/src/test/java/org/openscience/cdk/io/VASPReaderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class VASPReaderTest extends SimpleChemObjectReaderTest {
4040

4141
@BeforeClass
4242
public static void setup() throws Exception {
43-
setSimpleChemObjectReader(new VASPReader(), "data/vasp/LiMoS2_optimisation_ISIF3.vasp");
43+
setSimpleChemObjectReader(new VASPReader(), "LiMoS2_optimisation_ISIF3.vasp");
4444
}
4545

4646
@Test
@@ -51,9 +51,9 @@ public void testAccepts() {
5151

5252
@Test
5353
public void testReading() throws Exception {
54-
String filename = "data/vasp/LiMoS2_optimisation_ISIF3.vasp";
54+
String filename = "LiMoS2_optimisation_ISIF3.vasp";
5555
logger.info("Testing: " + filename);
56-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
56+
InputStream ins = this.getClass().getResourceAsStream(filename);
5757
VASPReader reader = new VASPReader(ins);
5858
ChemFile chemFile = (ChemFile) reader.read(new ChemFile());
5959
Assert.assertNotNull(chemFile);

‎base/testdata/src/test/resources/data/vasp/LiMoS2_optimisation_ISIF3.vasp renamed to ‎misc/test-extra/src/test/resources/org/openscience/cdk/io/LiMoS2_optimisation_ISIF3.vasp

File renamed without changes.

‎base/testdata/src/test/resources/data/gamess/ch3oh_gam.out renamed to ‎misc/test-extra/src/test/resources/org/openscience/cdk/io/ch3oh_gam.out

File renamed without changes.

‎base/testdata/src/test/resources/data/inchi/guanine.inchi renamed to ‎misc/test-extra/src/test/resources/org/openscience/cdk/io/guanine.inchi

File renamed without changes.

‎base/testdata/src/test/resources/data/inchi/guanine.inchi.xml renamed to ‎misc/test-extra/src/test/resources/org/openscience/cdk/io/guanine.inchi.xml

File renamed without changes.

0 commit comments

Comments
 (0)