better debugging and failing jenkins job if cmdline foo happens

Author: clouless

src/test/java/ut/com/comsysto/poc/ao/service/PetAndOwnerDataAccessServiceTest.java

@@ -36,18 +36,13 @@ public void getOwnersWhoHavePets() throws Exception {
     //
 
     protected static void setUpDockerContainer(String dockerRunCommand) {
-        CmdLineExecutionResult result = CmdLineTestHelper
-                .executeCommand(dockerRunCommand);
-        assertEquals(new Integer(0), result.exitCode);
-        assertEquals(null, result.exception);
+        CmdLineTestHelper.executeAndFailIfNotValidStatusCode(dockerRunCommand, 0);
     }
 
     protected static void tearDownDockerContainer(String dockerGetIdCommand) {
         CmdLineExecutionResult result = CmdLineTestHelper
-                .executeCommand(dockerGetIdCommand);
-        assertEquals(new Integer(0), result.exitCode);
-        assertEquals(null, result.exception);
+                .executeAndFailIfNotValidStatusCode(dockerGetIdCommand, 0);
         String dockerId = result.stdout.trim();
-        CmdLineTestHelper.executeCommand("docker kill " + dockerId);
+        CmdLineTestHelper.executeAndFailIfNotValidStatusCode("docker kill " + dockerId, 0);
     }
 }

src/test/java/ut/com/comsysto/poc/ao/service/helper/CmdLineTestHelper.java

@@ -14,6 +14,9 @@ public static CmdLineExecutionResult executeCommand(String command) {
     //
     // EXECUTE DOCKER COMMAND AND RETURN RESULT
     //
+    System.out.println("====================");
+    System.out.println(command);
+    System.out.println("====================");
     ByteArrayOutputStream stdout = new ByteArrayOutputStream();
     PumpStreamHandler psh = new PumpStreamHandler(stdout);
     CommandLine cmdLine = CommandLine.parse(command);
@@ -34,4 +37,12 @@ public static CmdLineExecutionResult executeCommand(String command) {
     }
     return res;
   }
+
+  public static CmdLineExecutionResult executeAndFailIfNotValidStatusCode(String command, Integer expectedExitCode) {
+    CmdLineExecutionResult result = executeCommand(command.toString());
+    if (! result.exitCode.equals(expectedExitCode)) {
+      throw new RuntimeException("Exec of cmd failed with exit code: " + result.exitCode + " - " + command + " ---- EXCEPTION: " + result.exception);
+    }
+    return result;
+  }
 }