Skip to content

Commit 7c8e4b7

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Eliminate testdata dependency from cdk-test-core.
1 parent b8cfb1d commit 7c8e4b7

Some content is hidden

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

53 files changed

+2074
-22
lines changed

‎base/test-core/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,6 @@
8989
<version>${project.parent.version}</version>
9090
<scope>test</scope>
9191
</dependency>
92-
<dependency>
93-
<groupId>${project.groupId}</groupId>
94-
<artifactId>cdk-testdata</artifactId>
95-
<version>${project.parent.version}</version>
96-
<type>test-jar</type>
97-
<scope>test</scope>
98-
</dependency>
9992
<dependency>
10093
<groupId>${project.groupId}</groupId>
10194
<artifactId>cdk-atomtype</artifactId>

‎base/test-core/src/test/java/org/openscience/cdk/atomtype/CDKAtomTypeMatcherFilesTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public void testFile3() throws Exception {
6464
*/
6565
@Test
6666
public void testBug3141611() throws Exception {
67-
String filename = "data/mdl/error.sdf";
68-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
67+
String filename = "error.sdf";
68+
InputStream ins = this.getClass().getResourceAsStream(filename);
6969
MDLV2000Reader reader = new MDLV2000Reader(ins);
7070
IChemFile chemFile = (IChemFile) reader.read(new ChemFile());
7171

@@ -100,16 +100,16 @@ public void testSmilesFiles() throws Exception {
100100
CDKAtomTypeMatcher atomTypeMatcher = CDKAtomTypeMatcher.getInstance(SilentChemObjectBuilder.getInstance());
101101

102102
// Read the first file
103-
String filename = "data/cml/smiles1.cml";
104-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
103+
String filename = "smiles1.cml";
104+
InputStream ins = this.getClass().getResourceAsStream(filename);
105105
CMLReader reader = new CMLReader(ins);
106106
IChemFile chemFile = (IChemFile) reader.read(new ChemFile());
107107
Assert.assertNotNull(chemFile);
108108
IAtomContainer mol1 = ChemFileManipulator.getAllAtomContainers(chemFile).get(0);
109109

110110
// Read the second file
111-
filename = "data/cml/smiles2.cml";
112-
ins = this.getClass().getClassLoader().getResourceAsStream(filename);
111+
filename = "smiles2.cml";
112+
ins = this.getClass().getResourceAsStream(filename);
113113
reader = new CMLReader(ins);
114114
chemFile = (IChemFile) reader.read(new ChemFile());
115115
Assert.assertNotNull(chemFile);

‎base/test-core/src/test/java/org/openscience/cdk/graph/SpanningTreeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public class SpanningTreeTest extends CDKTestCase {
5252
public void setUp() throws Exception {
5353
if (azulene == null) {
5454
// load azulene
55-
String filename = "data/mdl/azulene.mol";
56-
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
55+
String filename = "azulene.mol";
56+
InputStream ins = this.getClass().getResourceAsStream(filename);
5757
MDLV2000Reader reader = new MDLV2000Reader(ins, Mode.STRICT);
5858
IChemFile chemFile = (IChemFile) reader.read(new ChemFile());
5959
IChemSequence seq = chemFile.getChemSequence(0);

‎base/test-core/src/test/resources/data/mdl/2,5-dimethyl-furan.mol

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
Marvin 06080414532D
3+
4+
7 7 0 0 0 0 999 V2000
5+
-1.6250 1.7775 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0
6+
-2.3394 2.1900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
7+
-2.3394 3.0150 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
8+
-0.9105 3.0150 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
9+
-0.9105 2.1900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
10+
-3.0539 1.7775 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
11+
-0.1961 1.7775 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
12+
1 5 1 0 0 0 0
13+
2 3 2 0 0 0 0
14+
3 4 1 0 0 0 0
15+
4 5 2 0 0 0 0
16+
2 1 1 0 0 0 0
17+
2 6 1 0 0 0 0
18+
5 7 1 0 0 0 0
19+
M END

‎base/test-core/src/test/resources/data/mdl/9553.mol

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
CDK 5/1/07,17:52
3+
NMRShiftDB 30101791 www.nmrshiftdb.org_mainz2_2006-06-29_02:04:42_0074
4+
13 15 0 0 0 0 0 0 0 0999 V2000
5+
2.0100 -2.8900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
6+
3.0000 -2.3000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
7+
3.0000 -1.1500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
8+
2.0100 -0.5800 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
9+
1.0000 -1.1500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
10+
1.0000 -2.3000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
11+
3.9900 -2.8900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
12+
5.0000 -2.3000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
13+
5.0000 -1.1500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
14+
3.9900 -0.5800 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
15+
3.0000 0.0000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
16+
0.0000 -2.8800 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0
17+
3.0000 -3.4600 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0
18+
1 2 1 0 0 0 0
19+
1 6 1 0 0 0 0
20+
1 13 1 6 0 0 0
21+
2 3 1 0 0 0 0
22+
2 7 1 0 0 0 0
23+
2 13 1 6 0 0 0
24+
3 4 1 0 0 0 0
25+
3 10 1 0 0 0 0
26+
3 11 1 1 0 0 0
27+
4 5 1 0 0 0 0
28+
5 6 1 0 0 0 0
29+
6 12 1 6 0 0 0
30+
7 8 1 0 0 0 0
31+
8 9 1 0 0 0 0
32+
9 10 1 0 0 0 0
33+
M END

‎base/test-core/src/test/resources/data/mdl/9554.mol

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
CDK 5/1/07,17:50
3+
NMRShiftDB 20129331 www.nmrshiftdb.org_mainz2_2007-04-24_01:44:37_0265
4+
13 15 0 0 0 0 0 0 0 0999 V2000
5+
2.0100 -2.8900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
6+
3.0000 -2.3000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
7+
3.0000 -1.1500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
8+
2.0100 -0.5800 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
9+
1.0000 -1.1500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
10+
1.0000 -2.3000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
11+
3.9900 -2.8900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
12+
5.0000 -2.3000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
13+
5.0000 -1.1500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
14+
3.9900 -0.5800 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
15+
3.0000 0.0000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
16+
0.0000 -2.8800 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0
17+
3.0000 -3.4600 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0
18+
1 2 1 0 0 0 0
19+
1 6 1 0 0 0 0
20+
1 13 1 1 0 0 0
21+
2 3 1 0 0 0 0
22+
2 7 1 0 0 0 0
23+
2 13 1 1 0 0 0
24+
3 4 1 0 0 0 0
25+
3 10 1 0 0 0 0
26+
3 11 1 1 0 0 0
27+
4 5 1 0 0 0 0
28+
5 6 1 0 0 0 0
29+
6 12 1 6 0 0 0
30+
7 8 1 0 0 0 0
31+
8 9 1 0 0 0 0
32+
9 10 1 0 0 0 0
33+
M END

‎base/test-core/src/test/resources/data/mdl/Butane-TestFF-output.mol

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
CDK 6/29/06,10:24
3+
4+
14 13 0 0 0 0 0 0 0 0999 V2000
5+
147.8819 953.6069 53.8011 C 0 0 0 0 0 0 0 0 0 0 0 0
6+
149.1023 952.8362 53.6091 C 0 0 0 0 0 0 0 0 0 0 0 0
7+
150.2956 953.8043 53.4809 C 0 0 0 0 0 0 0 0 0 0 0 0
8+
150.9229 953.4272 53.5792 C 0 0 0 0 0 0 0 0 0 0 0 0
9+
151.1362 953.9105 53.6867 H 0 0 0 0 0 0 0 0 0 0 0 0
10+
150.7767 953.1669 53.1275 H 0 0 0 0 0 0 0 0 0 0 0 0
11+
151.3891 953.4084 53.3041 H 0 0 0 0 0 0 0 0 0 0 0 0
12+
147.2108 953.4510 52.9819 H 0 0 0 0 0 0 0 0 0 0 0 0
13+
148.1120 954.6724 53.8648 H 0 0 0 0 0 0 0 0 0 0 0 0
14+
147.3902 953.3076 54.7086 H 0 0 0 0 0 0 0 0 0 0 0 0
15+
149.0220 952.2491 52.7396 H 0 0 0 0 0 0 0 0 0 0 0 0
16+
149.2513 952.1873 54.4308 H 0 0 0 0 0 0 0 0 0 0 0 0
17+
150.2944 954.3270 52.3714 H 0 0 0 0 0 0 0 0 0 0 0 0
18+
150.2084 954.6871 54.3182 H 0 0 0 0 0 0 0 0 0 0 0 0
19+
1 2 1 0 0 0 0
20+
2 3 1 0 0 0 0
21+
3 4 1 0 0 0 0
22+
4 5 1 0 0 0 0
23+
4 6 1 0 0 0 0
24+
4 7 1 0 0 0 0
25+
1 8 1 0 0 0 0
26+
1 9 1 0 0 0 0
27+
1 10 1 0 0 0 0
28+
2 11 1 0 0 0 0
29+
2 12 1 0 0 0 0
30+
3 13 1 0 0 0 0
31+
3 14 1 0 0 0 0
32+
M END

‎base/test-core/src/test/resources/data/mdl/Butane-TestFF.mol

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
CDK 1/16/06,12:38
3+
4+
14 13 0 0 0 0 0 0 0 0999 V2000
5+
106.0000 949.0000 10.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
6+
137.0000 966.0000 20.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
7+
162.0000 941.0000 30.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
8+
193.0000 958.0000 40.0000 C 0 0 0 0 0 0 0 0 0 0 0 0
9+
210.0000 927.0000 50.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
10+
224.0000 975.0000 60.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
11+
176.0000 989.0000 70.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
12+
89.0000 980.0000 80.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
13+
75.0000 932.0000 90.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
14+
123.0000 918.0000 80.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
15+
164.2496 988.5268 70.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
16+
117.1478 995.2556 60.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
17+
134.7504 918.4732 50.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
18+
181.8522 911.7444 40.0000 H 0 0 0 0 0 0 0 0 0 0 0 0
19+
1 2 1 0 0 0 0
20+
2 3 1 0 0 0 0
21+
3 4 1 0 0 0 0
22+
4 5 1 0 0 0 0
23+
4 6 1 0 0 0 0
24+
4 7 1 0 0 0 0
25+
1 8 1 0 0 0 0
26+
1 9 1 0 0 0 0
27+
1 10 1 0 0 0 0
28+
2 11 1 0 0 0 0
29+
2 12 1 0 0 0 0
30+
3 13 1 0 0 0 0
31+
3 14 1 0 0 0 0
32+
M END

‎base/test-core/src/test/resources/data/mdl/C12308.mol

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
2+
ISISHOST08160423312D 1 1.00000 0.00000 14771
3+
4+
27 31 0 1 0 999 V2000
5+
4.3958 -12.0458 0.0000 H 0 0 0 0 0 0 0 0 0
6+
3.9875 -11.3291 0.0000 C 0 0 1 0 0 0 0 0 0
7+
5.2210 -10.6117 0.0000 C 0 0 1 0 0 0 0 0 0
8+
4.6072 -10.2531 0.0000 C 0 0 2 0 0 0 0 0 0
9+
5.2245 -11.3221 0.0000 C 0 0 1 0 0 0 0 0 0
10+
5.8383 -10.2566 0.0000 C 0 0 0 0 0 0 0 0 0
11+
5.8314 -10.9635 0.0000 C 0 0 0 0 0 0 0 0 0
12+
3.9900 -10.6117 0.0000 C 0 0 2 0 0 0 0 0 0
13+
4.6072 -9.5428 0.0000 C 0 0 0 0 0 0 0 0 0
14+
5.8865 -11.7083 0.0000 C 0 0 0 0 0 0 0 0 0
15+
5.8383 -9.5462 0.0000 C 0 0 2 0 0 0 0 0 0
16+
6.4486 -9.8945 0.0000 C 0 0 0 0 0 0 0 0 0
17+
3.3693 -10.2531 0.0000 C 0 0 0 0 0 0 0 0 0
18+
3.9831 -9.8945 0.0000 C 0 0 0 0 0 0 0 0 0
19+
5.2210 -9.1911 0.0000 C 0 0 0 0 0 0 0 0 0
20+
3.3693 -11.6842 0.0000 C 0 0 2 0 0 0 0 0 0
21+
6.5589 -11.3152 0.0000 O 0 0 0 0 0 0 0 0 0
22+
5.8831 -12.4842 0.0000 O 0 0 0 0 0 0 0 0 0
23+
6.4486 -9.1876 0.0000 O 0 0 0 0 0 0 0 0 0
24+
7.1314 -9.7117 0.0000 C 0 0 0 0 0 0 0 0 0
25+
2.7555 -10.6117 0.0000 C 0 0 0 0 0 0 0 0 0
26+
3.3314 -9.5221 0.0000 O 0 0 0 0 0 0 0 0 0
27+
2.7555 -11.3255 0.0000 C 0 0 0 0 0 0 0 0 0
28+
4.6003 -10.9635 0.0000 H 0 0 0 0 0 0 0 0 0
29+
2.6750 -9.8958 0.0000 C 0 0 0 0 0 0 0 0 0
30+
1.8500 -9.8958 0.0000 O 0 0 0 0 0 0 0 0 0
31+
3.3625 -12.5083 0.0000 C 0 0 0 0 0 0 0 0 0
32+
3 5 1 0 0 0
33+
3 6 1 0 0 0
34+
3 7 1 1 0 0
35+
4 8 1 0 0 0
36+
4 9 1 0 0 0
37+
5 2 1 0 0 0
38+
5 10 1 1 0 0
39+
6 11 1 0 0 0
40+
7 12 1 0 0 0
41+
8 13 1 0 0 0
42+
8 14 1 6 0 0
43+
9 15 1 0 0 0
44+
2 16 1 0 0 0
45+
10 17 1 0 0 0
46+
10 18 2 0 0 0
47+
11 19 1 6 0 0
48+
12 20 2 0 0 0
49+
14 22 1 0 0 0
50+
16 23 1 0 0 0
51+
8 2 1 0 0 0
52+
11 12 1 1 0 0
53+
11 15 1 0 0 0
54+
21 23 1 0 0 0
55+
4 24 1 1 0 0
56+
22 25 1 0 0 0
57+
25 16 1 0 0 0
58+
2 1 1 1 0 0
59+
25 26 2 0 0 0
60+
3 4 1 0 0 0
61+
16 27 1 1 0 0
62+
21 13 1 0 0 0
63+
M END

‎base/test-core/src/test/resources/data/mdl/Ethane-TestFF-output.mol

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
CDK 8/5/06,19:9
3+
4+
8 7 0 0 0 0 0 0 0 0999 V2000
5+
-0.0694 -0.2909 0.0591 C 0 0 0 0 0 0 0 0 0 0 0 0
6+
-0.8585 -0.8122 0.5561 H 0 0 0 0 0 0 0 0 0 0 0 0
7+
0.7359 -0.1545 0.7482 H 0 0 0 0 0 0 0 0 0 0 0 0
8+
-0.4301 0.6700 -0.2378 H 0 0 0 0 0 0 0 0 0 0 0 0
9+
0.3835 -1.0476 -1.1095 C 0 0 0 0 0 0 0 0 0 0 0 0
10+
0.7347 -2.0204 -0.8119 H 0 0 0 0 0 0 0 0 0 0 0 0
11+
-0.4243 -1.1737 -1.8094 H 0 0 0 0 0 0 0 0 0 0 0 0
12+
1.1872 -0.5286 -1.6027 H 0 0 0 0 0 0 0 0 0 0 0 0
13+
1 2 1 0 0 0 0
14+
1 3 1 0 0 0 0
15+
1 4 1 0 0 0 0
16+
1 5 1 0 0 0 0
17+
5 6 1 0 0 0 0
18+
5 7 1 0 0 0 0
19+
5 8 1 0 0 0 0
20+
M END

0 commit comments

Comments
 (0)