Merge branch '__rultor'

yegor256 · Mar 29, 2021 · 3e37919 · 3e37919
2 parents 047fb51 + 0bf6c79
commit 3e37919
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 208 deletions.
diff --git a/pom.xml b/pom.xml
@@ -131,12 +131,12 @@ The MIT License (MIT)
       <artifactId>junit</artifactId>
       <version>4.13</version>
       <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>

diff --git a/src/test/java/org/cactoos/bytes/BytesOfTest.java b/src/test/java/org/cactoos/bytes/BytesOfTest.java
@@ -34,7 +34,6 @@
 import org.cactoos.io.Sticky;
 import org.cactoos.iterable.Endless;
 import org.cactoos.iterable.HeadOf;
-import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.IterableOfBytes;
 import org.cactoos.iterator.IteratorOfBytes;
 import org.cactoos.text.Concatenated;
@@ -89,10 +88,8 @@ void readsInputIntoBytes() throws Exception {
                 )
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("Hello, "),
-                    new EndsWith("друг!")
-                )
+                new StartsWith("Hello, "),
+                new EndsWith("друг!")
             )
         ).affirm();
     }
@@ -130,10 +127,8 @@ void readsInputIntoBytesWithSmallBuffer() throws Exception {
                 )
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("Hello,"),
-                    new EndsWith("товарищ!")
-                )
+                new StartsWith("Hello,"),
+                new EndsWith("товарищ!")
             )
         ).affirm();
     }

diff --git a/src/test/java/org/cactoos/bytes/InputAsBytesTest.java b/src/test/java/org/cactoos/bytes/InputAsBytesTest.java
@@ -29,7 +29,6 @@
 import org.cactoos.io.SlowInputStream;
 import org.cactoos.iterable.Endless;
 import org.cactoos.iterable.HeadOf;
-import org.cactoos.iterable.IterableOf;
 import org.cactoos.text.TextOf;
 import org.hamcrest.core.AllOf;
 import org.hamcrest.core.IsEqual;
@@ -98,10 +97,8 @@ void readsInputIntoBytes() throws Exception {
                 StandardCharsets.UTF_8
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("Hello, "),
-                    new EndsWith("друг!")
-                )
+                new StartsWith("Hello, "),
+                new EndsWith("друг!")
             )
         ).affirm();
     }
@@ -122,10 +119,8 @@ void readsInputIntoBytesWithSmallBuffer() throws Exception {
                 StandardCharsets.UTF_8
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("Hello,"),
-                    new EndsWith("товарищ!")
-                )
+                new StartsWith("Hello,"),
+                new EndsWith("товарищ!")
             )
         ).affirm();
     }

diff --git a/src/test/java/org/cactoos/collection/BehavesAsCollection.java b/src/test/java/org/cactoos/collection/BehavesAsCollection.java
@@ -29,10 +29,10 @@
 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.Assertion;
