Explicitly pass output stream in runArduino(..) test function

cmaglie · cmaglie · commit 44afcbf84d81 · 2020-05-12T12:24:17.000+02:00
Previously while testing on Windows, if the process produces a lot of
output that is not consumed, the pr.Wait() call will never end
because the OS doesn't have enough buffering.
diff --git a/app/test/processing/app/CommandLineTest.java b/app/test/processing/app/CommandLineTest.java
@@ -32,9 +32,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -84,17 +86,17 @@ public static void findBuildPaths() throws Exception {
     System.out.println("found arduino: " + arduinoPath);
   }
 
-  private void consume(InputStream s) {
+  private void consume(InputStream s, OutputStream out) {
     new Thread(() -> {
       try {
-        IOUtils.copy(s, System.out);
+        IOUtils.copy(s, out);
       } catch (IOException e) {
         e.printStackTrace();
       }
     }).start();
   }
 
-  public Process runArduino(boolean output, boolean success, File wd, String[] extraArgs) throws IOException, InterruptedException {
+  public Process runArduino(OutputStream output, boolean success, File wd, String[] extraArgs) throws IOException, InterruptedException {
     Runtime rt = Runtime.getRuntime();
 
     List<String> args = new ArrayList<>();
@@ -105,10 +107,8 @@ public Process runArduino(boolean output, boolean success, File wd, String[] ext
     System.out.println("Running: " + String.join(" ", args));
 
     Process pr = rt.exec(args.toArray(new String[0]), null, wd);
-    if (output) {
-      consume(pr.getInputStream());
-      consume(pr.getErrorStream());
-    }
+    consume(pr.getInputStream(), output);
+    consume(pr.getErrorStream(), System.err);
     pr.waitFor();
     if (success)
       assertEquals(0, pr.exitValue());
@@ -118,7 +118,7 @@ public Process runArduino(boolean output, boolean success, File wd, String[] ext
   @Test
   public void testCommandLineBuildWithRelativePath() throws Exception {
     File wd = new File(buildPath, "build/shared/examples/01.Basics/Blink/");
-    runArduino(true, true, wd, new String[] {
+    runArduino(System.out, true, wd, new String[] {
         "--board", "arduino:avr:uno",
         "--verify", "Blink.ino",
     });
@@ -129,21 +129,21 @@ public void testCommandLinePreferencesSave() throws Exception {
     File prefFile = File.createTempFile("test_pref", ".txt");
     prefFile.deleteOnExit();
 
-    runArduino(true, true, null, new String[] {
+    runArduino(System.out, true, null, new String[] {
         "--save-prefs",
         "--preferences-file", prefFile.getAbsolutePath(),
         "--version", // avoids starting the GUI
     });
 
-    runArduino(true, true, null, new String[] {
+    runArduino(System.out, true, null, new String[] {
         "--pref", "test_pref=xxx",
         "--preferences-file", prefFile.getAbsolutePath(),
     });
 
     PreferencesMap prefs = new PreferencesMap(prefFile);
     assertNull("preference should not be saved", prefs.get("test_pref"));
 
-    runArduino(true, true, null, new String[] {
+    runArduino(System.out, true, null, new String[] {
         "--pref", "test_pref=xxx",
         "--preferences-file", prefFile.getAbsolutePath(),
         "--save-prefs",
@@ -155,17 +155,18 @@ public void testCommandLinePreferencesSave() throws Exception {
 
   @Test
   public void testCommandLineVersion() throws Exception {
-    Process pr = runArduino(false, true, null, new String[] {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    runArduino(out, true, null, new String[] {
       "--version",
     });
 
-    Assertions.assertThat(new String(IOUtils.toByteArray(pr.getInputStream())))
-        .matches("Arduino: \\d+\\.\\d+\\.\\d+.*\r?\n");
+    Assertions.assertThat(out.toString())
+        .matches("(?m)Arduino: \\d+\\.\\d+\\.\\d+.*\r?\n");
   }
 
   @Test
   public void testCommandLineMultipleAction() throws Exception {
-    Process pr = runArduino(true, false, null, new String[] {
+    Process pr = runArduino(System.out, false, null, new String[] {
       "--version",
       "--verify",
     });
