diff --git a/src/test/org/openscience/cdk/geometry/cip/ImmutableHydrogenTest.java b/src/test/org/openscience/cdk/geometry/cip/ImmutableHydrogenTest.java index fac0b744461..5d8bf1488d7 100644 --- a/src/test/org/openscience/cdk/geometry/cip/ImmutableHydrogenTest.java +++ b/src/test/org/openscience/cdk/geometry/cip/ImmutableHydrogenTest.java @@ -27,8 +27,7 @@ import javax.vecmath.Point2d; import javax.vecmath.Point3d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.CDKTestCase; import org.openscience.cdk.interfaces.IAtom; diff --git a/src/test/org/openscience/cdk/geometry/volume/VABCVolumeTest.java b/src/test/org/openscience/cdk/geometry/volume/VABCVolumeTest.java index f6317e18276..77cb2797034 100644 --- a/src/test/org/openscience/cdk/geometry/volume/VABCVolumeTest.java +++ b/src/test/org/openscience/cdk/geometry/volume/VABCVolumeTest.java @@ -18,8 +18,7 @@ */ package org.openscience.cdk.geometry.volume; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.openscience.cdk.exception.CDKException; diff --git a/src/test/org/openscience/cdk/io/formats/PubChemCompoundXMLFormatTest.java b/src/test/org/openscience/cdk/io/formats/PubChemCompoundXMLFormatTest.java index ed7c410469e..b734620d110 100644 --- a/src/test/org/openscience/cdk/io/formats/PubChemCompoundXMLFormatTest.java +++ b/src/test/org/openscience/cdk/io/formats/PubChemCompoundXMLFormatTest.java @@ -24,8 +24,7 @@ */ package org.openscience.cdk.io.formats; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; /** diff --git a/src/test/org/openscience/cdk/io/formats/PubChemCompoundsXMLFormatTest.java b/src/test/org/openscience/cdk/io/formats/PubChemCompoundsXMLFormatTest.java index 505f435d547..a03d50b98ba 100644 --- a/src/test/org/openscience/cdk/io/formats/PubChemCompoundsXMLFormatTest.java +++ b/src/test/org/openscience/cdk/io/formats/PubChemCompoundsXMLFormatTest.java @@ -27,8 +27,7 @@ import java.io.BufferedReader; import java.io.StringReader; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; /** diff --git a/src/test/org/openscience/cdk/io/formats/PubChemSubstancesXMLFormatTest.java b/src/test/org/openscience/cdk/io/formats/PubChemSubstancesXMLFormatTest.java index 70f1cf28efe..75f7d03cb8b 100644 --- a/src/test/org/openscience/cdk/io/formats/PubChemSubstancesXMLFormatTest.java +++ b/src/test/org/openscience/cdk/io/formats/PubChemSubstancesXMLFormatTest.java @@ -24,8 +24,7 @@ */ package org.openscience.cdk.io.formats; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; /** diff --git a/src/test/org/openscience/cdk/io/rdf/CDKOWLWriterTest.java b/src/test/org/openscience/cdk/io/rdf/CDKOWLWriterTest.java index 09899af4efd..dae4f99c93c 100644 --- a/src/test/org/openscience/cdk/io/rdf/CDKOWLWriterTest.java +++ b/src/test/org/openscience/cdk/io/rdf/CDKOWLWriterTest.java @@ -24,8 +24,7 @@ import java.io.StringWriter; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.openscience.cdk.interfaces.IBond; diff --git a/src/test/org/openscience/cdk/libio/jena/ConvertorTest.java b/src/test/org/openscience/cdk/libio/jena/ConvertorTest.java index 09aa0c1d7b6..19c26c27d71 100644 --- a/src/test/org/openscience/cdk/libio/jena/ConvertorTest.java +++ b/src/test/org/openscience/cdk/libio/jena/ConvertorTest.java @@ -22,18 +22,17 @@ */ package org.openscience.cdk.libio.jena; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.CDKTestCase; import org.openscience.cdk.PseudoAtom; import org.openscience.cdk.interfaces.IAtom; +import org.openscience.cdk.interfaces.IAtomType.Hybridization; import org.openscience.cdk.interfaces.IBond; +import org.openscience.cdk.interfaces.IBond.Order; import org.openscience.cdk.interfaces.IChemObjectBuilder; import org.openscience.cdk.interfaces.IMolecule; import org.openscience.cdk.interfaces.IPseudoAtom; -import org.openscience.cdk.interfaces.IAtomType.Hybridization; -import org.openscience.cdk.interfaces.IBond.Order; import org.openscience.cdk.nonotify.NNAtom; import org.openscience.cdk.nonotify.NNMolecule; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; diff --git a/src/test/org/openscience/cdk/modeling/builder3d/AtomPlacer3DTest.java b/src/test/org/openscience/cdk/modeling/builder3d/AtomPlacer3DTest.java index 9365f3ce3ab..17a0265e87a 100644 --- a/src/test/org/openscience/cdk/modeling/builder3d/AtomPlacer3DTest.java +++ b/src/test/org/openscience/cdk/modeling/builder3d/AtomPlacer3DTest.java @@ -25,14 +25,12 @@ import javax.vecmath.Point3d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.CDKConstants; import org.openscience.cdk.CDKTestCase; import org.openscience.cdk.ChemFile; import org.openscience.cdk.ChemObject; -import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; import org.openscience.cdk.interfaces.IMolecule; diff --git a/src/test/org/openscience/cdk/modeling/builder3d/AtomTetrahedralLigandPlacer3DTest.java b/src/test/org/openscience/cdk/modeling/builder3d/AtomTetrahedralLigandPlacer3DTest.java index 5adb3934165..fda48547e12 100644 --- a/src/test/org/openscience/cdk/modeling/builder3d/AtomTetrahedralLigandPlacer3DTest.java +++ b/src/test/org/openscience/cdk/modeling/builder3d/AtomTetrahedralLigandPlacer3DTest.java @@ -22,13 +22,11 @@ import javax.vecmath.Point3d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.Atom; import org.openscience.cdk.Bond; import org.openscience.cdk.CDKTestCase; -import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; import org.openscience.cdk.interfaces.IBond; diff --git a/src/test/org/openscience/cdk/qsar/descriptors/molecular/MannholdLogPDescriptorTest.java b/src/test/org/openscience/cdk/qsar/descriptors/molecular/MannholdLogPDescriptorTest.java index e51a20c8f67..00175f594e9 100644 --- a/src/test/org/openscience/cdk/qsar/descriptors/molecular/MannholdLogPDescriptorTest.java +++ b/src/test/org/openscience/cdk/qsar/descriptors/molecular/MannholdLogPDescriptorTest.java @@ -18,14 +18,13 @@ */ package org.openscience.cdk.qsar.descriptors.molecular; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IBond; -import org.openscience.cdk.interfaces.IMolecule; import org.openscience.cdk.interfaces.IChemObjectBuilder; +import org.openscience.cdk.interfaces.IMolecule; import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.qsar.result.DoubleResult; import org.openscience.cdk.qsar.result.IDescriptorResult; diff --git a/src/test/org/openscience/cdk/renderer/AtomContainerRendererTest.java b/src/test/org/openscience/cdk/renderer/AtomContainerRendererTest.java index 5b849ee9d42..8cce78b0975 100644 --- a/src/test/org/openscience/cdk/renderer/AtomContainerRendererTest.java +++ b/src/test/org/openscience/cdk/renderer/AtomContainerRendererTest.java @@ -25,8 +25,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; diff --git a/src/test/org/openscience/cdk/renderer/font/AbstractFontManagerTest.java b/src/test/org/openscience/cdk/renderer/font/AbstractFontManagerTest.java index 9a5d60fa00e..28412df3193 100644 --- a/src/test/org/openscience/cdk/renderer/font/AbstractFontManagerTest.java +++ b/src/test/org/openscience/cdk/renderer/font/AbstractFontManagerTest.java @@ -21,8 +21,7 @@ */ package org.openscience.cdk.renderer.font; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; /** diff --git a/src/test/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java index 3523c0c4c32..52fbdca9976 100644 --- a/src/test/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java +++ b/src/test/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java @@ -29,8 +29,7 @@ import javax.vecmath.Point2d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openscience.cdk.interfaces.IAtom; diff --git a/src/test/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java index 926d78de297..2aa041773b0 100644 --- a/src/test/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java +++ b/src/test/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java @@ -5,14 +5,12 @@ import javax.vecmath.Point2d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openscience.cdk.interfaces.IAtomContainer; import org.openscience.cdk.renderer.elements.IRenderingElement; import org.openscience.cdk.renderer.elements.LineElement; -import org.openscience.cdk.renderer.generators.BasicBondGenerator; /** * Test the {@link BasicBondGenerator}. diff --git a/src/test/org/openscience/cdk/renderer/generators/BasicGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/BasicGeneratorTest.java index 5aa20acd3f1..a8a55add1ec 100644 --- a/src/test/org/openscience/cdk/renderer/generators/BasicGeneratorTest.java +++ b/src/test/org/openscience/cdk/renderer/generators/BasicGeneratorTest.java @@ -27,8 +27,7 @@ import javax.vecmath.Point2d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openscience.cdk.interfaces.IAtomContainer; diff --git a/src/test/org/openscience/cdk/renderer/generators/BasicSceneGeneratorTest.java b/src/test/org/openscience/cdk/renderer/generators/BasicSceneGeneratorTest.java index b4628e159f2..4b0551e091b 100644 --- a/src/test/org/openscience/cdk/renderer/generators/BasicSceneGeneratorTest.java +++ b/src/test/org/openscience/cdk/renderer/generators/BasicSceneGeneratorTest.java @@ -27,13 +27,11 @@ import javax.vecmath.Point2d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openscience.cdk.interfaces.IAtomContainer; import org.openscience.cdk.renderer.elements.IRenderingElement; -import org.openscience.cdk.renderer.elements.LineElement; /** * Test the {@link BasicBondGenerator}. diff --git a/src/test/org/openscience/cdk/renderer/visitor/AWTDrawVisitorTest.java b/src/test/org/openscience/cdk/renderer/visitor/AWTDrawVisitorTest.java index 2fa4d6517ca..a1a7d070359 100644 --- a/src/test/org/openscience/cdk/renderer/visitor/AWTDrawVisitorTest.java +++ b/src/test/org/openscience/cdk/renderer/visitor/AWTDrawVisitorTest.java @@ -24,8 +24,7 @@ import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.renderer.RendererModel; import org.openscience.cdk.renderer.elements.TextElement; diff --git a/src/test/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitorTest.java b/src/test/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitorTest.java index da746e00e59..8554bd2b735 100644 --- a/src/test/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitorTest.java +++ b/src/test/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitorTest.java @@ -25,8 +25,7 @@ import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.renderer.RendererModel; import org.openscience.cdk.renderer.elements.IRenderingElement; diff --git a/src/test/org/openscience/cdk/smsd/SMSDTest.java b/src/test/org/openscience/cdk/smsd/SMSDTest.java index 5f7ef8f6783..22e13587934 100644 --- a/src/test/org/openscience/cdk/smsd/SMSDTest.java +++ b/src/test/org/openscience/cdk/smsd/SMSDTest.java @@ -23,16 +23,23 @@ */ package org.openscience.cdk.smsd; -import junit.framework.Assert; -import org.junit.After; -import org.junit.AfterClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import java.io.InputStream; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.Molecule; +import org.openscience.cdk.aromaticity.CDKHueckelAromaticityDetector; import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.exception.InvalidSmilesException; import org.openscience.cdk.interfaces.IAtomContainer; @@ -44,12 +51,6 @@ import org.openscience.cdk.smiles.SmilesParser; import org.openscience.cdk.smsd.algorithm.mcsplus.MCSPlusHandlerTest; import org.openscience.cdk.smsd.interfaces.Algorithm; - -import java.io.IOException; -import java.io.InputStream; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.openscience.cdk.aromaticity.CDKHueckelAromaticityDetector; import org.openscience.cdk.smsd.tools.ExtAtomContainerManipulator; import org.openscience.cdk.smsd.tools.MolHandler; diff --git a/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFLibTest.java b/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFLibTest.java index 59f871cf957..3dac69e5fc2 100644 --- a/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFLibTest.java +++ b/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFLibTest.java @@ -26,7 +26,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import junit.framework.Assert; + +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.openscience.cdk.Bond; diff --git a/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFMapperTest.java b/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFMapperTest.java index 4c0e51bbde0..5ab0ca5a0fa 100644 --- a/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFMapperTest.java +++ b/src/test/org/openscience/cdk/smsd/algorithm/vflib/VFMapperTest.java @@ -49,7 +49,8 @@ import java.util.List; import java.util.Map; -import junit.framework.Assert; + +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openscience.cdk.interfaces.IAtom; diff --git a/src/test/org/openscience/cdk/stereo/StereoToolTest.java b/src/test/org/openscience/cdk/stereo/StereoToolTest.java index aad4c0b18a9..82c82a27cd5 100644 --- a/src/test/org/openscience/cdk/stereo/StereoToolTest.java +++ b/src/test/org/openscience/cdk/stereo/StereoToolTest.java @@ -25,8 +25,7 @@ import javax.vecmath.Point3d; import javax.vecmath.Vector3d; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import org.openscience.cdk.Atom; import org.openscience.cdk.CDKTestCase;