From cafaf7e430b8107053c061f3f3c646451f214ee5 Mon Sep 17 00:00:00 2001
From: andreoss <andreoss@sdf.org>
Date: Tue, 1 Sep 2020 19:14:46 -0400
Subject: [PATCH] (#1223) Replace static factory methods with direct call to
 new

---
 pom.xml                                           |  3 ++-
 src/test/java/org/cactoos/func/ProcOfTest.java    |  8 ++++----
 src/test/java/org/cactoos/func/RepeatedTest.java  |  7 ++++---
 .../java/org/cactoos/func/SolidBiFuncTest.java    | 11 ++++++++---
 src/test/java/org/cactoos/func/SolidFuncTest.java |  6 +++---
 .../java/org/cactoos/func/StickyBiFuncTest.java   |  4 ++--
 .../java/org/cactoos/func/StickyFuncTest.java     | 15 ++++++++++-----
 src/test/java/org/cactoos/func/SyncFuncTest.java  | 10 +++++-----
 src/test/java/org/cactoos/func/TimedFuncTest.java |  6 +++---
 .../org/cactoos/func/UncheckedBiFuncTest.java     |  4 ++--
 10 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ba9e02a1f..e382bb0ec2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@ The MIT License (MIT)
                 <signaturesFile>./src/test/resources/forbidden-apis.txt</signaturesFile>
               </signaturesFiles>
               <!--
-               @todo #1166:30min In the continuation of #588, all the calls
+               @todo #1223:30min In the continuation of #588, all the calls
                 to Matchers should be replaced with their OO counterparts.
                 This todo should be updated with a new one until everything is
                 done. The newly covered classes should be added to the include
@@ -216,6 +216,7 @@ The MIT License (MIT)
                 <include>org/cactoos/time/*.class</include>
                 <include>org/cactoos/collection/*.class</include>
                 <include>org/cactoos/experimental/*.class</include>
+                <include>org/cactoos/func/*.class</include>
               </includes>
             </configuration>
             <executions>
diff --git a/src/test/java/org/cactoos/func/ProcOfTest.java b/src/test/java/org/cactoos/func/ProcOfTest.java
index a597af93b2..2ce838925b 100644
--- a/src/test/java/org/cactoos/func/ProcOfTest.java
+++ b/src/test/java/org/cactoos/func/ProcOfTest.java
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 import org.cactoos.text.FormattedText;
-import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
+import org.llorllale.cactoos.matchers.HasValues;
 
 /**
  * Test case for {@link ProcOf}.
@@ -57,7 +57,7 @@ public void run() {
                 str
             ).asString(),
             list,
-            Matchers.contains(str)
+            new HasValues<>(str)
         ).affirm();
     }
 
@@ -80,7 +80,7 @@ public String call() throws Exception {
                 str
             ).asString(),
             list,
-            Matchers.contains(str)
+            new HasValues<>(str)
         ).affirm();
     }
 
@@ -100,7 +100,7 @@ public void worksWithFunc() throws Exception {
                 str
             ).asString(),
             list,
-            Matchers.contains(str)
+            new HasValues<>(str)
         ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/func/RepeatedTest.java b/src/test/java/org/cactoos/func/RepeatedTest.java
index be19d17f89..271a110221 100644
--- a/src/test/java/org/cactoos/func/RepeatedTest.java
+++ b/src/test/java/org/cactoos/func/RepeatedTest.java
@@ -27,7 +27,8 @@
 import java.util.Iterator;
 import org.cactoos.Func;
 import org.cactoos.iterator.IteratorOf;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNull;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.Throws;
@@ -51,7 +52,7 @@ public void runsFuncMultipleTimes() throws Exception {
         new Assertion<>(
             "Must be applied 3 times",
             func.apply(true),
-            Matchers.equalTo(5)
+            new IsEqual<>(5)
         ).affirm();
     }
 
@@ -64,7 +65,7 @@ public void repeatsNullsResults() throws Exception {
         new Assertion<>(
             "Must repeat NULL",
             func.apply(true),
-            Matchers.equalTo(null)
+            new IsNull<>()
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/func/SolidBiFuncTest.java b/src/test/java/org/cactoos/func/SolidBiFuncTest.java
index 6e0d95ef7b..16b712a1aa 100644
--- a/src/test/java/org/cactoos/func/SolidBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/SolidBiFuncTest.java
@@ -26,7 +26,8 @@
 import java.security.SecureRandom;
 import org.cactoos.BiFunc;
 import org.cactoos.Func;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.RunsInThreads;
@@ -60,7 +61,7 @@ public void testThatFuncIsSynchronized() {
         new Assertion<>(
             "Shared resource has been modified by multiple threads.",
             shared[0],
-            Matchers.is(1)
+            new IsEqual<>(1)
         ).affirm();
     }
 
@@ -74,7 +75,11 @@ public void testThatFuncResultCacheIsLimited() throws Exception {
         new Assertion<>(
             "Result of (0, 0) call wasn't invalidated.",
             func.apply(0, 0) + func.apply(1, 1),
-            Matchers.not(func.apply(1, 1) + func.apply(0, 0))
+            new IsNot<>(
+                new IsEqual<>(
+                    func.apply(1, 1) + func.apply(0, 0)
+                )
+            )
         ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/func/SolidFuncTest.java b/src/test/java/org/cactoos/func/SolidFuncTest.java
index 6574696b94..1da7476882 100644
--- a/src/test/java/org/cactoos/func/SolidFuncTest.java
+++ b/src/test/java/org/cactoos/func/SolidFuncTest.java
@@ -26,7 +26,7 @@
 import java.security.SecureRandom;
 import org.cactoos.Func;
 import org.cactoos.list.ListOf;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.RunsInThreads;
@@ -47,7 +47,7 @@ public void cachesFuncResults() throws Exception {
         new Assertion<>(
             "Must cache results",
             func.apply(true) + func.apply(true),
-            Matchers.equalTo(func.apply(true) + func.apply(true))
+            new IsEqual<>(func.apply(true) + func.apply(true))
         ).affirm();
     }
 
@@ -59,7 +59,7 @@ public void worksInThreads() {
                 new Assertion<>(
                     "Result must be cached",
                     func.apply(true),
-                    Matchers.equalTo(func.apply(true))
+                    new IsEqual<>(func.apply(true))
                 ).affirm();
                 return true;
             },
diff --git a/src/test/java/org/cactoos/func/StickyBiFuncTest.java b/src/test/java/org/cactoos/func/StickyBiFuncTest.java
index f0044d16f4..fc335cb3f9 100644
--- a/src/test/java/org/cactoos/func/StickyBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/StickyBiFuncTest.java
@@ -25,7 +25,7 @@
 
 import java.security.SecureRandom;
 import org.cactoos.BiFunc;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
@@ -44,7 +44,7 @@ public void cachesFuncResults() throws Exception {
         new Assertion<>(
             "Must cache results",
             func.apply(true, true) + func.apply(true, true),
-            Matchers.equalTo(func.apply(true, true) + func.apply(true, true))
+            new IsEqual<>(func.apply(true, true) + func.apply(true, true))
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/func/StickyFuncTest.java b/src/test/java/org/cactoos/func/StickyFuncTest.java
index 5d0e696c02..960c77049c 100644
--- a/src/test/java/org/cactoos/func/StickyFuncTest.java
+++ b/src/test/java/org/cactoos/func/StickyFuncTest.java
@@ -25,7 +25,8 @@
 
 import java.security.SecureRandom;
 import org.cactoos.Func;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
@@ -45,7 +46,7 @@ public void cachesFuncResults() throws Exception {
         new Assertion<>(
             "Must cache results",
             func.apply(true) + func.apply(true),
-            Matchers.equalTo(
+            new IsEqual<>(
                 func.apply(true) + func.apply(true)
             )
         ).affirm();
@@ -61,13 +62,13 @@ public void cachesWithLimitedBuffer() throws Exception {
         new Assertion<>(
             "Must cache two results",
             first + second,
-            Matchers.equalTo(func.apply(0) + func.apply(1))
+            new IsEqual<>(func.apply(0) + func.apply(1))
         ).affirm();
         final int third = func.apply(-1);
         new Assertion<>(
             "Must cache next two results",
             second + third,
-            Matchers.equalTo(func.apply(1) + func.apply(-1))
+            new IsEqual<>(func.apply(1) + func.apply(-1))
         ).affirm();
     }
 
@@ -79,7 +80,11 @@ public void cachesWithZeroBuffer() throws Exception {
         new Assertion<>(
             "Must be not be cached",
             func.apply(true) + func.apply(true),
-            Matchers.not(Matchers.equalTo(func.apply(true) + func.apply(true)))
+            new IsNot<>(
+                new IsEqual<>(
+                    func.apply(true) + func.apply(true)
+                )
+            )
         ).affirm();
     }
 
diff --git a/src/test/java/org/cactoos/func/SyncFuncTest.java b/src/test/java/org/cactoos/func/SyncFuncTest.java
index e1b674ed40..d8fa030c6a 100644
--- a/src/test/java/org/cactoos/func/SyncFuncTest.java
+++ b/src/test/java/org/cactoos/func/SyncFuncTest.java
@@ -25,7 +25,7 @@
 
 import java.util.LinkedList;
 import java.util.List;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.RunsInThreads;
@@ -56,7 +56,7 @@ public void funcWorksInThreads() {
         new Assertion<>(
             "Must run the expected amount of threads",
             list.size(),
-            Matchers.equalTo(threads)
+            new IsEqual<>(threads)
         ).affirm();
     }
 
@@ -80,7 +80,7 @@ public void procWorksInThreads() {
         new Assertion<>(
             "Must run the expected amount of threads",
             counter[0],
-            Matchers.equalTo(threads)
+            new IsEqual<>(threads)
         ).affirm();
     }
 
@@ -104,7 +104,7 @@ public void callableWorksInThreads() {
         new Assertion<>(
             "Must run the expected amount of threads",
             counter[0],
-            Matchers.equalTo(threads)
+            new IsEqual<>(threads)
         ).affirm();
     }
 
@@ -126,7 +126,7 @@ public void runnableWorksInThreads() {
         new Assertion<>(
             "Must run the expected amount of threads",
             counter[0],
-            Matchers.equalTo(threads)
+            new IsEqual<>(threads)
         ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/func/TimedFuncTest.java b/src/test/java/org/cactoos/func/TimedFuncTest.java
index 9c76888a84..21dc5994c3 100644
--- a/src/test/java/org/cactoos/func/TimedFuncTest.java
+++ b/src/test/java/org/cactoos/func/TimedFuncTest.java
@@ -28,7 +28,7 @@
 import java.util.concurrent.TimeoutException;
 import org.cactoos.iterable.Endless;
 import org.cactoos.scalar.And;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
@@ -74,7 +74,7 @@ public void futureTaskIsCancelled() {
             new Assertion<>(
                 "Must be canceled after 1 sec",
                 future.isCancelled(),
-                Matchers.equalTo(true)
+                new IsEqual<>(true)
             ).affirm();
         }
     }
@@ -88,7 +88,7 @@ public void functionIsExecuted() throws Exception {
                 input -> true,
                 period
             ).apply(true),
-            Matchers.equalTo(true)
+            new IsEqual<>(true)
         ).affirm();
     }
 }
diff --git a/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java b/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java
index ba091fa8ae..22dcf4f458 100644
--- a/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java
+++ b/src/test/java/org/cactoos/func/UncheckedBiFuncTest.java
@@ -25,7 +25,7 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
@@ -52,7 +52,7 @@ public void testUncheckedBiFunc() {
             new UncheckedBiFunc<>(
                 (fst, scd) -> true
             ).apply(1, 2),
-            Matchers.equalTo(true)
+            new IsEqual<>(true)
         ).affirm();
     }