Merge branch '__rultor'

src/main/java/org/cactoos/text/TextEnvelope.java

@@ -73,8 +73,23 @@ public final int hashCode() {
         return new UncheckedScalar<>(this.origin).value().hashCode();
     }
 
+    // @todo #942:30min Refactor TextEnvelope.equals(). Current implementation
+    //  of TextEnvelope.equals() uses some things that we must avoid, like more
+    //  than one return on method, instance of usage and typecasting. Refactor
+    //  this method so we can get rid of these smelly things.
+    //
     @Override
+    @SuppressWarnings("PMD.OnlyOneReturn")
     public final boolean equals(final Object obj) {
-        return new UncheckedScalar<>(this.origin).value().equals(obj);
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof Text)) {
+            return false;
+        }
+        final Text that = (Text) obj;
+        return new UncheckedText(this).asString().equals(
+            new UncheckedText(that).asString()
+        );
     }
 }

src/test/java/org/cactoos/text/TextEnvelopeTest.java

@@ -51,15 +51,32 @@ public void testAsString() throws Exception {
     }
     /**
      * Test for {@link TextEnvelope#equals(Object)} method. Must assert
-     * that the envelope value is equal to its string value.
+     * that the envelope value is equal another text representing the same
+     * value.
      */
     @Test
     public void testEquals() {
         final String text = "equals";
         MatcherAssert.assertThat(
-            "Envelope value does not match its represented String value",
+            "Envelope does not match text representing the same value",
             new TextEnvelopeDummy(text),
-            new IsEqual<>(text)
+            new IsEqual<>(new TextOf(text))
+        );
+    }
+
+    /**
+     * Test for {@link TextEnvelope#equals(Object)} method. Must assert
+     * that the envelope value is equal another text representing the same
+     * value (in this case a {@link JoinedText}).
+     */
+    @Test
+    public void testEqualsOtherText() {
+        MatcherAssert.assertThat(
+            "Envelope does not match another text representing the same value",
+            new TextEnvelopeDummy("isequaltoanothertext"),
+            new IsEqual<>(
+                new JoinedText("", "is", "equal", "to", "another", "text")
+            )
         );
     }
     /**