Updated cactoos-matchers to 0.13, refactored test as necessary (yegor…

…256#1023)
BinaryIgor · Jan 20, 2019 · d3f328b · d3f328b
1 parent 36c467a
commit d3f328b
Show file tree

Hide file tree

Showing 16 changed files with 198 additions and 232 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@ The MIT License (MIT)
     <dependency>
       <groupId>org.llorllale</groupId>
       <artifactId>cactoos-matchers</artifactId>
-      <version>0.12</version>
+      <version>0.13</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/test/java/org/cactoos/TextTest.java b/src/test/java/org/cactoos/TextTest.java
@@ -34,6 +34,9 @@
 /**
  * Test case for {@link Text}.
  * @since 0.11
+ * @todo #1023:30min Replace all occurrences of @Rule ExpectedException
+ *  tests that use it should be refactored to use Throws class
+ *  introduced in cactoos-matchers 0.13.
  * @checkstyle JavadocMethodCheck (500 lines)
  */
 public final class TextTest {

diff --git a/src/test/java/org/cactoos/io/BytesOfTest.java b/src/test/java/org/cactoos/io/BytesOfTest.java
@@ -180,14 +180,10 @@ public void printsStackTrace() {
                     )
                 )
             ),
-            new TextHasString(
-                Matchers.allOf(
-                    Matchers.containsString("java.io.IOException"),
-                    Matchers.containsString("doesn't work at all"),
-                    Matchers.containsString(
-                        "\tat org.cactoos.io.BytesOfTest"
-                    )
-                )
+            Matchers.allOf(
+                new TextHasString("java.io.IOException"),
+                new TextHasString("doesn't work at all"),
+                new TextHasString("\tat org.cactoos.io.BytesOfTest")
             )
         );
     }
@@ -201,9 +197,7 @@ public void printsStackTraceFromArray() {
                     new IOException("").getStackTrace()
                 )
             ),
-            new TextHasString(
-                Matchers.containsString("org.cactoos.io.BytesOfTest")
-            )
+            new TextHasString("org.cactoos.io.BytesOfTest")
         );
     }
 

