Skip to content

Commit 08a15e8

Browse files
johnmayegonw
authored andcommitted
This code is deprecated we don't need the full Desctiptor basic checks. Note it may make sense to move the descriptor interfaces to CDK interfacts then the descriptor tests can go to into cdk-test.
1 parent 350ce8f commit 08a15e8

File tree

4 files changed

+10
-21
lines changed

4 files changed

+10
-21
lines changed

legacy/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -178,21 +178,6 @@
178178
<artifactId>cdk-qsaratomic</artifactId>
179179
<version>${project.version}</version>
180180
<scope>test</scope>
181-
<type>test-jar</type>
182-
</dependency>
183-
<dependency>
184-
<groupId>org.openscience.cdk</groupId>
185-
<artifactId>cdk-qsarbond</artifactId>
186-
<version>${project.version}</version>
187-
<scope>test</scope>
188-
<type>test-jar</type>
189-
</dependency>
190-
<dependency>
191-
<groupId>org.openscience.cdk</groupId>
192-
<artifactId>cdk-qsarmolecular</artifactId>
193-
<version>${project.version}</version>
194-
<scope>test</scope>
195-
<type>test-jar</type>
196181
</dependency>
197182
<dependency>
198183
<groupId>org.mockito</groupId>

legacy/src/test/java/org/openscience/cdk/qsar/descriptors/atomic/IPAtomicLearningDescriptorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.junit.Ignore;
2424
import org.junit.Test;
2525
import org.junit.experimental.categories.Category;
26+
import org.openscience.cdk.CDKTestCase;
2627
import org.openscience.cdk.DefaultChemObjectBuilder;
2728
import org.openscience.cdk.SlowTest;
2829
import org.openscience.cdk.exception.CDKException;
@@ -42,7 +43,7 @@
4243
*
4344
* @cdk.module test-qsarionpot
4445
*/
45-
public class IPAtomicLearningDescriptorTest extends AtomicDescriptorTest {
46+
public class IPAtomicLearningDescriptorTest extends CDKTestCase {
4647

4748
IPAtomicLearningDescriptor descriptor;
4849
private SmilesParser sp = new SmilesParser(DefaultChemObjectBuilder.getInstance());
@@ -59,7 +60,7 @@ public IPAtomicLearningDescriptorTest() {
5960

6061
@Before
6162
public void setUp() throws Exception {
62-
setDescriptor(IPAtomicLearningDescriptor.class);
63+
descriptor = new IPAtomicLearningDescriptor();
6364
}
6465

6566
/**

legacy/src/test/java/org/openscience/cdk/qsar/descriptors/bond/IPBondLearningDescriptorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.junit.Ignore;
2424
import org.junit.Test;
2525
import org.junit.experimental.categories.Category;
26+
import org.openscience.cdk.CDKTestCase;
2627
import org.openscience.cdk.DefaultChemObjectBuilder;
2728
import org.openscience.cdk.SlowTest;
2829
import org.openscience.cdk.interfaces.IAtomContainer;
@@ -36,7 +37,7 @@
3637
*
3738
* @cdk.module test-qsarionpot
3839
*/
39-
public class IPBondLearningDescriptorTest extends BondDescriptorTest {
40+
public class IPBondLearningDescriptorTest extends CDKTestCase {
4041

4142
private IPBondLearningDescriptor descriptor;
4243
private LonePairElectronChecker lpcheck = new LonePairElectronChecker();
@@ -51,7 +52,7 @@ public IPBondLearningDescriptorTest() {
5152

5253
@Before
5354
public void setUp() throws Exception {
54-
setDescriptor(IPBondLearningDescriptor.class);
55+
descriptor = new IPBondLearningDescriptor();
5556
}
5657

5758
/**

legacy/src/test/java/org/openscience/cdk/qsar/descriptors/molecular/IPMolecularLearningDescriptorTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.Before;
2323
import org.junit.Test;
2424
import org.junit.experimental.categories.Category;
25+
import org.openscience.cdk.CDKTestCase;
2526
import org.openscience.cdk.DefaultChemObjectBuilder;
2627
import org.openscience.cdk.SlowTest;
2728
import org.openscience.cdk.interfaces.IAtom;
@@ -41,8 +42,9 @@
4142
*
4243
* @cdk.module test-qsarionpot
4344
*/
44-
public class IPMolecularLearningDescriptorTest extends MolecularDescriptorTest {
45+
public class IPMolecularLearningDescriptorTest extends CDKTestCase {
4546

47+
IPMolecularLearningDescriptor descriptor;
4648
private SmilesParser sp = new SmilesParser(DefaultChemObjectBuilder.getInstance());
4749
private IChemObjectBuilder builder = SilentChemObjectBuilder.getInstance();
4850
private LonePairElectronChecker lpcheck = new LonePairElectronChecker();
@@ -55,7 +57,7 @@ public IPMolecularLearningDescriptorTest() {}
5557

5658
@Before
5759
public void setUp() throws Exception {
58-
super.setDescriptor(IPMolecularLearningDescriptor.class);
60+
descriptor = new IPMolecularLearningDescriptor();
5961
}
6062

6163
@Test

0 commit comments

Comments
 (0)