Merge branch '__rultor'

pom.xml

@@ -142,6 +142,31 @@ The MIT License (MIT)
               </excludes>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>de.thetaphi</groupId>
+            <artifactId>forbiddenapis</artifactId>
+            <version>2.5</version>
+            <configuration>
+              <!--
+               @todo #588: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. At the end the configuration property below should be
+                removed so that calls to forbidden APIs fail the build.  
+               -->
+              <failOnViolation>false</failOnViolation>
+              <signaturesFiles>
+                <signaturesFile>./src/test/resources/forbidden-apis.txt</signaturesFile>
+              </signaturesFiles>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>testCheck</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>

src/test/java/org/cactoos/ProcTest.java

@@ -25,7 +25,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 
 /**
@@ -53,7 +53,7 @@ public void okForNoNulls() throws Exception {
         MatcherAssert.assertThat(
             "Can't involve the \"Proc.exec(X input)\" method",
             counter.get(),
-            Matchers.equalTo(1)
+            new IsEqual<>(1)
         );
     }
 }

src/test/java/org/cactoos/bytes/Base64BytesTest.java

@@ -27,7 +27,7 @@
 import java.util.Base64;
 import org.cactoos.io.BytesOf;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 
 /**
@@ -48,7 +48,7 @@ public void checkDecodeBasicDecoder() throws Exception {
                     "SGVsbG8h"
                 )
             ).asBytes(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 new BytesOf("Hello!").asBytes()
             )
         );
@@ -63,7 +63,7 @@ public void checkDecodeUrlDecoder() throws Exception {
                     "SGVsbG8h"
                 ), Base64.getUrlDecoder()
             ).asBytes(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 new BytesOf("Hello!").asBytes()
             )
         );
@@ -78,7 +78,7 @@ public void checkDecodeMimeDecoder() throws Exception {
                     "SGVsbG8h"
                 ), Base64.getMimeDecoder()
             ).asBytes(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 new BytesOf("Hello!").asBytes()
             )
         );

src/test/java/org/cactoos/bytes/BytesBase64Test.java

@@ -27,7 +27,7 @@
 import java.util.Base64;
 import org.cactoos.io.BytesOf;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 
 /**
@@ -47,7 +47,7 @@ public void checkEncodeBasic() throws Exception {
                     "Hello!"
                 )
             ).asBytes(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 new BytesOf("SGVsbG8h").asBytes()
             )
         );
@@ -62,7 +62,7 @@ public void checkEncodeUrl() throws Exception {
                     "Hello!"
                 ), Base64.getUrlEncoder()
             ).asBytes(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 new BytesOf("SGVsbG8h").asBytes()
             )
         );
@@ -77,7 +77,7 @@ public void checkEncodeMime() throws Exception {
                     "Hello!"
                 ), Base64.getMimeEncoder()
             ).asBytes(),
-            Matchers.equalTo(
+            new IsEqual<>(
                 new BytesOf("SGVsbG8h").asBytes()
             )
         );

src/test/java/org/cactoos/collection/BehavesAsCollection.java

@@ -27,8 +27,13 @@
 import org.cactoos.list.ListOf;
 import org.hamcrest.Description;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.hamcrest.TypeSafeMatcher;
+import org.hamcrest.collection.IsCollectionWithSize;
+import org.hamcrest.collection.IsEmptyCollection;
+import org.hamcrest.core.IsCollectionContaining;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNot;
+import org.llorllale.cactoos.matchers.MatcherOf;
 
 /**
  * Matcher for collection.
@@ -56,22 +61,27 @@ public BehavesAsCollection(final E item) {
     @Override
     @SuppressWarnings({ "unchecked", "PMD.ClassCastExceptionWithToArray" })
     public boolean matchesSafely(final Collection<E> col) {
-        MatcherAssert.assertThat(col, Matchers.hasItem(this.sample));
-        MatcherAssert.assertThat(col, Matchers.not(Matchers.emptyIterable()));
         MatcherAssert.assertThat(
-            col, Matchers.hasSize(Matchers.greaterThan(0))
+            col, new IsCollectionContaining<>(new IsEqual<>(this.sample))
+        );
+        MatcherAssert.assertThat(
+            col, new IsNot<>(new IsEmptyCollection<>())
+        );
+        MatcherAssert.assertThat(
+            col, new IsCollectionWithSize<>(new MatcherOf<>(s -> s > 0))
         );
         MatcherAssert.assertThat(
             new ListOf<>((E[]) col.toArray()),
-            Matchers.hasItem(this.sample)
+            new IsCollectionContaining<>(new IsEqual<>(this.sample))
         );
         final E[] array = (E[]) new Object[col.size()];
         col.toArray(array);
         MatcherAssert.assertThat(
-            new ListOf<>(array), Matchers.hasItem(this.sample)
+            new ListOf<>(array),
+            new IsCollectionContaining<>(new IsEqual<>(this.sample))
         );
         MatcherAssert.assertThat(
-            col.containsAll(new ListOf<>(this.sample)), Matchers.is(true)
+            col.containsAll(new ListOf<>(this.sample)), new IsEqual<>(true)
         );
         return true;
     }

src/test/java/org/cactoos/collection/CollectionOfTest.java

@@ -25,12 +25,19 @@
 
 import org.cactoos.list.ListOf;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Test Case for {@link CollectionOf}.
+ *
  * @since 0.23
+ * @todo #588:30min The test buildsCollectionFromIterator was changed
+ *  to use BehavesAsCollection instead of Matchers.hasItem
+ *  and it seems that actually, a CollectionOf built from an Iterator
+ *  does not behave as a collection. This should be fixed and the @Ignore
+ *  tag on the buildsCollectionFromIterator method removed.
  * @checkstyle JavadocMethodCheck (500 lines)
  */
 public final class CollectionOfTest {
@@ -44,43 +51,31 @@ public void behavesAsCollection() throws Exception {
         );
     }
 