+import org.llorllale.cactoos.matchers.HasValues;
 import org.llorllale.cactoos.matchers.Verifies;
 
 /**
@@ -65,11 +65,7 @@ public boolean matchesSafely(final Collection<E> col) {
         new Assertion<>(
             "Must contain item",
             col,
-            new IsCollectionContaining<>(
-                new IsEqual<>(
-                    this.sample
-                )
-            )
+            new HasValues<>(this.sample)
         ).affirm();
         new Assertion<>(
             "Must not be empty",
@@ -90,18 +86,14 @@ public boolean matchesSafely(final Collection<E> col) {
             new ListOf<>(
                 (E[]) col.toArray()
             ),
-            new IsCollectionContaining<>(
-                new IsEqual<>(this.sample)
-            )
+            new HasValues<>(this.sample)
         ).affirm();
         final E[] array = (E[]) new Object[col.size()];
         col.toArray(array);
         new Assertion<>(
             "Array from collection must contain item",
             new ListOf<>(array),
-            new IsCollectionContaining<>(
-                new IsEqual<>(this.sample)
-            )
+            new HasValues<>(this.sample)
         ).affirm();
         new Assertion<>(
             "Must contain list with the item",

diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java
@@ -40,7 +40,6 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import org.cactoos.bytes.BytesOf;
-import org.cactoos.iterable.IterableOf;
 import org.cactoos.text.TextOf;
 import org.hamcrest.core.AllOf;
 import org.hamcrest.core.IsEqual;
@@ -180,10 +179,8 @@ void readsStringIntoBytes() throws Exception {
                 StandardCharsets.UTF_8
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("Hello, "),
-                    new EndsWith("друг!")
-                )
+                new StartsWith("Hello, "),
+                new EndsWith("друг!")
             )
         ).affirm();
     }
@@ -203,10 +200,8 @@ void readsStringBuilder() throws Exception {
                 )
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith(starts),
-                    new EndsWith(ends)
-                )
+                new StartsWith(starts),
+                new EndsWith(ends)
             )
         ).affirm();
     }
@@ -226,10 +221,8 @@ void readsStringBuffer() throws Exception {
                 )
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith(starts),
-                    new EndsWith(ends)
-                )
+                new StartsWith(starts),
+                new EndsWith(ends)
             )
         ).affirm();
     }
@@ -247,10 +240,8 @@ void readsArrayOfChars() throws Exception {
                 )
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("Hold "),
-                    new EndsWith("infinity")
-                )
+                new StartsWith("Hold "),
+                new EndsWith("infinity")
             )
         ).affirm();
     }
@@ -272,10 +263,8 @@ void readsEncodedArrayOfChars() throws Exception {
                 StandardCharsets.UTF_8
             ),
             new AllOf<>(
-                new IterableOf<>(
-                    new StartsWith("O que sera"),
-                    new EndsWith(" que sera")
-                )
+                new StartsWith("O que sera"),
+                new EndsWith(" que sera")
             )
         ).affirm();
     }

diff --git a/src/test/java/org/cactoos/map/BehavesAsMap.java b/src/test/java/org/cactoos/map/BehavesAsMap.java
@@ -25,11 +25,10 @@
 
 import java.util.Map;
 import org.hamcrest.Description;
-import org.hamcrest.MatcherAssert;
 import org.hamcrest.TypeSafeMatcher;
-import org.hamcrest.collection.IsMapContaining;
-import org.hamcrest.core.IsCollectionContaining;
-import org.hamcrest.core.IsEqual;
+import org.llorllale.cactoos.matchers.Assertion;
+import org.llorllale.cactoos.matchers.HasEntry;
+import org.llorllale.cactoos.matchers.HasValues;
 
 /**
  * Matcher for collection.
@@ -62,25 +61,23 @@ public BehavesAsMap(final K akey, final V val) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public boolean matchesSafely(final Map<K, V> map) {
-        MatcherAssert.assertThat(
-            "Doesn't contain the key",
+        new Assertion<>(
+            "Must contain the key/value entry",
             map,
-            new IsMapContaining<>(
-                new IsEqual<>(this.key),
-                new IsEqual<>(this.value)
-            )
-        );
-        MatcherAssert.assertThat(
-            "Doesn't contain the key in #keySet()",
+            new HasEntry<>(this.key, this.value)
+        ).affirm();
+        new Assertion<>(
+            "Must contain the key in #keySet()",
             map.keySet(),
-            new IsCollectionContaining<>(new IsEqual<>(this.key))
-        );
-        MatcherAssert.assertThat(
-            "Doesn't contain the value in #values()",
+            new HasValues<>(this.key)
+        ).affirm();
+        new Assertion<>(
+            "Must contain the value in #values()",
             map.values(),
-            new IsCollectionContaining<>(new IsEqual<>(this.value))
-        );
+            new HasValues<>(this.value)
+        ).affirm();
         return true;
     }