Permalink
Browse files

We can remove the dependence on cdk-extra and valency check by not us…

…e the MoleculeFactory. Using cdk-data (test) isn't ideal but is better than extra.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
  • Loading branch information...
1 parent 898e3ae commit 17b5f5bbf1e77656c53c9ec0a997a9033c36c1ba @johnmay johnmay committed with egonw Feb 18, 2014
View
@@ -48,35 +48,30 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>cdk-test</artifactId>
+ <artifactId>cdk-data</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>cdk-silent</artifactId>
- <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>cdk-smiles</artifactId>
+ <artifactId>cdk-test</artifactId>
<version>${project.parent.version}</version>
- <scope>test</scope>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>cdk-valencycheck</artifactId>
+ <artifactId>cdk-silent</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>cdk-extra</artifactId>
+ <artifactId>cdk-smiles</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
@@ -33,7 +33,7 @@
import org.openscience.cdk.interfaces.IBond;
import org.openscience.cdk.interfaces.IChemObjectBuilder;
import org.openscience.cdk.silent.SilentChemObjectBuilder;
-import org.openscience.cdk.templates.MoleculeFactory;
+import org.openscience.cdk.templates.TestMoleculeFactory;
import org.openscience.cdk.tools.manipulator.AtomContainerManipulator;
/**
@@ -208,7 +208,7 @@ public void getAutomorphismPartitionTest() {
@Test
public void testAzulene() throws Exception {
- IAtomContainer mol = MoleculeFactory.makeAzulene();
+ IAtomContainer mol = TestMoleculeFactory.makeAzulene();
Assert.assertNotNull("Created molecule was null", mol);
AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
@@ -233,7 +233,7 @@ public void testAzulene() throws Exception {
*/
@Test
public void testPyrimidine() throws Exception {
- IAtomContainer mol = MoleculeFactory.makePyrimidine();
+ IAtomContainer mol = TestMoleculeFactory.makePyrimidine();
AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
CDKHueckelAromaticityDetector.detectAromaticity(mol);
Assert.assertNotNull("Created molecule was null", mol);
@@ -255,7 +255,7 @@ public void testPyrimidine() throws Exception {
*/
@Test
public void testBiphenyl() throws Exception {
- IAtomContainer mol = MoleculeFactory.makeBiphenyl();
+ IAtomContainer mol = TestMoleculeFactory.makeBiphenyl();
AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
CDKHueckelAromaticityDetector.detectAromaticity(mol);
Assert.assertNotNull("Created molecule was null", mol);
@@ -32,7 +32,7 @@
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IChemObjectBuilder;
import org.openscience.cdk.silent.SilentChemObjectBuilder;
-import org.openscience.cdk.templates.MoleculeFactory;
+import org.openscience.cdk.templates.TestMoleculeFactory;
import org.openscience.cdk.tools.manipulator.AtomContainerManipulator;
/**
@@ -215,7 +215,7 @@ public void getAutomorphismPartitionTest() {
@Test
public void testAzulene() throws Exception {
- IAtomContainer mol = MoleculeFactory.makeAzulene();
+ IAtomContainer mol = TestMoleculeFactory.makeAzulene();
Assert.assertNotNull("Created molecule was null", mol);
AtomContainerPrinter.print(mol);
@@ -240,7 +240,7 @@ public void testAzulene() throws Exception {
*/
@Test
public void testPyrimidine() throws Exception {
- IAtomContainer mol = MoleculeFactory.makePyrimidine();
+ IAtomContainer mol = TestMoleculeFactory.makePyrimidine();
AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
CDKHueckelAromaticityDetector.detectAromaticity(mol);
Assert.assertNotNull("Created molecule was null", mol);
@@ -262,7 +262,7 @@ public void testPyrimidine() throws Exception {
*/
@Test
public void testBiphenyl() throws Exception {
- IAtomContainer mol = MoleculeFactory.makeBiphenyl();
+ IAtomContainer mol = TestMoleculeFactory.makeBiphenyl();
AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(mol);
CDKHueckelAromaticityDetector.detectAromaticity(mol);
Assert.assertNotNull("Created molecule was null", mol);

0 comments on commit 17b5f5b

Please sign in to comment.