Skip to content

Commit b33dc3a

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Eliminate testdata dependency from test-extra.
1 parent b0bd7e7 commit b33dc3a

File tree

13 files changed

+187
-20
lines changed

13 files changed

+187
-20
lines changed

‎base/testdata/src/test/resources/data/mdl/BremserPredictionTest.mol renamed to ‎base/test-core/src/test/resources/data/mdl/BremserPredictionTest.mol

File renamed without changes.

‎base/testdata/src/test/resources/data/mdl/Heptane-TestFF-output.mol renamed to ‎base/test-core/src/test/resources/data/mdl/Heptane-TestFF-output.mol

File renamed without changes.

‎misc/test-extra/pom.xml

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class CrystClustReaderTest extends SimpleChemObjectReaderTest {
4848

4949
@BeforeClass
5050
public static void setup() {
51-
setSimpleChemObjectReader(new CrystClustReader(), "data/crystclust/estron.crystclust");
51+
setSimpleChemObjectReader(new CrystClustReader(), "estron.crystclust");
5252
}
5353

5454
@Test
@@ -59,9 +59,9 @@ public void testAccepts() {
5959

6060
@Test
6161
public void testEstrone() throws Exception {
62-
String filename = "data/crystclust/estron.crystclust";
62+
String filename = "estron.crystclust";
6363
logger.info("Testing: " + filename);
64-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
64+
InputStream ins = this.getClass().getResourceAsStream(filename);
6565
CrystClustReader reader = new CrystClustReader(ins);
6666
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
6767

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public class GamessReaderTest extends SimpleChemObjectReaderTest {
5858
*/
5959
@Before
6060
public void setUp() throws Exception {
61-
String filename = "data/gamess/Cl2O.log";
62-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
61+
String filename = "Cl2O.log";
62+
InputStream ins = this.getClass().getResourceAsStream(filename);
6363
this.inputReader = new BufferedReader(new InputStreamReader(ins));
6464
this.gamessReaderUnderTest = new GamessReader(this.inputReader);
6565
setSimpleChemObjectReader(this.gamessReaderUnderTest, filename);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public class IteratingMDLConformerReaderTest extends CDKTestCase {
2323

2424
@Test
2525
public void testSDF() throws Exception {
26-
String filename = "data/mdl/iterconftest.sdf";
26+
String filename = "iterconftest.sdf";
2727
logger.info("Testing: " + filename);
28-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
28+
InputStream ins = this.getClass().getResourceAsStream(filename);
2929
IteratingMDLConformerReader reader = new IteratingMDLConformerReader(ins,
3030
DefaultChemObjectBuilder.getInstance());
3131

@@ -48,9 +48,9 @@ public void testSDF() throws Exception {
4848

4949
@Test(expected = UnsupportedOperationException.class)
5050
public void testRemove() {
51-
String filename = "data/mdl/iterconftest.sdf";
51+
String filename = "iterconftest.sdf";
5252
logger.info("Testing: " + filename);
53-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
53+
InputStream ins = this.getClass().getResourceAsStream(filename);
5454
IteratingMDLConformerReader reader = new IteratingMDLConformerReader(ins,
5555
DefaultChemObjectBuilder.getInstance());
5656

‎misc/test-extra/src/test/java/org/openscience/cdk/tools/BremserPredictorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ public void testGetConfidenceLimit() throws Exception {
9191
28.5, 25.7, 25.7, 13.3, 14.4, 14.4, 8.9, 14.8, 14.8, 13.3, 13.3, 13.3, 14.4, 14.4, 13.3, 14.4, 14.4,
9292
8.9, 14.8, 14.8, 13.3, 13.3, 13.3, 14.4, 14.4, 13.3};
9393
IAtomContainer molecule = null;
94-
String filename = "data/mdl/BremserPredictionTest.mol";
95-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
94+
String filename = "BremserPredictionTest.mol";
95+
InputStream ins = this.getClass().getResourceAsStream(filename);
9696
MDLV2000Reader reader = new MDLV2000Reader(ins, Mode.STRICT);
9797
molecule = reader.read(new AtomContainer());
9898
double prediction;

‎misc/test-extra/src/test/java/org/openscience/cdk/validate/Geometry3DValidatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public class Geometry3DValidatorTest extends CDKTestCase {
3535

3636
@Test
3737
public void testEthane() throws Exception {
38-
String filename = "data/mdl/Heptane-TestFF-output.mol";
39-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
38+
String filename = "Heptane-TestFF-output.mol";
39+
InputStream ins = this.getClass().getResourceAsStream(filename);
4040
MDLV2000Reader reader = new MDLV2000Reader(ins, Mode.STRICT);
4141
ChemFile chemFile = (ChemFile) reader.read((ChemObject) new ChemFile());
4242
ValidatorEngine engine = new ValidatorEngine();

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)