(yegor256#1033) Replace some usages of assertThat with Assertion

vzurauskas · Apr 21, 2019 · f341664 · f341664
1 parent 4a76741
commit f341664
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 90 deletions.
diff --git a/src/main/java/org/cactoos/io/package-info.java b/src/main/java/org/cactoos/io/package-info.java
@@ -26,5 +26,9 @@
  * Input/Output.
  *
  * @since 0.1
+ * @todo #1033:30min Continue replacing usage of MatcherAssert.assertThat with
+ *  Assertion from cactoos-matchers. Once there is no more usage of
+ *  MatcherAssert.assertThat, add the signature of MatcherAssert.assertThat to
+ *  forbidden-apis.txt
  */
 package org.cactoos.io;
diff --git a/src/test/java/org/cactoos/TextTest.java b/src/test/java/org/cactoos/TextTest.java
@@ -25,7 +25,6 @@
 
 import org.cactoos.text.NoNulls;
 import org.cactoos.text.TextOf;
-import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.TextHasString;
@@ -65,13 +64,13 @@ public void failForNullResult() {
     @Test
     public void okForNoNulls() {
         final String message = "Hello";
-        MatcherAssert.assertThat(
-            "Can't work with null text",
-            new NoNulls(
+        new Assertion<>(
+            "Must work with NoNulls",
+            () -> new NoNulls(
                 new TextOf(message)
             ),
             new TextHasString(message)
-        );
+        ).affirm();
     }
 
 }
diff --git a/src/test/java/org/cactoos/io/LSInputOfTest.java b/src/test/java/org/cactoos/io/LSInputOfTest.java
@@ -23,9 +23,9 @@
  */
 package org.cactoos.io;
 
-import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
+import org.llorllale.cactoos.matchers.Assertion;
 
 /**
  * Test case for {@link LSInputOf}.
@@ -38,41 +38,41 @@ public final class LSInputOfTest {
 
     @Test
     public void readsSimpleInput() {
-        MatcherAssert.assertThat(
+        new Assertion<>(
             "Can't read simple input",
-            new LSInputOf(
+            () -> new LSInputOf(
                 new InputOf("hello, world!")
             ).getStringData(),
             Matchers.endsWith("world!")
-        );
+        ).affirm();
     }
 
     @Test
     public void readsBiggerInput() {
         final int size = 400_000;
-        MatcherAssert.assertThat(
+        new Assertion<>(
             "Can't read bigger input",
-            new LSInputOf(
+            () -> new LSInputOf(
                 new InputOf(
                     new SlowInputStream(size)
                 )
             ).getStringData().length(),
             Matchers.equalTo(size)
-        );
+        ).affirm();
     }
 
     @Test
     public void countsBytesInBiggerInput() {
         final int size = 300_000;
-        MatcherAssert.assertThat(
+        new Assertion<>(
             "Can't count bytes in a bigger input",
-            new LSInputOf(
+            () -> new LSInputOf(
                 new InputOf(
                     new SlowInputStream(size)
                 )
             ).getStringData().length(),
             Matchers.equalTo(size)
-        );
+        ).affirm();
     }
 
 }