-    @Test
-    public void buildsCollection() throws Exception {
-        MatcherAssert.assertThat(
-            "Can't build a collection",
-            new CollectionOf<Integer>(1, 2, 0, -1),
-            Matchers.hasItem(-1)
-        );
-    }
-
+    @Ignore
     @Test
     public void buildsCollectionFromIterator() throws Exception {
         MatcherAssert.assertThat(
             "Can't build a collection from iterator",
-            new CollectionOf<Integer>(new ListOf<>(1, 2, 0, -1).iterator()),
-            Matchers.hasItem(-1)
+            new CollectionOf<>(new ListOf<>(1, 2, 0, -1).iterator()),
+            new BehavesAsCollection<>(-1)
         );
     }
 
     @Test
     public void testToString() throws Exception {
         MatcherAssert.assertThat(
             "Wrong toString output. Expected \"[1, 2, 0, -1]\".",
-            new CollectionOf<Integer>(
-                new ListOf<>(1, 2, 0, -1)
-            ).toString(),
-            Matchers.equalTo("[1, 2, 0, -1]")
+            new CollectionOf<>(new ListOf<>(1, 2, 0, -1)).toString(),
+            new IsEqual<>("[1, 2, 0, -1]")
         );
     }
 
     @Test
     public void testToStringEmpty() throws Exception {
         MatcherAssert.assertThat(
             "Wrong toString output. Expected \"[]\".",
-            new CollectionOf<Integer>(
-                new ListOf<>()
-            ).toString(),
-            Matchers.equalTo("[]")
+            new CollectionOf<>(new ListOf<>()).toString(),
+            new IsEqual<>("[]")
         );
     }
 

src/test/java/org/cactoos/collection/FilteredTest.java

@@ -23,11 +23,13 @@
  */
 package org.cactoos.collection;
 
-import java.util.Collections;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.LengthOf;
+import org.cactoos.list.ListOf;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.collection.IsEmptyCollection;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 
 /**
@@ -36,6 +38,7 @@
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 public final class FilteredTest {
 
@@ -57,7 +60,7 @@ public void filterList() {
                     new IterableOf<>("hello", "world", "друг")
                 )
             ).intValue(),
-            Matchers.equalTo(2)
+            new IsEqual<>(2)
         );
     }
 
@@ -66,9 +69,9 @@ public void filterEmptyList() {
         MatcherAssert.assertThat(
             new Filtered<String>(
                 input -> input.length() > 4,
-                Collections.emptyList()
+                new ListOf<>()
             ),
-            Matchers.emptyIterable()
+            new IsEmptyCollection<>()
         );
     }
 
@@ -79,7 +82,7 @@ public void size() throws Exception {
                 input -> input.length() >= 4,
                 new IterableOf<>("some", "text", "yes")
             ).size(),
-            Matchers.equalTo(2)
+            new IsEqual<>(2)
         );
     }
 
@@ -89,8 +92,8 @@ public void withItemsNotEmpty() throws Exception {
             new Filtered<String>(
                 input -> input.length() > 4,
                 new IterableOf<>("first", "second")
-            ).isEmpty(),
-            Matchers.equalTo(false)
+            ),
+            new IsNot<>(new IsEmptyCollection<>())
         );
     }
 
@@ -100,8 +103,8 @@ public void withoutItemsIsEmpty() throws Exception {
             new Filtered<String>(
                 input -> input.length() > 16,
                 new IterableOf<>("third", "fourth")
-            ).isEmpty(),
-            Matchers.equalTo(true)
+            ),
+            new IsEmptyCollection<>()
         );
     }
 }

src/test/java/org/cactoos/collection/JoinedTest.java

@@ -27,7 +27,10 @@
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.list.ListOf;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
+import org.hamcrest.collection.IsCollectionWithSize;
+import org.hamcrest.collection.IsEmptyCollection;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 
 /**
@@ -36,6 +39,7 @@
  * @since 0.16
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle MagicNumber (500 line)
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 @SuppressWarnings("PMD.TooManyMethods")
 public final class JoinedTest {
@@ -60,8 +64,8 @@ public void size() {
                 new IterableOf<>("hello", "world", "друг"),
                 new IterableOf<>("how", "are", "you"),
                 new IterableOf<>("what's", "up")
-            ).size(),
-            Matchers.equalTo(8)
+            ),
+            new IsCollectionWithSize<>(new IsEqual<>(8))
         );
     }
 
@@ -70,8 +74,8 @@ public void sizeEmptyReturnZero() {
         MatcherAssert.assertThat(
             new Joined<String>(
                 Collections.emptyList()
-            ).size(),
-            Matchers.equalTo(0)
+            ),
+            new IsCollectionWithSize<>(new IsEqual<>(0))
         );
     }
 
@@ -81,8 +85,8 @@ public void withItemsNotEmpty() throws Exception {
             new Joined<String>(
                 new IterableOf<>("1", "2"),
                 new IterableOf<>("3", "4")
-            ).isEmpty(),
-            Matchers.equalTo(false)
+            ),
+            new IsNot<>(new IsEmptyCollection<>())
         );
     }
 
@@ -91,8 +95,8 @@ public void withoutItemsIsEmpty() throws Exception {
         MatcherAssert.assertThat(
             new Joined<String>(
                 Collections.emptyList()
-            ).isEmpty(),
-            Matchers.equalTo(true)
+            ),
+            new IsEmptyCollection<>()
         );
     }