Skip to content

Commit

Permalink
Replaces junit.framework.Assert from JUnit3 with org.junit.Assert fro…
Browse files Browse the repository at this point in the history 
…m JUnit4 (fixing #2831081)

Signed-off-by: Rajarshi  Guha <rajarshi.guha@gmail.com>
  • Loading branch information
@egonw @rajarshi
egonw authored and rajarshi committed Sep 28, 2011
1 parent 45a7599 commit 6ff1f78
Show file tree
Hide file tree
Showing 22 changed files with 36 additions and 56 deletions.
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/geometry/cip/ImmutableHydrogenTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/geometry/volume/VABCVolumeTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/io/formats/PubChemCompoundXMLFormatTest.java
View file
Expand Up @@ -24,8 +24,7 @@
*/
package org.openscience.cdk.io.formats;

import junit.framework.Assert;

import org.junit.Assert;
import org.junit.Test;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/io/formats/PubChemCompoundsXMLFormatTest.java
View file
Expand Up @@ -27,8 +27,7 @@
import java.io.BufferedReader;
import java.io.StringReader;

import junit.framework.Assert;

import org.junit.Assert;
import org.junit.Test;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/io/formats/PubChemSubstancesXMLFormatTest.java
View file
Expand Up @@ -24,8 +24,7 @@
*/
package org.openscience.cdk.io.formats;

import junit.framework.Assert;

import org.junit.Assert;
import org.junit.Test;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/io/rdf/CDKOWLWriterTest.java
View file
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions src/test/org/openscience/cdk/libio/jena/ConvertorTest.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/test/org/openscience/cdk/modeling/builder3d/AtomPlacer3DTest.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/test/org/openscience/cdk/modeling/builder3d/AtomTetrahedralLigandPlacer3DTest.java
View file
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions src/test/org/openscience/cdk/qsar/descriptors/molecular/MannholdLogPDescriptorTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/renderer/AtomContainerRendererTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/renderer/font/AbstractFontManagerTest.java
View file
Expand Up @@ -21,8 +21,7 @@
*/
package org.openscience.cdk.renderer.font;

import junit.framework.Assert;

import org.junit.Assert;
import org.junit.Test;

/**
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/test/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java
View file
Expand Up @@ -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}.
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/renderer/generators/BasicGeneratorTest.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions src/test/org/openscience/cdk/renderer/generators/BasicSceneGeneratorTest.java
View file
Expand Up @@ -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}.
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/renderer/visitor/AWTDrawVisitorTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitorTest.java
View file
Expand Up @@ -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;
Expand Down
19 changes: 10 additions & 9 deletions src/test/org/openscience/cdk/smsd/SMSDTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion src/test/org/openscience/cdk/smsd/algorithm/vflib/VFLibTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/test/org/openscience/cdk/smsd/algorithm/vflib/VFMapperTest.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/test/org/openscience/cdk/stereo/StereoToolTest.java
View file
Expand Up @@ -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;
Expand Down

0 comments on commit 6ff1f78

Please sign in to comment.