Skip to content

Commit c2066cc

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Eliminate testdata from cdk-builder3d moving all resources to the module (and package) where they are used. We need to duplicate one resource also used in cdk-io test.
1 parent 96566b9 commit c2066cc

File tree

11 files changed

+114
-23
lines changed

11 files changed

+114
-23
lines changed

‎storage/ctab/src/test/java/org/openscience/cdk/io/MDLV2000ReaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ public void testPolycarpol() throws Exception {
337337

338338
@Test
339339
public void testReserpine() throws Exception {
340-
String filename = "data/mdl/reserpine.mol";
340+
String filename = "reserpine.mol";
341341
logger.info("Testing: " + filename);
342-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
342+
InputStream ins = this.getClass().getResourceAsStream(filename);
343343
MDLV2000Reader reader = new MDLV2000Reader(ins);
344344
ChemFile chemFile = reader.read(new ChemFile());
345345
reader.close();

‎base/testdata/src/test/resources/data/mdl/reserpine.mol renamed to ‎storage/io/src/test/resources/org/openscience/cdk/io/reserpine.mol

File renamed without changes.

‎tool/builder3d/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,6 @@
8181
<type>test-jar</type>
8282
<scope>test</scope>
8383
</dependency>
84-
<dependency>
85-
<groupId>${project.groupId}</groupId>
86-
<artifactId>cdk-testdata</artifactId>
87-
<version>${project.parent.version}</version>
88-
<type>test-jar</type>
89-
<scope>test</scope>
90-
</dependency>
9184
<dependency>
9285
<groupId>${project.groupId}</groupId>
9386
<artifactId>cdk-builder3dtools</artifactId>

‎tool/builder3d/src/test/java/org/openscience/cdk/modeling/builder3d/AtomPlacer3DTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ public void testAllHeavyAtomsPlaced_IAtomContainer() {
146146

147147
@Test
148148
public void testFindHeavyAtomsInChain_IAtomContainer_IAtomContainer() throws Exception {
149-
String filename = "data/mdl/allmol232.mol";
150-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
149+
String filename = "allmol232.mol";
150+
InputStream ins = this.getClass().getResourceAsStream(filename);
151151
// TODO: shk3-cleanuptests: best to use the STRICT IO mode here
152152
MDLV2000Reader reader = new MDLV2000Reader(ins);
153153
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());

‎tool/builder3d/src/test/java/org/openscience/cdk/modeling/builder3d/ModelBuilder3DTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ public void testModelBuilder3D_232() throws Exception {
212212
Assume.assumeTrue(runSlowTests());
213213

214214
ModelBuilder3D mb3d = ModelBuilder3D.getInstance(DefaultChemObjectBuilder.getInstance());
215-
String filename = "data/mdl/allmol232.mol";
216-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
215+
String filename = "allmol232.mol";
216+
InputStream ins = this.getClass().getResourceAsStream(filename);
217217
MDLV2000Reader reader = new MDLV2000Reader(ins);
218218
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
219219
reader.close();
@@ -239,8 +239,8 @@ public void testModelBuilder3D_231() throws Exception {
239239
Assume.assumeTrue(runSlowTests());
240240

241241
ModelBuilder3D mb3d = ModelBuilder3D.getInstance(DefaultChemObjectBuilder.getInstance());
242-
String filename = "data/mdl/allmol231.mol";
243-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
242+
String filename = "allmol231.mol";
243+
InputStream ins = this.getClass().getResourceAsStream(filename);
244244
MDLV2000Reader reader = new MDLV2000Reader(ins);
245245
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
246246
reader.close();
@@ -367,8 +367,8 @@ public void testModel3D_bug_1610997() throws Exception {
367367
@Category(SlowTest.class)
368368
public void testModelBuilder3D_bug_1241421() throws Exception {
369369
ModelBuilder3D mb3d = ModelBuilder3D.getInstance(DefaultChemObjectBuilder.getInstance());
370-
String filename = "data/mdl/bug1241421.mol";
371-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
370+
String filename = "bug1241421.mol";
371+
InputStream ins = this.getClass().getResourceAsStream(filename);
372372
MDLV2000Reader reader = new MDLV2000Reader(ins);
373373
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
374374
reader.close();
@@ -382,8 +382,8 @@ public void testModelBuilder3D_bug_1241421() throws Exception {
382382
@Category(SlowTest.class)
383383
public void testModelBuilder3D_reserpine() throws Exception {
384384
ModelBuilder3D mb3d = ModelBuilder3D.getInstance(DefaultChemObjectBuilder.getInstance());
385-
String filename = "data/mdl/reserpine.mol";
386-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
385+
String filename = "reserpine.mol";
386+
InputStream ins = this.getClass().getResourceAsStream(filename);
387387
MDLV2000Reader reader = new MDLV2000Reader(ins);
388388
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
389389
reader.close();

‎tool/builder3d/src/test/java/org/openscience/cdk/modeling/builder3d/TemplateHandler3DTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public void testFingerprints() throws Exception {
7575
parseBitSet("{3, 18, 26, 32, 33, 43, 140, 155, 188, 189, 226, 238, 262, 267, 287, 315, 319, 326, 375, 450, 577, 629, 644, 690, 719, 732, 745, 746, 751, 775, 847, 850, 881, 959, 971, 995, 1015, 1019}"),
7676
parseBitSet("{3, 18, 29, 33, 90, 105, 125, 272, 280, 301, 433, 521, 590, 618, 651, 672, 696, 698, 745, 760, 829, 844, 876, 890, 899, 924, 1013}")};
7777

78-
String filename = "data/mdl/fingerprints_from_modelbuilder3d.sdf";
79-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
78+
String filename = "fingerprints_from_modelbuilder3d.sdf";
79+
InputStream ins = this.getClass().getResourceAsStream(filename);
8080
List<IBitFingerprint> data = new TemplateExtractor().makeFingerprintsFromSdf(true, false,
8181
new HashMap<String, Integer>(), new BufferedReader(new InputStreamReader(ins)), 10);
8282
QueryChemObject obj = new QueryChemObject(DefaultChemObjectBuilder.getInstance());
@@ -101,8 +101,8 @@ public void testAnonFingerprints() throws Exception {
101101
parseBitSet("{148, 206, 392, 542, 637, 742, 752, 830}"),
102102
parseBitSet("{148, 206, 392, 542, 637, 742, 752, 830}")};
103103

104-
String filename = "data/mdl/fingerprints_from_modelbuilder3d.sdf";
105-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
104+
String filename = "fingerprints_from_modelbuilder3d.sdf";
105+
InputStream ins = this.getClass().getResourceAsStream(filename);
106106
List<IBitFingerprint> data = new TemplateExtractor().makeFingerprintsFromSdf(true, true,
107107
new HashMap<String, Integer>(), new BufferedReader(new InputStreamReader(ins)), 10);
108108
QueryChemObject obj = new QueryChemObject(DefaultChemObjectBuilder.getInstance());

‎base/testdata/src/test/resources/data/mdl/allmol231.mol renamed to ‎tool/builder3d/src/test/resources/org/openscience/cdk/modeling/builder3d/allmol231.mol

File renamed without changes.

‎base/testdata/src/test/resources/data/mdl/allmol232.mol renamed to ‎tool/builder3d/src/test/resources/org/openscience/cdk/modeling/builder3d/allmol232.mol

File renamed without changes.

‎base/testdata/src/test/resources/data/mdl/bug1241421.mol renamed to ‎tool/builder3d/src/test/resources/org/openscience/cdk/modeling/builder3d/bug1241421.mol

File renamed without changes.

‎base/testdata/src/test/resources/data/mdl/fingerprints_from_modelbuilder3d.sdf renamed to ‎tool/builder3d/src/test/resources/org/openscience/cdk/modeling/builder3d/fingerprints_from_modelbuilder3d.sdf

File renamed without changes.

0 commit comments

Comments
 (0)