correct exit criteria from cli

Author: tsiq-karold

webtau-groovy/src/main/groovy/com/twosigma/webtau/cli/WebTauTestCliConfig.groovy

@@ -31,13 +31,20 @@ class WebTauTestCliConfig {
 
     private WebTauConfig cfg = WebTauConfig.INSTANCE
 
+    private final ExitHandler exitHandler
+
     private List<String> testFiles
     private String env
     private Path configPath
     private CommandLine commandLine
     private ConfigObject configObject
 
     WebTauTestCliConfig(String... args) {
+        this({ System.exit(it) }, args)
+    }
+
+    WebTauTestCliConfig(ExitHandler exitHandler, String... args) {
+        this.exitHandler = exitHandler
         parseArgs(args)
     }
 
@@ -75,10 +82,11 @@ class WebTauTestCliConfig {
         Options options = createOptions()
         commandLine = createCommandLine(args, options)
 
-        if (commandLine.hasOption("help") || args.length < 1) {
+        if (commandLine.hasOption("help") || commandLine.argList.isEmpty()) {
             HelpFormatter helpFormatter = new HelpFormatter()
             helpFormatter.printHelp("webtau [options] [testFile1] [testFile2]", options)
-            System.exit(1)
+            exitHandler.exit(1)
+            return
         }
 
         testFiles = new ArrayList<>(commandLine.argList)
@@ -115,4 +123,8 @@ class WebTauTestCliConfig {
     private Map commandLineArgsAsMap() {
         commandLine.options.collectEntries { [it.longOpt, it.value] }
     }
+
+    interface ExitHandler {
+        void exit(int status)
+    }
 }

webtau-groovy/src/test/groovy/com/twosigma/webtau/cli/WebTauTestCliConfigTest.groovy

@@ -28,17 +28,25 @@ class WebTauTestCliConfigTest {
 
     @Test
     void "should use default environment values when evn is not specified"() {
-        def cliConfig = new WebTauTestCliConfig("--config=src/test/resources/test.cfg")
+        def cliConfig = new WebTauTestCliConfig("--config=src/test/resources/test.cfg", "testFile")
         cliConfig.parseConfig(groovy)
 
         cfg.baseUrl.should == "http://localhost:8180"
     }
 
     @Test
     void "should use environment specific values when evn is specified"() {
-        def cliConfig = new WebTauTestCliConfig("--config=src/test/resources/test.cfg", "--env=dev")
+        def cliConfig = new WebTauTestCliConfig("--config=src/test/resources/test.cfg", "--env=dev", "testFile")
         cliConfig.parseConfig(groovy)
 
         cfg.baseUrl.should == "http://dev.host:8080"
     }
+
+    @Test
+    void "should exit if only config file provided"() {
+        Integer retCode
+        new WebTauTestCliConfig({ retCode = it }, "--config=src/test/resources/test.cfg", "--env=dev")
+
+        retCode.should == 1
+    }
 }