Merge branch '__rultor'

yegor256 · Jan 16, 2019 · 8b06862 · 8b06862 · 0pdd · Jan 16, 2019
2 parents 210c7ef + d79debe
commit 8b06862
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 31 deletions.
diff --git a/src/test/java/org/takes/facets/auth/IdentityTest.java b/src/test/java/org/takes/facets/auth/IdentityTest.java
@@ -25,7 +25,7 @@
 
 import java.io.IOException;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 
 /**
@@ -42,7 +42,7 @@ public final class IdentityTest {
     public void equalsToItself() throws IOException {
         MatcherAssert.assertThat(
             Identity.ANONYMOUS,
-            Matchers.equalTo(Identity.ANONYMOUS)
+            new IsEqual<>(Identity.ANONYMOUS)
         );
     }
 

diff --git a/src/test/java/org/takes/facets/auth/PsAllTest.java b/src/test/java/org/takes/facets/auth/PsAllTest.java
@@ -28,7 +28,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.takes.Response;
 import org.takes.rq.RqFake;
@@ -51,7 +51,7 @@ public void thereShouldBeAtLeastOnePass() throws Exception {
                 new ArrayList<Pass>(0),
                 0
             ).enter(new RqFake()).has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 
@@ -66,7 +66,7 @@ public void indexMustBeNonNegative() throws Exception {
                 Collections.singletonList(new PsFake(true)),
                 -1
             ).enter(new RqFake()).has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 
@@ -84,7 +84,7 @@ public void indexMustBeSmallEnough() throws Exception {
                 ),
                 2
             ).enter(new RqFake()).has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 
@@ -99,7 +99,7 @@ public void testOneSuccessfull() throws Exception {
                 Collections.singletonList(new PsFake(true)),
                 0
             ).enter(new RqFake()).has(),
-            Matchers.is(true)
+            new IsEqual<>(true)
         );
     }
 
@@ -114,7 +114,7 @@ public void testOneFail() throws Exception {
                 Collections.singletonList(new PsFake(false)),
                 0
             ).enter(new RqFake()).has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 
@@ -139,7 +139,7 @@ public void testSuccessfullIdx() throws Exception {
                 ),
                 Tv.THREE
             ).enter(request).get().urn(),
-            Matchers.equalTo(resulting.enter(request).get().urn())
+            new IsEqual<>(resulting.enter(request).get().urn())
         );
     }
 
@@ -159,7 +159,7 @@ public void testFail() throws Exception {
                 ),
                 1
             ).enter(new RqFake()).has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 
@@ -179,7 +179,7 @@ public void exits() throws Exception {
                 ),
                 1
             ).exit(response, exiting.enter(new RqFake()).get()),
-            Matchers.equalTo(response)
+            new IsEqual<>(response)
         );
     }
 }
diff --git a/src/test/java/org/takes/facets/auth/PsBasicDefaultTest.java b/src/test/java/org/takes/facets/auth/PsBasicDefaultTest.java
@@ -25,7 +25,7 @@
 
 import java.net.URLEncoder;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 
 /**
@@ -53,7 +53,7 @@ public void acceptsCorrectLoginPasswordPair() throws Exception {
             )
                 .get()
                 .urn(),
-            Matchers.equalTo("urn:foo:robert")
+                new IsEqual<>("urn:foo:robert")
         );
     }
 
@@ -75,7 +75,7 @@ public void supportsBothKindsOfSpace() throws Exception {
                     "hey you"
             )
                 .has(),
-            Matchers.is(true)
+            new IsEqual<>(true)
         );
         MatcherAssert.assertThat(
             new PsBasic.Default(
@@ -88,7 +88,7 @@ public void supportsBothKindsOfSpace() throws Exception {
                     "hey me"
             )
                 .has(),
-            Matchers.is(true)
+            new IsEqual<>(true)
         );
     }
 
@@ -109,7 +109,7 @@ public void supportsUsersWithSpacesInTheirNames() throws Exception {
                     "qwer"
             )
                 .has(),
-            Matchers.is(true)
+            new IsEqual<>(true)
         );
     }
 
@@ -135,7 +135,7 @@ public void supportsUrlencodedUrns() throws Exception {
             )
                 .get()
                 .urn(),
-            Matchers.is(urn)
+            new IsEqual<>(urn)
         );
     }
 
@@ -154,7 +154,7 @@ public void rejectsIncorrectPassword() throws Exception {
             )
                 .enter("charlie", "wrongpassword")
                 .has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 
@@ -173,7 +173,7 @@ public void rejectsIncorrectLogin() throws Exception {
             )
                 .enter("mike", "anything")
                 .has(),
-            Matchers.is(false)
+            new IsEqual<>(false)
         );
     }
 }
diff --git a/src/test/java/org/takes/facets/auth/PsChainTest.java b/src/test/java/org/takes/facets/auth/PsChainTest.java
@@ -25,7 +25,8 @@
 
 import java.io.IOException;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.StringContains;
 import org.junit.Test;
 import org.takes.rq.RqFake;
 import org.takes.rs.RsEmpty;
@@ -47,7 +48,7 @@ public void chainExecutionTest() throws IOException {
                 new PsLogout(),
                 new PsFake(true)
             ).enter(new RqFake()).get(),
-            Matchers.is(Identity.ANONYMOUS)
+            new IsEqual<>(Identity.ANONYMOUS)
         );
     }
 
@@ -62,7 +63,7 @@ public void exitChainTest() throws IOException {
                 new PsFake(true)
             ).exit(new RsEmpty(), Identity.ANONYMOUS)
                 .head().iterator().next(),
-            Matchers.containsString("HTTP/1.1 200 O")
+            new StringContains("HTTP/1.1 200 O")
         );
     }
 }
diff --git a/src/test/java/org/takes/facets/hamcrest/HmBodyTest.java b/src/test/java/org/takes/facets/hamcrest/HmBodyTest.java
@@ -26,9 +26,9 @@
 
 import java.util.Collections;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.hamcrest.StringDescription;
 import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.takes.Body;
 import org.takes.Request;
@@ -66,7 +66,7 @@ public void testsBodyValuesAreDifferent() {
                 Collections.<String>emptyList(),
                 "this"
             ),
-            Matchers.not(new HmBody<>("that"))
+            new IsNot<>(new HmBody<>("that"))
         );
     }
 
@@ -85,14 +85,18 @@ public void describesMismatchInReadableWay() {
         matcher.describeMismatchSafely(request, description);
         MatcherAssert.assertThat(
             description.toString(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 "body was: [111, 116, 104, 101, 114]"
             )
         );
     }
 
     /**
      * HmBody can describe in readable way.
+     * @todo #893:30min Continue removing static class Matchers. Use the
+     *  classes IdentityTest.java, PsAllTest.java, PsBasicDefaultTest.java,
+     *  PsChainTest.java, HmBodyTest.java, HmRqTextBodyTest.java,
+     *  HmRsStatusTest.java, and HmRsTextBodyTest.java as an example.
      */
     @Test
     public void describeToInReadableWay() {

diff --git a/src/test/java/org/takes/facets/hamcrest/HmRqTextBodyTest.java b/src/test/java/org/takes/facets/hamcrest/HmRqTextBodyTest.java
@@ -25,7 +25,7 @@
 
 import java.util.Collections;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.takes.rq.RqFake;
 
@@ -61,7 +61,7 @@ public void testsBodyValueDoesNotContainsText() {
                 Collections.<String>emptyList(),
                 "some"
             ),
-            Matchers.not(new HmRqTextBody("other"))
+            new IsNot<>(new HmRqTextBody("other"))
         );
     }
 }
diff --git a/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java b/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.takes.rq.RqFake;
 import org.takes.tk.TkEmpty;
@@ -62,7 +62,7 @@ public void testsStatusOk() throws IOException {
     public void testsStatusNotFound() throws IOException {
         MatcherAssert.assertThat(
             new TkHtml("<html><body/></html>").act(new RqFake()),
-            Matchers.not(
+            new IsNot<>(
                 new HmRsStatus(
                     HttpURLConnection.HTTP_NOT_FOUND
                 )

diff --git a/src/test/java/org/takes/facets/hamcrest/HmRsTextBodyTest.java b/src/test/java/org/takes/facets/hamcrest/HmRsTextBodyTest.java
@@ -24,7 +24,7 @@
 package org.takes.facets.hamcrest;
 
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.takes.rs.RsWithBody;
 
@@ -54,7 +54,7 @@ public void testsBodyValueContainsText() {
     public void testsBodyValueDoesNotContainsText() {
         MatcherAssert.assertThat(
             new RsWithBody("Some response"),
-            Matchers.not(new HmRsTextBody("expected something else"))
+            new IsNot<>(new HmRsTextBody("expected something else"))
         );
     }
 }