#74: Std.print should support Text subtypes

dgroup · dgroup · commit 7deb02f758ea · 2019-06-17T05:24:13.000+05:30
diff --git a/src/main/java/io/github/dgroup/term4j/Std.java b/src/main/java/io/github/dgroup/term4j/Std.java
@@ -65,6 +65,5 @@ public interface Std {
      * @throws UncheckedStdOutputException In the case of STD output printing
      *  failure.
      */
-    void print(Iterable<Text> msgs);
-
+    void print(Iterable<? extends Text> msgs);
 }
diff --git a/src/main/java/io/github/dgroup/term4j/std/StdEnvelope.java b/src/main/java/io/github/dgroup/term4j/std/StdEnvelope.java
@@ -40,13 +40,13 @@ public class StdEnvelope implements Std {
     /**
      * The procedure to print the text to the standart output.
      */
-    private final Proc<Iterable<Text>> prc;
+    private final Proc<Iterable<? extends Text>> prc;
 
     /**
      * Ctor.
      * @param prc The procedure to print the text to the standart output.
      */
-    public StdEnvelope(final Proc<Iterable<Text>> prc) {
+    public StdEnvelope(final Proc<Iterable<? extends Text>> prc) {
         this.prc = prc;
     }
 
@@ -67,7 +67,7 @@ public final void print(final Text... msgs) {
 
     @Override
     @SuppressWarnings("PMD.AvoidCatchingGenericException")
-    public final void print(final Iterable<Text> msgs) {
+    public final void print(final Iterable<? extends Text> msgs) {
         try {
             this.prc.exec(msgs);
             // @checkstyle IllegalCatchCheck (3 lines)
diff --git a/src/main/java/io/github/dgroup/term4j/std/StdOf.java b/src/main/java/io/github/dgroup/term4j/std/StdOf.java
@@ -27,7 +27,6 @@
 import java.io.Writer;
 import org.cactoos.Proc;
 import org.cactoos.Text;
-import org.cactoos.scalar.And;
 
 /**
  * Default implementation of std output.
@@ -101,6 +100,10 @@ public StdOf(final Writer std, final String idnt) {
      * @param std The procedure to handle each line of the output.
      */
     public StdOf(final Proc<Text> std) {
-        super(msgs -> new And(std, msgs).value());
+        super(lines -> {
+            for (final Text line : lines) {
+                std.exec(line);
+            }
+        });
     }
 }
diff --git a/src/test/java/io/github/dgroup/term4j/std/StdOfTest.java b/src/test/java/io/github/dgroup/term4j/std/StdOfTest.java
@@ -24,12 +24,17 @@
 
 package io.github.dgroup.term4j.std;
 
+import io.github.dgroup.term4j.Highlighted;
 import io.github.dgroup.term4j.Std;
+import io.github.dgroup.term4j.highlighted.Green;
+import io.github.dgroup.term4j.highlighted.Red;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import org.cactoos.collection.CollectionOf;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.HasLines;
@@ -39,6 +44,7 @@
  *
  * @since 0.1.0
  * @checkstyle MagicNumberCheck (200 lines)
+ * @checkstyle ClassDataAbstractionCouplingCheck (200 lines)
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public final class StdOfTest {
@@ -77,4 +83,22 @@ public void printToWriter() {
             new HasLines("line1", "line2", "line3", "line4")
         ).affirm();
     }
+
+    /**
+     * Ensure that subtypes of {@link org.cactoos.Text} can be printed through the {@link Std}.
+     */
+    @Test
+    public void inheritance() {
+        final Collection<Highlighted> colours = new CollectionOf<>(
+            new Green(" one "), new Red(" two ")
+        );
+        final StringWriter swter = new StringWriter();
+        final Std std = new StdOf(swter);
+        std.print(colours);
+        new Assertion<>(
+            "subtypes of text has been printed",
+            swter.toString(),
+            new HasLines("\u001B[92m one \u001B[m", "\u001B[91m two \u001B[m")
+        ).affirm();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,5 @@ public interface Std {`
`65`	`65`	`* @throws UncheckedStdOutputException In the case of STD output printing`
`66`	`66`	`* failure.`
`67`	`67`	`*/`
`68`		`- void print(Iterable<Text> msgs);`
`69`		`-`
	`68`	`+ void print(Iterable<? extends Text> msgs);`
`70`	`69`	`}`