Replacing the deprecated 'junit.framework' with the newer 'org.junit'.

Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
cdk · Aug 1, 2013 · dd46cca · dd46cca
1 parent 9cd9ce4
commit dd46cca
Show file tree

Hide file tree

Showing 27 changed files with 33 additions and 33 deletions.
diff --git a/src/test/org/openscience/cdk/fingerprint/ShortestPathFingerprinterTest.java b/src/test/org/openscience/cdk/fingerprint/ShortestPathFingerprinterTest.java
@@ -91,8 +91,8 @@ public void testGenerateFingerprint() throws InvalidSmilesException, CDKExceptio
         ShortestPathFingerprinter fingerprint = new ShortestPathFingerprinter(1024);
         BitSet fingerprint1;
         fingerprint1 = fingerprint.getBitFingerprint(molecule).asBitSet();
-        junit.framework.Assert.assertEquals(125, fingerprint1.cardinality());
-        junit.framework.Assert.assertEquals(1024, fingerprint1.size());
+        org.junit.Assert.assertEquals(125, fingerprint1.cardinality());
+        org.junit.Assert.assertEquals(1024, fingerprint1.size());
     }
 
     /**
@@ -116,7 +116,7 @@ public void testGenerateFingerprintIsSubset() throws InvalidSmilesException, CDK
         fingerprintQ = fingerprint.getBitFingerprint(moleculeQ).asBitSet();
         fingerprintT = fingerprint.getBitFingerprint(moleculeT).asBitSet();
 
-        junit.framework.Assert.assertTrue(FingerprinterTool.isSubset(fingerprintT, fingerprintQ));
+        org.junit.Assert.assertTrue(FingerprinterTool.isSubset(fingerprintT, fingerprintQ));
     }
 
     /**
@@ -142,7 +142,7 @@ public void testGenerateFingerprintIsNotASubset1() throws InvalidSmilesException
         BitSet fingerprintT;
         fingerprintQ = fingerprint.getBitFingerprint(moleculeQ).asBitSet();
         fingerprintT = fingerprint.getBitFingerprint(moleculeT).asBitSet();
-        junit.framework.Assert.assertFalse(FingerprinterTool.isSubset(fingerprintT, fingerprintQ));
+        org.junit.Assert.assertFalse(FingerprinterTool.isSubset(fingerprintT, fingerprintQ));
     }
 
     @Test
@@ -154,7 +154,7 @@ public void testGenerateFingerprintAnthracene() throws InvalidSmilesException, E
         ShortestPathFingerprinter fingerprint = new ShortestPathFingerprinter(1024);
         BitSet fingerprint1;
         fingerprint1 = fingerprint.getBitFingerprint(molecule).asBitSet();
-        junit.framework.Assert.assertEquals(10, fingerprint1.cardinality());
+        org.junit.Assert.assertEquals(10, fingerprint1.cardinality());
     }
 
     @Test
@@ -166,7 +166,7 @@ public void testGenerateFingerprintNaphthalene() throws InvalidSmilesException,
         ShortestPathFingerprinter fingerprint = new ShortestPathFingerprinter(1024);
         BitSet fingerprint1;
         fingerprint1 = fingerprint.getBitFingerprint(molecule).asBitSet();
-        junit.framework.Assert.assertEquals(8, fingerprint1.cardinality());
+        org.junit.Assert.assertEquals(8, fingerprint1.cardinality());
     }
 
     @Test
@@ -179,7 +179,7 @@ public void testGenerateFingerprintMultiphtalene() throws InvalidSmilesException
         ShortestPathFingerprinter fingerprint = new ShortestPathFingerprinter(1024);
         BitSet fingerprint1;
         fingerprint1 = fingerprint.getBitFingerprint(molecule).asBitSet();
-        junit.framework.Assert.assertEquals(15, fingerprint1.cardinality());
+        org.junit.Assert.assertEquals(15, fingerprint1.cardinality());
     }
 
     @Test

diff --git a/src/test/org/openscience/cdk/group/AbstractDiscretePartitionRefinerTest.java b/src/test/org/openscience/cdk/group/AbstractDiscretePartitionRefinerTest.java
@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/AtomDiscretePartitionRefinerTest.java b/src/test/org/openscience/cdk/group/AtomDiscretePartitionRefinerTest.java
@@ -24,7 +24,7 @@
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/AtomEquitablePartitionRefinerTest.java b/src/test/org/openscience/cdk/group/AtomEquitablePartitionRefinerTest.java
@@ -3,7 +3,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/AtomGroupTests.java b/src/test/org/openscience/cdk/group/AtomGroupTests.java
@@ -22,7 +22,7 @@
  */
 package org.openscience.cdk.group;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/AtomPermutationTests.java b/src/test/org/openscience/cdk/group/AtomPermutationTests.java
@@ -1,6 +1,6 @@
 package org.openscience.cdk.group;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/BondDiscretePartitionRefinerTest.java b/src/test/org/openscience/cdk/group/BondDiscretePartitionRefinerTest.java
@@ -24,7 +24,7 @@
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/BondEquitablePartitionRefinerTest.java b/src/test/org/openscience/cdk/group/BondEquitablePartitionRefinerTest.java
@@ -3,7 +3,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/BondGroupTests.java b/src/test/org/openscience/cdk/group/BondGroupTests.java
@@ -22,7 +22,7 @@
  */
 package org.openscience.cdk.group;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.openscience.cdk.CDKTestCase;

diff --git a/src/test/org/openscience/cdk/group/DisjointSetForestTest.java b/src/test/org/openscience/cdk/group/DisjointSetForestTest.java
@@ -24,7 +24,7 @@
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

diff --git a/src/test/org/openscience/cdk/layout/HydrogenPlacerTest.java b/src/test/org/openscience/cdk/layout/HydrogenPlacerTest.java
@@ -42,7 +42,7 @@
 import javax.vecmath.Point2d;
 import java.io.InputStream;
 
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 
 /** @cdk.module test-sdg */
 public class HydrogenPlacerTest extends CDKTestCase {

diff --git a/src/test/org/openscience/cdk/modeling/builder3d/ForceFieldConfiguratorTest.java b/src/test/org/openscience/cdk/modeling/builder3d/ForceFieldConfiguratorTest.java
@@ -23,7 +23,7 @@
 package org.openscience.cdk.modeling.builder3d;
 
 
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
 
 import java.util.List;
 

diff --git a/src/test/org/openscience/cdk/renderer/generators/AtomContainerBoundsGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/AtomContainerBoundsGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/AtomMassGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/AtomMassGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/AtomNumberGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/AtomNumberGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/BoundsGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/BoundsGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ExtendedAtomGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ExtendedAtomGeneratorTest.java
@@ -30,7 +30,7 @@
 
 import javax.vecmath.Point2d;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/LonePairGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/LonePairGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/MappingGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/MappingGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ProductsBoxGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ProductsBoxGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/RadicalGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/RadicalGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ReactantsBoxGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ReactantsBoxGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ReactionArrowGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ReactionArrowGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ReactionBoxGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ReactionBoxGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ReactionPlusGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ReactionPlusGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/ReactionSceneGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/ReactionSceneGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/org/openscience/cdk/renderer/generators/RingGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/RingGeneratorTest.java
@@ -24,7 +24,7 @@
 import java.awt.Rectangle;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;