diff --git a/src/test/java/org/cactoos/io/HeadInputStreamTest.java b/src/test/java/org/cactoos/io/HeadInputStreamTest.java
@@ -27,14 +27,17 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.TextHasString;
+import org.llorllale.cactoos.matchers.TextIs;
 
 /**
  * Test cases for {@link HeadInputStream}.
  *
  * @since 0.31
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 public final class HeadInputStreamTest {
 
@@ -45,11 +48,13 @@ public void testSkippingLessThanTotal() throws Exception {
             5
         );
         stream.skip(3L);
-        MatcherAssert.assertThat(
+        new Assertion<>(
             "Incorrect head of the input stream has been read",
-            new TextOf(stream),
+            () -> new TextOf(
+                new Sticky(() -> stream)
+            ),
             new TextHasString("tS")
-        );
+        ).affirm();
     }
 
     @Test
@@ -59,11 +64,12 @@ public void testSkippingMoreThanTotal() throws Exception {
             5
         );
         stream.skip(7L);
-        MatcherAssert.assertThat(
+        final String input = new TextOf(stream).asString();
+        new Assertion<>(
             "The result text wasn't empty",
-            new TextOf(stream),
-            new TextHasString("")
-        );
+            () -> new TextOf(input),
+            new TextIs("")
+        ).affirm();
     }
 
     @Test
@@ -74,11 +80,13 @@ public void testResetting() throws Exception {
         );
         stream.skip(7L);
         stream.reset();
-        MatcherAssert.assertThat(
+        new Assertion<>(
             "Reset didn't change the state",
-            new TextOf(stream),
+            () -> new TextOf(
+                new Sticky(() -> stream)
+            ),
             new TextHasString("testR")
-        );
+        ).affirm();
     }
 
     @Test

diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java
@@ -45,8 +45,10 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.llorllale.cactoos.matchers.EndsWith;
 import org.llorllale.cactoos.matchers.InputHasContent;
 import org.llorllale.cactoos.matchers.MatcherOf;
+import org.llorllale.cactoos.matchers.StartsWith;
 import org.llorllale.cactoos.matchers.TextHasString;
 import org.takes.http.FtRemote;
 import org.takes.tk.TkHtml;
@@ -78,7 +80,7 @@ public void readsAlternativeInputForFileCase() {
                     new InputOf(new TextOf("Alternative text!"))
                 )
             ),
-            new TextHasString(Matchers.endsWith("text!"))
+            new EndsWith("text!")
         );
     }
 
@@ -149,11 +151,9 @@ public void readsRealUrl() throws IOException {
                 new TextOf(
                     new InputOf(home)
                 ),
-                new TextHasString(
-                    Matchers.allOf(
-                        Matchers.startsWith("<html"),
-                        Matchers.endsWith("html>")
-                    )
+                Matchers.allOf(
+                    new StartsWith("<html"),
+                    new EndsWith("html>")
                 )
             )
         );
@@ -173,7 +173,7 @@ public void readsStringUrl() throws IOException {
                     )
                 )
             ),
-            new TextHasString(Matchers.containsString("Lorem ipsum"))
+            new TextHasString("Lorem ipsum")
         );
     }
 

diff --git a/src/test/java/org/cactoos/io/InputWithFallbackTest.java b/src/test/java/org/cactoos/io/InputWithFallbackTest.java
@@ -27,9 +27,8 @@
 import java.io.IOException;
 import org.cactoos.text.TextOf;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.Test;
-import org.llorllale.cactoos.matchers.TextHasString;
+import org.llorllale.cactoos.matchers.EndsWith;
 
 /**
  * Test case for {@link InputWithFallback}.
@@ -51,7 +50,7 @@ public void readsAlternativeInput() {
                     new InputOf("hello, world!")
                 )
             ),
-            new TextHasString(Matchers.endsWith("world!"))
+            new EndsWith("world!")
         );
     }
 
@@ -67,7 +66,7 @@ public void readsAlternativeInputUri() {
                     new InputOf("it works!")
                 )
             ),
-            new TextHasString(Matchers.endsWith("works!"))
+            new EndsWith("works!")
         );
     }
 

diff --git a/src/test/java/org/cactoos/io/Md5DigestOfTest.java b/src/test/java/org/cactoos/io/Md5DigestOfTest.java
@@ -72,10 +72,12 @@ public void checksumFromFile() throws Exception {
             "Can't calculate the file's MD5 checksum",
             new HexOf(
                 new Md5DigestOf(
-                    new InputOf(
-                        new ResourceOf(
-                            "org/cactoos/digest-calculation.txt"
-                        ).stream()
+                    new Sticky(
+                        new InputOf(
+                            new ResourceOf(
+                                "org/cactoos/digest-calculation.txt"
+                            ).stream()
+                        )
                     )
                 )
             ),

diff --git a/src/test/java/org/cactoos/io/OutputStreamToTest.java b/src/test/java/org/cactoos/io/OutputStreamToTest.java
@@ -30,8 +30,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.llorllale.cactoos.matchers.MatcherOf;
-import org.llorllale.cactoos.matchers.TextHasString;
+import org.llorllale.cactoos.matchers.TextIs;
 
 /**
  * Test case for {@link OutputStreamTo}.
@@ -54,17 +53,15 @@ public void writesLargeContentToFile() throws IOException {
         MatcherAssert.assertThat(
             "Can't copy Input to Output and return Input",
             new TextOf(
-                new TeeInput(
-                    new ResourceOf("org/cactoos/large-text.txt"),
-                    new OutputTo(new OutputStreamTo(temp))
+                new Sticky(
+                    new TeeInput(
+                        new ResourceOf("org/cactoos/large-text.txt"),
+                        new OutputTo(new OutputStreamTo(temp))
+                    )
                 )
             ),
-            new TextHasString(
-                new MatcherOf<>(
-                    str -> {
-                        return new TextOf(temp).asString().equals(str);
-                    }
-                )
+            new TextIs(
+                new TextOf(temp)
             )
         );
     }

diff --git a/src/test/java/org/cactoos/io/Sha1DigestOfTest.java b/src/test/java/org/cactoos/io/Sha1DigestOfTest.java
@@ -72,10 +72,12 @@ public void checksumFromFile() throws Exception {
             "Can't calculate the file's SHA-1 checksum",
             new HexOf(
                 new Sha1DigestOf(
-                    new InputOf(
-                        new ResourceOf(
-                            "org/cactoos/digest-calculation.txt"
-                        ).stream()
+                    new Sticky(
+                        new InputOf(
+                            new ResourceOf(
+                                "org/cactoos/digest-calculation.txt"
+                            ).stream()
+                        )
                     )
                 )
             ),

diff --git a/src/test/java/org/cactoos/io/Sha256DigestOfTest.java b/src/test/java/org/cactoos/io/Sha256DigestOfTest.java
@@ -74,10 +74,12 @@ public void checksumFromFile() throws Exception {
             "Can't calculate the file's SHA-256 checksum",
             new HexOf(
                 new Sha256DigestOf(
-                    new InputOf(
-                        new ResourceOf(
-                            "org/cactoos/digest-calculation.txt"
-                        ).stream()
+                    new Sticky(
+                        new InputOf(
+                            new ResourceOf(
+                                "org/cactoos/digest-calculation.txt"
+                            ).stream()
+                        )
                     )
                 )
             ),

diff --git a/src/test/java/org/cactoos/io/StickyTest.java b/src/test/java/org/cactoos/io/StickyTest.java
@@ -31,8 +31,8 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
+import org.llorllale.cactoos.matchers.EndsWith;
 import org.llorllale.cactoos.matchers.MatcherOf;
-import org.llorllale.cactoos.matchers.TextHasString;
 
 /**
  * Test case for {@link Sticky}.
@@ -77,9 +77,7 @@ public void readsRealUrl() throws MalformedURLException {
                     )
                 )
             ),
-            new TextHasString(
-                Matchers.endsWith("est laborum.\n")
-            )
+            new EndsWith("est laborum.\n")
         );
     }