(llorllale#203) Simplify TextMatcher

victornoel · Sep 27, 2020 · f26f6b6 · f26f6b6
1 parent c5404b8
commit f26f6b6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/src/main/java/org/llorllale/cactoos/matchers/EndsWith.java b/src/main/java/org/llorllale/cactoos/matchers/EndsWith.java
@@ -52,7 +52,7 @@ public EndsWith(final Text text) {
         super(
             new TextMatcher(
                 new MatcherOf<>(
-                    (Text act) -> act.asString().endsWith(text.asString()),
+                    (String act) -> act.endsWith(text.asString()),
                     text
                 ),
                 "Text ending with "

diff --git a/src/main/java/org/llorllale/cactoos/matchers/MatchesRegex.java b/src/main/java/org/llorllale/cactoos/matchers/MatchesRegex.java
@@ -52,7 +52,7 @@ public MatchesRegex(final Text regex) {
         super(
             new TextMatcher(
                 new MatcherOf<>(
-                    (Text act) -> act.asString().matches(regex.asString()),
+                    (String act) -> act.matches(regex.asString()),
                     regex
                 ),
                 "Text matches "

diff --git a/src/main/java/org/llorllale/cactoos/matchers/StartsWith.java b/src/main/java/org/llorllale/cactoos/matchers/StartsWith.java
@@ -52,7 +52,7 @@ public StartsWith(final Text text) {
         super(
             new TextMatcher(
                 new MatcherOf<>(
-                    (Text act) -> act.asString().startsWith(text.asString()),
+                    (String act) -> act.startsWith(text.asString()),
                     text
                 ),
                 "Text starting with "

diff --git a/src/main/java/org/llorllale/cactoos/matchers/TextHasString.java b/src/main/java/org/llorllale/cactoos/matchers/TextHasString.java
@@ -52,7 +52,7 @@ public TextHasString(final Text text) {
         super(
             new TextMatcher(
                 new MatcherOf<>(
-                    (Text actual) -> actual.asString().contains(text.asString()),
+                    (String actual) -> actual.contains(text.asString()),
                     text
                 ),
                 "Text with "

diff --git a/src/main/java/org/llorllale/cactoos/matchers/TextIs.java b/src/main/java/org/llorllale/cactoos/matchers/TextIs.java
@@ -52,7 +52,7 @@ public TextIs(final Text text) {
         super(
             new TextMatcher(
                 new MatcherOf<>(
-                    (Text actual) -> actual.asString().equals(text.asString()),
+                    (String actual) -> actual.equals(text.asString()),
                     text
                 ),
                 "Text with value "

diff --git a/src/main/java/org/llorllale/cactoos/matchers/TextMatcher.java b/src/main/java/org/llorllale/cactoos/matchers/TextMatcher.java
@@ -27,14 +27,13 @@
 package org.llorllale.cactoos.matchers;
 
 import org.cactoos.Text;
-import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
 /**
- * The Text-based {@link TypeSafeDiagnosingMatcher} envelope.
+ * Generic {@link Matcher} of {@link Text}.
  *
  * @since 1.0.0
  * @checkstyle ProtectedMethodInFinalClassCheck (200 lines)
@@ -44,7 +43,7 @@ public final class TextMatcher extends TypeSafeDiagnosingMatcher<Text> {
     /**
      * The matcher to test.
      */
-    private final Matcher<Text> matcher;
+    private final Matcher<String> matcher;
 
     /**
      * The description of the matcher's expected text.
@@ -62,7 +61,7 @@ public final class TextMatcher extends TypeSafeDiagnosingMatcher<Text> {
      * @param expected The description of the matcher's expected text.
      */
     public TextMatcher(
-        final Matcher<Text> mtchr, final String expected
+        final Matcher<String> mtchr, final String expected
     ) {
         this(mtchr, expected, "Text is ");
     }
@@ -74,7 +73,7 @@ public TextMatcher(
      * @param actual The description of the matcher's actual text.
      */
     public TextMatcher(
-        final Matcher<Text> mtchr, final String expected, final String actual
+        final Matcher<String> mtchr, final String expected, final String actual
     ) {
         super();
         this.matcher = mtchr;
@@ -88,10 +87,9 @@ public void describeTo(final Description desc) {
     }
 
     @Override
-    protected boolean matchesSafely(final Text text,
-        final Description desc) {
+    protected boolean matchesSafely(final Text text, final Description desc) {
         final String txt = new UncheckedText(text).asString();
         desc.appendText(this.actual).appendValue(txt);
-        return this.matcher.matches(new TextOf(txt));
+        return this.matcher.matches(txt);
     }
 }
diff --git a/src/test/java/org/llorllale/cactoos/matchers/TextMatcherTest.java b/src/test/java/org/llorllale/cactoos/matchers/TextMatcherTest.java
@@ -27,25 +27,25 @@
 package org.llorllale.cactoos.matchers;
 
 import java.io.StringReader;
-import org.cactoos.Text;
 import org.cactoos.text.TextOf;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 
 /**
- * Tests for {@link TextMatcherEnvelope}.
+ * Tests for {@link TextMatcher}.
+ *
  * @since 1.0.0
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle JavadocTypeCheck (500 lines)
  */
-public final class TextMatcherTest {
-
+final class TextMatcherTest {
     @Test
-    public void matchesAReadOnceInput() {
+    void matchesAReadOnceInput() {
         final String input = "aaaa";
         new Assertion<>(
             "must match on an input that can be read only once",
             new TextMatcher(
-                new MatcherOf<>((Text text) -> input.equals(text.asString())),
+                new IsEqual<>(input),
                 "Text equals to "
             ),
             new Matches<>(new TextOf(new StringReader(input)))