Skip to content

Commit 047e67e

Browse files
johnmayjohnmay
committed
Use non-deprecated MatcherAssert.assertThat.
1 parent c3e90ed commit 047e67e

File tree

107 files changed

+114
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+114
-114
lines changed

‎app/depict/src/test/java/org/openscience/cdk/depict/AbbreviationsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import java.util.List;
3737

3838
import static org.hamcrest.CoreMatchers.is;
39-
import static org.junit.Assert.assertThat;
39+
import static org.hamcrest.MatcherAssert.assertThat;
4040

4141
public class AbbreviationsTest {
4242

‎base/data/src/test/java/org/openscience/cdk/AtomContainer2Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
import static org.hamcrest.CoreMatchers.is;
3737
import static org.junit.Assert.assertNull;
38-
import static org.junit.Assert.assertThat;
38+
import static org.hamcrest.MatcherAssert.assertThat;
3939

4040
/**
4141
* Checks the functionality of the AtomContainer.

‎base/isomorphism/src/test/java/org/openscience/cdk/isomorphism/AbstractVFStateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.hamcrest.CoreMatchers.not;
3131
import static org.hamcrest.CoreMatchers.sameInstance;
3232
import static org.junit.Assert.assertFalse;
33-
import static org.junit.Assert.assertThat;
33+
import static org.hamcrest.MatcherAssert.assertThat;
3434
import static org.junit.Assert.assertTrue;
3535
import static org.openscience.cdk.isomorphism.AbstractVFState.UNMAPPED;
3636

‎base/isomorphism/src/test/java/org/openscience/cdk/isomorphism/ExprTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
import static org.hamcrest.CoreMatchers.is;
4343
import static org.junit.Assert.assertFalse;
44-
import static org.junit.Assert.assertThat;
44+
import static org.hamcrest.MatcherAssert.assertThat;
4545
import static org.junit.Assert.assertTrue;
4646
import static org.mockito.Mockito.mock;
4747
import static org.mockito.Mockito.when;
@@ -1474,4 +1474,4 @@ public void testToString() {
14741474
}
14751475

14761476

1477-
}
1477+
}

‎base/reaction/src/test/java/org/openscience/cdk/reaction/ReactionProcessTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
import static org.hamcrest.CoreMatchers.is;
4949
import static org.hamcrest.CoreMatchers.not;
50-
import static org.junit.Assert.assertThat;
50+
import static org.hamcrest.MatcherAssert.assertThat;
5151

5252
/**
5353
* Tests for IReactionProcess implementations.

‎base/silent/src/test/java/org/openscience/cdk/silent/AtomContainer2Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import static org.hamcrest.CoreMatchers.is;
3838
import static org.junit.Assert.assertNull;
39-
import static org.junit.Assert.assertThat;
39+
import static org.hamcrest.MatcherAssert.assertThat;
4040

4141
/**
4242
* Checks the functionality of the {@link AtomContainer}.

‎base/test-core/src/test/java/org/openscience/cdk/AtomRefTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.hamcrest.CoreMatchers.is;
3131
import static org.hamcrest.CoreMatchers.sameInstance;
3232
import static org.junit.Assert.assertNull;
33-
import static org.junit.Assert.assertThat;
33+
import static org.hamcrest.MatcherAssert.assertThat;
3434
import static org.mockito.Mockito.mock;
3535

3636
public class AtomRefTest {
@@ -55,4 +55,4 @@ public class AtomRefTest {
5555
IAtom ptr = new AtomRef(new AtomRef(mock));
5656
assertThat(AtomRef.deref(ptr), is(sameInstance(mock)));
5757
}
58-
}
58+
}

‎base/test-core/src/test/java/org/openscience/cdk/BondRefTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ public void dereferencePointerPointer() {
5858
IBond ptr = new BondRef(new BondRef(mock));
5959
assertThat(BondRef.deref(ptr), is(sameInstance(mock)));
6060
}
61-
}
61+
}

‎base/test-core/src/test/java/org/openscience/cdk/DynamicFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import static org.junit.Assert.assertEquals;
3838
import static org.junit.Assert.assertFalse;
3939
import static org.junit.Assert.assertNotNull;
40-
import static org.junit.Assert.assertThat;
40+
import static org.hamcrest.MatcherAssert.assertThat;
4141
import static org.junit.Assert.assertTrue;
4242
import static org.mockito.Matchers.anyObject;
4343
import static org.mockito.Mockito.mock;

‎base/test-core/src/test/java/org/openscience/cdk/config/IsotopesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.hamcrest.CoreMatchers.notNullValue;
3434
import static org.hamcrest.CoreMatchers.nullValue;
3535
import static org.junit.Assert.assertNull;
36-
import static org.junit.Assert.assertThat;
36+
import static org.hamcrest.MatcherAssert.assertThat;
3737

3838
/**
3939
* Checks the functionality of the IsotopeFactory

0 commit comments

Comments
 (0)