Remaining usages I didn't catch with my command line foo.

johnmay · johnmay · commit 84e968a808fb · 2020-05-13T17:49:57.000+01:00
diff --git a/app/depict/src/test/java/org/openscience/cdk/depict/SvgDrawVisitorTest.java b/app/depict/src/test/java/org/openscience/cdk/depict/SvgDrawVisitorTest.java
@@ -35,7 +35,7 @@
 import java.awt.geom.RoundRectangle2D;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class SvgDrawVisitorTest {
 
diff --git a/base/test-core/src/test/java/org/openscience/cdk/BondRefTest.java b/base/test-core/src/test/java/org/openscience/cdk/BondRefTest.java
@@ -29,7 +29,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 
 public class BondRefTest {
diff --git a/base/test-core/src/test/java/org/openscience/cdk/tools/manipulator/SgroupManipulatorTest.java b/base/test-core/src/test/java/org/openscience/cdk/tools/manipulator/SgroupManipulatorTest.java
@@ -38,7 +38,9 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class SgroupManipulatorTest {
 
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Benzene.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Benzene.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_BenzylBenzene.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_BenzylBenzene.java
@@ -33,7 +33,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * benzylbenzene ring search unit tests
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Bicyclo.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Bicyclo.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Biphenyl.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Biphenyl.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Empty.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Empty.java
@@ -28,7 +28,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Fused.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Fused.java
@@ -31,7 +31,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Hexaphenylene.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_Hexaphenylene.java
@@ -33,7 +33,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_NonCyclic.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_NonCyclic.java
@@ -28,7 +28,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_SpiroRings.java b/base/test-standard/src/test/java/org/openscience/cdk/ringsearch/RingSearchTest_SpiroRings.java
@@ -30,7 +30,7 @@
 
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
diff --git a/base/test-standard/src/test/java/org/openscience/cdk/tools/manipulator/AtomContainerManipulatorTest.java b/base/test-standard/src/test/java/org/openscience/cdk/tools/manipulator/AtomContainerManipulatorTest.java
@@ -62,6 +62,7 @@
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.number.IsCloseTo.closeTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.openscience.cdk.tools.manipulator.AtomContainerManipulator.*;
 
@@ -220,7 +221,7 @@ public void testRemoveHydrogens_IAtomContainer() throws IOException, ClassNotFou
         Assert.assertEquals(6, mol.getAtomCount());
         IAtomContainer ac = AtomContainerManipulator.removeHydrogens(mol);
         Assert.assertEquals(2, ac.getAtomCount());
-        Assert.assertTrue(ac.getFlag(CDKConstants.ISAROMATIC));
+        assertTrue(ac.getFlag(CDKConstants.ISAROMATIC));
     }
 
     @Test
@@ -391,12 +392,12 @@ public void testGetAllIDs_IAtomContainer() {
 
         List<String> ids = AtomContainerManipulator.getAllIDs(mol);
         Assert.assertEquals(6, ids.size());
-        Assert.assertTrue(ids.contains("a1"));
-        Assert.assertTrue(ids.contains("a2"));
-        Assert.assertTrue(ids.contains("a3"));
-        Assert.assertTrue(ids.contains("a4"));
-        Assert.assertTrue(ids.contains("a5"));
-        Assert.assertTrue(ids.contains("a6"));
+        assertTrue(ids.contains("a1"));
+        assertTrue(ids.contains("a2"));
+        assertTrue(ids.contains("a3"));
+        assertTrue(ids.contains("a4"));
+        assertTrue(ids.contains("a5"));
+        assertTrue(ids.contains("a6"));
     }
 
     @Test
@@ -693,9 +694,9 @@ public void testGetIntersection_IAtomContainer_IAtomContainer() {
         IAtomContainer intersection = AtomContainerManipulator.getIntersection(container1, container2);
         Assert.assertEquals(2, intersection.getAtomCount());
         Assert.assertEquals(1, intersection.getBondCount());
-        Assert.assertTrue(intersection.contains(b2));
-        Assert.assertTrue(intersection.contains(o));
-        Assert.assertTrue(intersection.contains(c2));
+        assertTrue(intersection.contains(b2));
+        assertTrue(intersection.contains(o));
+        assertTrue(intersection.contains(c2));
     }
 
     @Test
@@ -742,14 +743,14 @@ public void testClearConfig() throws Exception {
 
         AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(container);
         for (IAtom atom : container.atoms()) {
-            Assert.assertTrue(atom.getAtomTypeName() != CDKConstants.UNSET);
-            Assert.assertTrue(atom.getHybridization() != CDKConstants.UNSET);
+            assertTrue(atom.getAtomTypeName() != CDKConstants.UNSET);
+            assertTrue(atom.getHybridization() != CDKConstants.UNSET);
         }
 
         AtomContainerManipulator.clearAtomConfigurations(container);
         for (IAtom atom : container.atoms()) {
-            Assert.assertTrue(atom.getAtomTypeName() == CDKConstants.UNSET);
-            Assert.assertTrue(atom.getHybridization() == CDKConstants.UNSET);
+            assertTrue(atom.getAtomTypeName() == CDKConstants.UNSET);
+            assertTrue(atom.getHybridization() == CDKConstants.UNSET);
         }
     }
 
@@ -1034,7 +1035,7 @@ public void testCreateAnyAtomAnyBondAtomContainer_IAtomContainer() throws Except
         mol = AtomContainerManipulator.createAllCarbonAllSingleNonAromaticBondAtomContainer(mol);
         String smiles2 = "C1CCCCC1";
         IAtomContainer mol2 = sp.parseSmiles(smiles2);
-        Assert.assertTrue(new UniversalIsomorphismTester().isIsomorph(mol, mol2));
+        assertTrue(new UniversalIsomorphismTester().isIsomorph(mol, mol2));
     }
 
     @Test
@@ -1052,7 +1053,7 @@ public void testAnonymise() throws Exception {
 
         IAtomContainer anonymous = AtomContainerManipulator.anonymise(cyclohexane);
 
-        Assert.assertTrue(new UniversalIsomorphismTester().isIsomorph(anonymous, TestMoleculeFactory.makeCyclohexane()));
+        assertTrue(new UniversalIsomorphismTester().isIsomorph(anonymous, TestMoleculeFactory.makeCyclohexane()));
 
         assertThat(anonymous.getAtom(0).getSymbol(), is("C"));
         assertThat(anonymous.getAtom(2).getSymbol(), is("C"));
diff --git a/display/renderbasic/src/test/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabelTest.java b/display/renderbasic/src/test/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabelTest.java
@@ -32,7 +32,9 @@
 
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class AbbreviationLabelTest {
 
diff --git a/storage/ctab/src/test/java/org/openscience/cdk/io/MDLV2000ReaderTest.java b/storage/ctab/src/test/java/org/openscience/cdk/io/MDLV2000ReaderTest.java
@@ -75,6 +75,7 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/storage/smiles/src/test/java/org/openscience/cdk/smiles/CxSmilesGeneratorTest.java b/storage/smiles/src/test/java/org/openscience/cdk/smiles/CxSmilesGeneratorTest.java
@@ -39,7 +39,7 @@
 import java.util.HashMap;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class CxSmilesGeneratorTest {
 
