Improve help and help-tests

Author: pesse

src/main/java/org/utplsql/cli/UtplsqlPicocliCommand.java

@@ -8,7 +8,8 @@
         subcommands = {
                 RunPicocliCommand.class,
                 VersionInfoCommand.class,
-                ReportersCommand.class
+                ReportersCommand.class,
+                CommandLine.HelpCommand.class
         })
 public class UtplsqlPicocliCommand {
 

src/test/java/org/utplsql/cli/CliHelpTest.java

@@ -1,11 +1,33 @@
 package org.utplsql.cli;
 
 import org.junit.jupiter.api.Test;
+import org.utplsql.cli.util.SystemCapturer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class CliHelpTest {
 
+    private SystemCapturer capturer;
+
     @Test
-    void showBasicHelp() {
+    void show_basic_help_on_help_command() {
+        capturer = new SystemCapturer.SystemOutCapturer();
+        capturer.start();
         TestHelper.runApp("help");
+        String output = capturer.stop();
+
+        assertTrue(output.contains("Usage:"));
+    }
+
+    @Test
+    void write_help_to_error_out_on_unknown_command() {
+        capturer = new SystemCapturer.SystemErrCapturer();
+        capturer.start();
+        int exitCode = TestHelper.runApp("wtfhappens");
+        String output = capturer.stop();
+
+        assertTrue(output.contains("Usage:"));
+        assertEquals(1, exitCode);
     }
 }

src/test/java/org/utplsql/cli/HelpCommandTest.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.utplsql.cli.util.SystemOutCapturer;
+import org.utplsql.cli.util.SystemCapturer;
 
 import java.io.IOException;
 
@@ -13,11 +13,11 @@
 class HelpCommandTest {
 
 
-    private SystemOutCapturer capturer;
+    private SystemCapturer capturer;
 
     @BeforeEach
     void setupCaptureSystemOut() {
-        capturer = new SystemOutCapturer();
+        capturer = new SystemCapturer.SystemOutCapturer();
     }
 
     @Test

src/test/java/org/utplsql/cli/VersionInfoCommandIT.java

@@ -3,19 +3,19 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.utplsql.cli.util.SystemOutCapturer;
+import org.utplsql.cli.util.SystemCapturer;
 
 import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class VersionInfoCommandIT {
 
-    private SystemOutCapturer capturer;
+    private SystemCapturer capturer;
 
     @BeforeEach
     void setupCaptureSystemOut() {
-        capturer = new SystemOutCapturer();
+        capturer = new SystemCapturer.SystemOutCapturer();
     }
 
     private int getNonEmptyLines(String content) {

…/utplsql/cli/util/SystemOutCapturer.java …org/utplsql/cli/util/SystemCapturer.javasrc/test/java/org/utplsql/cli/util/SystemOutCapturer.java renamed to src/test/java/org/utplsql/cli/util/SystemCapturer.java src/test/java/org/utplsql/cli/util/SystemOutCapturer.java renamed to src/test/java/org/utplsql/cli/util/SystemCapturer.java

@@ -9,33 +9,38 @@
 
 /** All credit to Manasjyoti Sharma: https://stackoverflow.com/a/30665299
  */
-public class SystemOutCapturer {
+public abstract class SystemCapturer {
+
     private ByteArrayOutputStream baos;
     private PrintStream previous;
     private boolean capturing;
 
+    protected abstract PrintStream getOriginalStream();
+
+    protected abstract void setSystemStream( PrintStream stream );
+
     public void start() {
         if (capturing) {
             return;
         }
 
         capturing = true;
-        previous = System.out;
+        previous = getOriginalStream();
         baos = new ByteArrayOutputStream();
 
         OutputStream outputStreamCombiner =
                 new OutputStreamCombiner(Arrays.asList(previous, baos));
         PrintStream custom = new PrintStream(outputStreamCombiner);
 
-        System.setOut(custom);
+        setSystemStream(custom);
     }
 
     public String stop() {
         if (!capturing) {
             return "";
         }
 
-        System.setOut(previous);
+        setSystemStream(previous);
 
         String capturedValue = baos.toString();
 
@@ -71,4 +76,30 @@ public void close() throws IOException {
             }
         }
     }
+
+    public static class SystemOutCapturer extends SystemCapturer {
+
+        @Override
+        protected PrintStream getOriginalStream() {
+            return System.out;
+        }
+
+        @Override
+        protected void setSystemStream(PrintStream stream) {
+            System.setOut(stream);
+        }
+    }
+
+    public static class SystemErrCapturer extends SystemCapturer {
+
+        @Override
+        protected PrintStream getOriginalStream() {
+            return System.err;
+        }
+
+        @Override
+        protected void setSystemStream(PrintStream stream) {
+            System.setErr(stream);
+        }
+    }
 }