(yegor256#1462) Use TextOf' in order to provide equals' & `hashCode'

andreoss · Nov 8, 2020 · 92ce712 · 92ce712
1 parent 397ac51
commit 92ce712
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/src/main/java/org/cactoos/text/Mapped.java b/src/main/java/org/cactoos/text/Mapped.java
@@ -31,17 +31,7 @@
  *
  * @since 0.47
  */
-public final class Mapped implements Text {
-
-    /**
-     * Map function.
-     */
-    private final Func<String, String> func;
-
-    /**
-     * Original text.
-     */
-    private final Text text;
+public final class Mapped extends TextEnvelope {
 
     /**
      * Ctor.
@@ -50,13 +40,7 @@ public final class Mapped implements Text {
      * @param txt Original text
      */
     public Mapped(final Func<String, String> fnc, final Text txt) {
-        this.func = fnc;
-        this.text = txt;
-    }
-
-    @Override
-    public String asString() throws Exception {
-        return this.func.apply(this.text.asString());
+        super(new TextOf(() -> fnc.apply(txt.asString())));
     }
 
 }
diff --git a/src/test/java/org/cactoos/text/MappedTest.java b/src/test/java/org/cactoos/text/MappedTest.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.text;
 
+import org.hamcrest.core.IsEqual;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.TextIs;
@@ -34,6 +35,18 @@
  */
 final class MappedTest {
 
+    @Test
+    void resultShouldBeEqual() {
+        new Assertion<>(
+            "must be equal to the same text",
+            new Mapped(
+                String::toUpperCase,
+                new TextOf("hi")
+            ),
+            new IsEqual<>(new TextOf("HI"))
+        ).affirm();
+    }
+
     @Test
     void mapsWithFormat() {
         new Assertion<>(