chore: Replaces StringWriter by ByteArrayOutputStream

bric3 · Sep 18, 2023 · 9968be7 · 9968be7
1 parent 5ff663a
commit 9968be7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 29 deletions.
diff --git a/jufmt-cli/build.gradle.kts b/jufmt-cli/build.gradle.kts
@@ -87,10 +87,6 @@ graalvmNative {
     }
 }
 
-testlogger {
-    showStandardStreams = true
-}
-
 tasks {
     distZip { enabled = false }
     distTar { enabled = false }

diff --git a/jufmt-cli/src/main/java/io/github/bric3/jufmt/app/JufmtCommand.java b/jufmt-cli/src/main/java/io/github/bric3/jufmt/app/JufmtCommand.java
@@ -259,23 +259,15 @@ void figlet(
          */
         var out = spec.commandLine().getOut();
         if (random) {
-            String rendered = Figlet.render(stringToProcess);
-            if (rendered.isBlank()) {
-                throw new IllegalStateException("No font found");
-            }
-            out.println(rendered);
+            out.println(Figlet.render(stringToProcess));
             return;
         }
         if (renderAll) {
             Arrays.stream(EmbeddedFigletFonts.values())
                     .forEach(f -> {
                         out.printf("%s:%n", f);
                         out.println();
-                        String rendered = Figlet.render(stringToProcess, f);
-                        if (rendered.isBlank()) {
-                            throw new IllegalStateException("No font found");
-                        }
-                        out.println(rendered);
+                        out.println(Figlet.render(stringToProcess, f));
                         out.println();
                     });
             return;
@@ -309,11 +301,7 @@ void figlet(
             font = figletFont.font;
         }
 
-        var rendered = Figlet.render(stringToProcess, font);
-        if (rendered.isBlank()) {
-            throw new IllegalStateException("No font found");
-        }
-        out.println(rendered);
+        out.println(Figlet.render(stringToProcess, font));
     }
 
     @Command(

diff --git a/jufmt-cli/src/test/java/io/github/bric3/jufmt/app/JufmtTestUtil.java b/jufmt-cli/src/test/java/io/github/bric3/jufmt/app/JufmtTestUtil.java
@@ -12,20 +12,27 @@
 
 import picocli.CommandLine;
 
+import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 class JufmtTestUtil {
     record Result(int status, String out, String err) {}
 
     public static Result jufmt(String... args) {
-        var outWriter = new StringWriter();
-        var errWriter = new StringWriter();
+        var outWriter = new ByteArrayOutputStream();
+        var errWriter = new ByteArrayOutputStream();
         int status = new CommandLine(new JufmtCommand())
-                .setOut(new PrintWriter(outWriter, true))
-                .setErr(new PrintWriter(errWriter, true))
+                .setOut(new PrintWriter(outWriter, true, UTF_8))
+                .setErr(new PrintWriter(errWriter, true, UTF_8))
                 .execute(args);
 
-        return new Result(status, outWriter.toString(), errWriter.toString());
+        return new Result(
+                status,
+                outWriter.toString(UTF_8),
+                errWriter.toString(UTF_8)
+        );
     }
 }
diff --git a/jufmt-lib/src/main/java/io/github/bric3/jufmt/Figlet.java b/jufmt-lib/src/main/java/io/github/bric3/jufmt/Figlet.java
@@ -30,10 +30,7 @@ public class Figlet {
      */
     @NotNull
     public static String render(@NotNull String text, @NotNull FontSpec font) {
-        String render = renderer.render(text, font);
-        System.out.println("Render for " + text + " with " + font.getName() +
-                           "\n" + render + "\n");
-        return render;
+        return renderer.render(text, font);
     }
 
     /**