Merge pull request #10556 from Captain1653/play-juice-deprecated-assert

Replace deprecated JUnit-matchers on Hamcrest-matchers in play-guice
playframework · Dec 1, 2020 · e0ba57f · e0ba57f
2 parents 992e21b + 48f742e
commit e0ba57f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/play-guice/src/test/java/play/inject/guice/GuiceApplicationBuilderTest.java b/core/play-guice/src/test/java/play/inject/guice/GuiceApplicationBuilderTest.java
@@ -21,7 +21,7 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static play.inject.Bindings.bind;
 
 public class GuiceApplicationBuilderTest {

diff --git a/core/play-guice/src/test/java/play/inject/guice/GuiceApplicationLoaderTest.java b/core/play-guice/src/test/java/play/inject/guice/GuiceApplicationLoaderTest.java
@@ -18,7 +18,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static play.inject.Bindings.bind;
 
 public class GuiceApplicationLoaderTest {

diff --git a/core/play-guice/src/test/java/play/inject/guice/GuiceInjectorBuilderTest.java b/core/play-guice/src/test/java/play/inject/guice/GuiceInjectorBuilderTest.java
@@ -24,7 +24,7 @@
 import scala.collection.Seq;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static play.inject.Bindings.bind;
 
 public class GuiceInjectorBuilderTest {
@@ -104,7 +104,7 @@ private void setConfiguration(play.api.inject.Module configurationModule) {
             .instanceOf(Config.class);
 
     assertThat(conf.root().keySet().size(), is(4));
-    assertThat(conf.root().keySet(), org.junit.matchers.JUnitMatchers.hasItems("a", "b", "c", "d"));
+    assertThat(conf.root().keySet(), hasItems("a", "b", "c", "d"));
 
     assertThat(conf.getInt("a"), is(1));
     assertThat(conf.getInt("b"), is(2));