Stop using CoreMatchers -- this disappears in a later version of JUnit.

bodar · Sep 23, 2015 · a174567 · a174567
1 parent 4fe976d
commit a174567
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/test/com/googlecode/yatspec/junit/SpecRunnerTest.java b/test/com/googlecode/yatspec/junit/SpecRunnerTest.java
@@ -1,14 +1,19 @@
 package com.googlecode.yatspec.junit;
 
 import com.googlecode.totallylazy.StringPrintStream;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
 import org.junit.runner.notification.RunNotifier;
 
 import java.io.PrintStream;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
 
 public class SpecRunnerTest {
     private StringPrintStream standardOutStream;

diff --git a/test/com/googlecode/yatspec/junit/TableExampleTest.java b/test/com/googlecode/yatspec/junit/TableExampleTest.java
@@ -4,8 +4,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 
 @RunWith(SpecRunner.class)
 public class TableExampleTest {

diff --git a/test/com/googlecode/yatspec/rendering/html/HtmlResultRendererTest.java b/test/com/googlecode/yatspec/rendering/html/HtmlResultRendererTest.java
@@ -10,8 +10,8 @@
 
 import java.nio.file.Paths;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.core.IsNull.nullValue;

diff --git a/test/com/googlecode/yatspec/state/givenwhenthen/NiceMapTest.java b/test/com/googlecode/yatspec/state/givenwhenthen/NiceMapTest.java
@@ -2,11 +2,7 @@
 
 import org.junit.Test;
 
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.collection.IsMapContaining.hasEntry;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;