blah

Author: chadlwilson

plugin/src/integrationTest/java/org/gauge/gradle/RunTest.java

@@ -118,7 +118,7 @@ void testCanRunGaugeTestsWhenInParallelSet(TestGradleVersions gradle) throws IOE
                   specsDir = 'specs multipleSpecs'
                   inParallel = true
                   nodes = 2
-                  additionalFlags = '--simple-console'
+                  additionalFlags = '--simple-console --verbose'
                 }
                 """);
         // Then I should be able to run the gauge task
@@ -148,7 +148,7 @@ void testCanRunGaugeTestsWhenTagsSet(TestGradleVersions gradle) throws IOExcepti
                 gauge {
                   specsDir='specs multipleSpecs'
                   inParallel = true
-                  additionalFlags = '--simple-console'
+                  additionalFlags = '--simple-console --verbose'
                   tags = 'example1'
                 }
                 """);
@@ -178,7 +178,7 @@ void testCanRunGaugeTestsWhenEnvSet(TestGradleVersions gradle) throws IOExceptio
         writeFile(buildFile, getApplyPluginsBlock() + """
                 gauge {
                   inParallel = true
-                  additionalFlags = '--simple-console'
+                  additionalFlags = '--simple-console --verbose'
                   env = 'invalid'
                 }
                 """);
@@ -204,7 +204,7 @@ void testCanRunGaugeTestsWhenRepeatFlagSet(TestGradleVersions gradle) throws IOE
         writeFile(buildFile, getApplyPluginsBlock() + """
                 gauge {
                   inParallel = true
-                  additionalFlags = '--simple-console'
+                  additionalFlags = '--simple-console --verbose'
                   nodes = 2
                   env = 'dev'
                 }
@@ -213,15 +213,15 @@ void testCanRunGaugeTestsWhenRepeatFlagSet(TestGradleVersions gradle) throws IOE
         BuildResult resultWithExtension = defaultGradleRunner().withGradleVersion(gradle.ver).withArguments(GAUGE_TASK, "--info").build();
         assertEquals(SUCCESS, resultWithExtension.task(GAUGE_TASK_PATH).getOutcome());
         // And I should see environment and parallel flags with specs in the command
-        assertThat(resultWithExtension.getOutput(), containsString("--simple-console --parallel --n 2 --env dev specs"));
+        assertThat(resultWithExtension.getOutput(), containsString("--simple-console --verbose --parallel --n 2 --env dev specs"));
         // When additionalFlags include the --repeat flag
         BuildResult resultWithProperty = defaultGradleRunner().withGradleVersion(gradle.ver)
-                .withArguments(GAUGE_TASK, "-PadditionalFlags=--repeat --simple-console", "--info").build();
+                .withArguments(GAUGE_TASK, "-PadditionalFlags=--repeat --simple-console --verbose", "--info").build();
         assertEquals(SUCCESS, resultWithProperty.task(GAUGE_TASK_PATH).getOutcome());
         // Then I should not see environment and parallel flags and specs include the command
         assertThat(resultWithProperty.getOutput(), not(containsString("--parallel --n 2 --env dev specs")));
         // And I should only see repeat and simple-console included
-        assertThat(resultWithProperty.getOutput(), containsString("--repeat --simple-console"));
+        assertThat(resultWithProperty.getOutput(), containsString("--repeat --simple-console --verbose"));
         // And I should see tests ran against the dev environment
         assertThat(resultWithProperty.getOutput(), containsString(getExpectedReportPath("dev")));
     }

plugin/src/main/java/org/gauge/gradle/GaugeCommand.java

@@ -4,11 +4,7 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Represents a Gauge command and provides methods to construct command-line arguments for Gauge execution.
@@ -37,16 +33,13 @@ public GaugeCommand(final GaugeExtension extension, final Project project) {
      * @return the path to the Gauge executable
      */
     public String getExecutable() {
-        final String binary = "gauge";
         return project.hasProperty(GaugeProperty.GAUGE_ROOT.getKey())
-                ? getExecutablePath(properties.get(GaugeProperty.GAUGE_ROOT.getKey()).toString()).toString()
-                : extension.getGaugeRoot().isPresent()
-                    ? getExecutablePath(extension.getGaugeRoot().get()).toString()
-                    : binary;
+                ? getExecutablePath(properties.get(GaugeProperty.GAUGE_ROOT.getKey()).toString())
+                : extension.getGaugeRoot().map(this::getExecutablePath).getOrElse("gauge");
     }
 
-    private Path getExecutablePath(final String gaugeRoot) {
-        return Paths.get(gaugeRoot, "bin", "gauge");
+    private String getExecutablePath(final String gaugeRoot) {
+        return Paths.get(gaugeRoot, "bin", "gauge").toString();
     }
 
     /**
@@ -105,33 +98,33 @@ public List<Object> getFlags() {
             flags.add(GaugeProperty.IN_PARALLEL.getFlag());
             final int nodes = getNodes();
             if (nodes != 0) {
-                flags.addAll(List.of(GaugeProperty.NODES.getFlag(), nodes));
+                flags.add(GaugeProperty.NODES.getFlag());
+                flags.add(nodes);
             }
         }
         return flags;
     }
 
     private List<String> getAdditionalFlags() {
-        return project.hasProperty(GaugeProperty.ADDITIONAL_FLAGS.getKey())
-                ? getListFromString(properties.get(GaugeProperty.ADDITIONAL_FLAGS.getKey()).toString())
-                : extension.getAdditionalFlags().isPresent()
-                ? getListFromString(extension.getAdditionalFlags().get())
-                : Collections.emptyList();
+        return getListFromString(project.hasProperty(GaugeProperty.ADDITIONAL_FLAGS.getKey())
+                ? properties.get(GaugeProperty.ADDITIONAL_FLAGS.getKey()).toString()
+                : extension.getAdditionalFlags().getOrElse("")
+        );
     }
 
     private List<String> getListFromString(final String value) {
-        return Arrays.stream(value.split("\\s+")).map(String::trim).toList();
+        return Arrays.stream(value.split("\\s+")).map(String::trim).filter(s -> !s.isEmpty()).toList();
     }
 
     private int getNodes() {
         return project.hasProperty(GaugeProperty.NODES.getKey())
                 ? Integer.parseInt(properties.get(GaugeProperty.NODES.getKey()).toString())
-                : extension.getNodes().isPresent() ? extension.getNodes().get() : 0;
+                : extension.getNodes().getOrElse(0);
     }
 
     private boolean isInParallel() {
         return project.hasProperty(GaugeProperty.IN_PARALLEL.getKey())
-                ? Boolean.parseBoolean(project.getProperties().get(GaugeProperty.IN_PARALLEL.getKey()).toString())
+                ? Boolean.parseBoolean(properties.get(GaugeProperty.IN_PARALLEL.getKey()).toString())
                 : extension.getInParallel().get();
     }
 
@@ -154,7 +147,7 @@ public List<String> getSpecsDir() {
     public List<String> getTags() {
         final String tags = project.hasProperty(GaugeProperty.TAGS.getKey())
                 ? properties.get(GaugeProperty.TAGS.getKey()).toString()
-                : extension.getTags().isPresent() ? extension.getTags().get() : "";
+                : extension.getTags().getOrElse("");
         return !tags.isEmpty() ? List.of(GaugeProperty.TAGS.getFlag(), tags) : Collections.emptyList();
     }