adjust unit test for multiple env output

Author: Yang Guo

platform-cmd-runner/src/main/java/com/flow/platform/cmd/CmdExecutor.java

@@ -218,8 +218,6 @@ public void setLogListener(LogListener logListener) {
 
     public CmdResult run() {
         outputResult = new CmdResult();
-
-        long startTime = System.currentTimeMillis();
         outputResult.setStartTime(DateUtil.now());
 
         try {
@@ -254,7 +252,7 @@ public CmdResult run() {
             logThreadCountDown.await(DEFAULT_LOGGING_WAITING_SECONDS, TimeUnit.SECONDS);
             executor.shutdown();
 
-            // try to shutdown all threads with max 30 seconds waitting time
+            // try to shutdown all threads with max 30 seconds waiting time
             if (!executor.awaitTermination(DEFAULT_SHUTDOWN_WAITING_SECONDS, TimeUnit.SECONDS)) {
                 executor.shutdownNow();
             }

platform-cmd-runner/src/test/java/com/flow/platform/cmd/test/CmdExecutorTest.java

@@ -14,32 +14,35 @@
  */
 public class CmdExecutorTest {
 
+    private LogListener logListener = new LogListener() {
+        @Override
+        public void onLog(Log log) {
+            System.out.println(log);
+        }
+
+        @Override
+        public void onFinish() {
+
+        }
+    };
+
     @Test
     public void should_execute_command_with_correct_event() throws Throwable {
         ClassLoader loader = this.getClass().getClassLoader();
         String path = loader.getResource("test.sh").getFile();
         Runtime.getRuntime().exec("chmod +x " + path);
 
-        LogListener logListener = new LogListener() {
-            @Override
-            public void onLog(Log log) {
-                System.out.println(log);
-            }
-
-            @Override
-            public void onFinish() {
-
-            }
-        };
-
+        // run test.sh and export var start with CMD_RUNNER_TEST_ and OUTPUT_2
         CmdExecutor executor = new CmdExecutor(null,
             logListener,
             null,
             null,
-            Lists.newArrayList("CMD_RUNNER_TEST"),
+            Lists.newArrayList("CMD_RUNNER_TEST_", "OUTPUT_2"),
             null,
             Lists.newArrayList(String.format("source %s", path)));
+
         CmdResult result = executor.run();
+        Assert.assertEquals(0, result.getExitValue().intValue());
 
         Assert.assertNotNull(result.getStartTime());
         Assert.assertNotNull(result.getProcess());
@@ -48,9 +51,31 @@ public void onFinish() {
         Assert.assertNotNull(result.getExitValue());
         Assert.assertNotNull(result.getDuration());
         Assert.assertNotNull(result.getExecutedTime());
-        Assert.assertEquals(1, result.getOutput().size());
 
         Assert.assertNotNull(result.getTotalDuration());
         Assert.assertNotNull(result.getFinishTime());
+
+        Assert.assertEquals(2, result.getOutput().size());
+        Assert.assertEquals("test1", result.getOutput().get("CMD_RUNNER_TEST_1"));
+        Assert.assertEquals("test2", result.getOutput().get("OUTPUT_2"));
+    }
+
+    @Test
+    public void should_not_export_output_when_cmd_got_error() throws Throwable {
+        ClassLoader loader = this.getClass().getClassLoader();
+        String path = loader.getResource("test_with_cmd_err.sh").getFile();
+        Runtime.getRuntime().exec("chmod +x " + path);
+
+        CmdExecutor executor = new CmdExecutor(null,
+            logListener,
+            null,
+            null,
+            Lists.newArrayList("CMD_RUNNER_TEST"),
+            null,
+            Lists.newArrayList(String.format("source %s", path)));
+
+        CmdResult result = executor.run();
+        Assert.assertEquals(0, result.getOutput().size());
+        Assert.assertNotEquals(0, result.getExitValue().intValue());
     }
 }

platform-cmd-runner/src/test/resources/test.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 echo "test shell"
-export CMD_RUNNER_TEST=test
+export CMD_RUNNER_TEST_1=test1
+export OUTPUT_2=test2
 sleep 2
 echo "done"
 

platform-cmd-runner/src/test/resources/test_with_cmd_err.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+echo "test shell"
+export CMD_RUNNER_TEST=test
+cmd xxxx