Continue to refactor tests (yegor256#1023)

BinaryIgor · Jan 20, 2019 · d6ae230 · d6ae230
1 parent d3f328b
commit d6ae230
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/test/java/org/cactoos/io/BytesOfTest.java b/src/test/java/org/cactoos/io/BytesOfTest.java
@@ -180,10 +180,12 @@ public void printsStackTrace() {
                     )
                 )
             ),
-            Matchers.allOf(
-                new TextHasString("java.io.IOException"),
-                new TextHasString("doesn't work at all"),
-                new TextHasString("\tat org.cactoos.io.BytesOfTest")
+            new TextHasString(
+                new JoinedText(
+                    System.lineSeparator(),
+                    "java.io.IOException: It doesn't work at all",
+                    "\tat org.cactoos.io.BytesOfTest"
+                )
             )
         );
     }

diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java
@@ -48,7 +48,7 @@
 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.MatchesRegex;
 import org.llorllale.cactoos.matchers.TextHasString;
 import org.takes.http.FtRemote;
 import org.takes.tk.TkHtml;
@@ -151,10 +151,7 @@ public void readsRealUrl() throws IOException {
                 new TextOf(
                     new InputOf(home)
                 ),
-                Matchers.allOf(
-                    new StartsWith("<html"),
-                    new EndsWith("html>")
-                )
+                new MatchesRegex("<html.*html>")
             )
         );
     }

diff --git a/src/test/java/org/cactoos/text/TextOfTest.java b/src/test/java/org/cactoos/text/TextOfTest.java
@@ -225,10 +225,12 @@ public void printsStackTrace() {
                     "It doesn't work at all"
                 )
             ),
-            Matchers.allOf(
-                new TextHasString("java.io.IOException"),
-                new TextHasString("doesn't work at all"),
-                new TextHasString("\tat org.cactoos.text.TextOfTest")
+            new TextHasString(
+                new JoinedText(
+                    System.lineSeparator(),
+                    "java.io.IOException: It doesn't work at all",
+                    "\tat org.cactoos.text.TextOfTest"
+                )
             )
         );
     }