Skip to content

Commit db19f62

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Move the TestMoleculeFactory to cdk-data/main. I'm not super happy about this but seems like the simplest solution. The other being to make the tests pass in a builder, or have the test molecule factory dynamically find the IChemObjectBuilder - that would be good except for now Java really doesn't like reflective access between modules.
1 parent 190a957 commit db19f62

File tree

27 files changed

+1
-176
lines changed

27 files changed

+1
-176
lines changed

‎base/data/src/test/java/org/openscience/cdk/templates/TestMoleculeFactory.java renamed to ‎base/data/src/main/java/org/openscience/cdk/templates/TestMoleculeFactory.java

File renamed without changes.

‎base/isomorphism/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@
5858
<version>${project.parent.version}</version>
5959
<scope>test</scope>
6060
</dependency>
61-
<dependency>
62-
<groupId>${project.groupId}</groupId>
63-
<artifactId>cdk-data</artifactId>
64-
<version>${project.parent.version}</version>
65-
<type>test-jar</type>
66-
<scope>test</scope>
67-
</dependency>
6861
<dependency>
6962
<groupId>${project.groupId}</groupId>
7063
<artifactId>cdk-test</artifactId>

‎base/reaction/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@
8686
<type>test-jar</type>
8787
<scope>test</scope>
8888
</dependency>
89-
<dependency>
90-
<groupId>${project.groupId}</groupId>
91-
<artifactId>cdk-data</artifactId>
92-
<version>${project.parent.version}</version>
93-
<type>test-jar</type>
94-
<scope>test</scope>
95-
</dependency>
9689
<dependency>
9790
<groupId>${project.groupId}</groupId>
9891
<artifactId>cdk-testdata</artifactId>

‎base/test-atomtype/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@
8080
<type>test-jar</type>
8181
<scope>test</scope>
8282
</dependency>
83-
<dependency>
84-
<groupId>${project.groupId}</groupId>
85-
<artifactId>cdk-data</artifactId>
86-
<version>${project.parent.version}</version>
87-
<type>test-jar</type>
88-
<scope>test</scope>
89-
</dependency>
9083
</dependencies>
9184

9285
<build>

‎base/test-core/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@
5858
<version>${project.parent.version}</version>
5959
<scope>test</scope>
6060
</dependency>
61-
<dependency>
62-
<groupId>${project.groupId}</groupId>
63-
<artifactId>cdk-data</artifactId>
64-
<version>${project.parent.version}</version>
65-
<type>test-jar</type>
66-
<scope>test</scope>
67-
</dependency>
6861
<dependency>
6962
<groupId>${project.groupId}</groupId>
7063
<artifactId>cdk-standard</artifactId>

‎base/test-standard/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@
6363
<version>${project.parent.version}</version>
6464
<scope>test</scope>
6565
</dependency>
66-
<dependency>
67-
<groupId>${project.groupId}</groupId>
68-
<artifactId>cdk-data</artifactId>
69-
<version>${project.parent.version}</version>
70-
<type>test-jar</type>
71-
<scope>test</scope>
72-
</dependency>
7366
<dependency>
7467
<groupId>${project.groupId}</groupId>
7568
<artifactId>cdk-silent</artifactId>

‎base/test-valencycheck/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<artifactId>cdk-testdata</artifactId>
102102
<version>${project.parent.version}</version>
103103
<type>test-jar</type>
104-
<scope>test</scope>
104+
<scope>test</scope>
105105
</dependency>
106106
</dependencies>
107107

‎descriptor/fingerprint/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@
8080
<type>test-jar</type>
8181
<scope>test</scope>
8282
</dependency>
83-
<dependency>
84-
<groupId>${project.groupId}</groupId>
85-
<artifactId>cdk-data</artifactId>
86-
<version>${project.parent.version}</version>
87-
<type>test-jar</type>
88-
<scope>test</scope>
89-
</dependency>
9083
<dependency>
9184
<groupId>${project.groupId}</groupId>
9285
<artifactId>cdk-smiles</artifactId>

‎descriptor/qsarcml/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@
8585
<version>${project.parent.version}</version>
8686
<scope>test</scope>
8787
</dependency>
88-
<dependency>
89-
<groupId>${project.groupId}</groupId>
90-
<artifactId>cdk-data</artifactId>
91-
<version>${project.parent.version}</version>
92-
<type>test-jar</type>
93-
<scope>test</scope>
94-
</dependency>
9588
</dependencies>
9689

9790
</project>

‎descriptor/qsarmolecular/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,6 @@
141141
<type>test-jar</type>
142142
<scope>test</scope>
143143
</dependency>
144-
<dependency>
145-
<groupId>${project.groupId}</groupId>
146-
<artifactId>cdk-data</artifactId>
147-
<version>${project.parent.version}</version>
148-
<type>test-jar</type>
149-
<scope>test</scope>
150-
</dependency>
151144
<dependency>
152145
<groupId>${project.groupId}</groupId>
153146
<artifactId>cdk-qsar</artifactId>

0 commit comments

Comments
 (0)