(#133) Fixes Matches and Mismatches type arguments

llorllale · Sep 15, 2019 · 71b5871 · 71b5871
1 parent ba2e3bf
commit 71b5871
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/org/llorllale/cactoos/matchers/Matches.java b/src/main/java/org/llorllale/cactoos/matchers/Matches.java
@@ -45,10 +45,12 @@
  * }</pre>
  *
  * @param <X> Type of item.
+ * @param <M> Type of tested matcher.
  * @since 1.0.0
  * @checkstyle ProtectedMethodInFinalClassCheck (200 lines)
  */
-public final class Matches<X> extends TypeSafeDiagnosingMatcher<Matcher<X>> {
+public final class Matches<X, M extends Matcher<X>> extends
+    TypeSafeDiagnosingMatcher<M> {
 
     /**
      * The testing arguments for the target matcher.
@@ -70,8 +72,7 @@ public void describeTo(final Description desc) {
     }
 
     @Override
-    protected boolean matchesSafely(final Matcher<X> matcher,
-        final Description dsc) {
+    protected boolean matchesSafely(final M matcher, final Description dsc) {
         matcher.describeTo(dsc);
         return matcher.matches(this.args);
     }

diff --git a/src/main/java/org/llorllale/cactoos/matchers/Mismatches.java b/src/main/java/org/llorllale/cactoos/matchers/Mismatches.java
@@ -51,6 +51,7 @@
  *  }</pre>
  *
  * @param <X> Type of item.
+ * @param <M> Type of tested matcher.
  * @since 1.0.0
  * @todo #106:30min Convert all the Matcher tests to use Mismatches
  *  instead of checking directly the output of mismatch methods or
@@ -61,7 +62,8 @@
  *  working and throwing errors.
  * @checkstyle ProtectedMethodInFinalClassCheck (200 lines)
  */
-public final class Mismatches<X> extends TypeSafeDiagnosingMatcher<Matcher<X>> {
+public final class Mismatches<X, M extends Matcher<X>> extends
+    TypeSafeDiagnosingMatcher<M> {
 
     /**
      * The testing arguments for the target matcher.
@@ -132,8 +134,7 @@ public void describeTo(final Description desc) {
     //  And then introduce some tests to validate that the description
     //  is properly constructed.
     @Override
-    protected boolean matchesSafely(final Matcher<X> matcher,
-        final Description dsc) {
+    protected boolean matchesSafely(final M matcher, final Description dsc) {
         boolean mismatch;
         try {
             new Assertion<>("", this.args, matcher).affirm();

diff --git a/src/test/java/org/llorllale/cactoos/matchers/MatchesTest.java b/src/test/java/org/llorllale/cactoos/matchers/MatchesTest.java
@@ -61,7 +61,7 @@ public void matches() {
     public void matchStatus() {
         new Assertion<>(
             "Matcher TextIs(abc) gives negative result for Text(def)",
-            new Matches<Text>(() -> "def").matches(new TextIs("abc")),
+            new Matches<>(new TextOf("def")).matches(new TextIs("abc")),
             new IsEqual<>(false)
         ).affirm();
     }
@@ -72,7 +72,7 @@ public void matchStatus() {
     @Test
     public void describeActual() {
         final Description description = new StringDescription();
-        new Matches<Text>(new TextOf("expected")).matchesSafely(
+        new Matches<Text, TextIs>(new TextOf("expected")).matchesSafely(
             new TextIs("actual"), description
         );
         new Assertion<>(
@@ -88,7 +88,7 @@ public void describeActual() {
     @Test
     public void describeExpected() {
         final Description description = new StringDescription();
-        new Matches<Text>(new TextOf("expected")).describeTo(description);
+        new Matches<>(new TextOf("expected")).describeTo(description);
         new Assertion<>(
             "describes the expected value",
             description.toString(),