Pull process argument configuration to abstract class

gradle-plugins · Oct 10, 2019 · 19e93a5 · 19e93a5
1 parent 49a3b9f
commit 19e93a5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/...rc/main/groovy/dev/gradleplugins/integtests/fixtures/executer/AbstractGradleExecuter.java b/...rc/main/groovy/dev/gradleplugins/integtests/fixtures/executer/AbstractGradleExecuter.java
@@ -5,6 +5,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public abstract class AbstractGradleExecuter implements GradleExecuter {
@@ -80,7 +81,31 @@ private boolean hasSettingsFile(TestFile directory) {
     }
     //endregion
 
+    //region Process arguments
+    private final List<String> arguments = new ArrayList<>();
+
+    @Override
+    public GradleExecuter withArguments(String... args) {
+        return withArguments(Arrays.asList(args));
+    }
+
+    @Override
+    public GradleExecuter withArguments(List<String> args) {
+        arguments.clear();
+        arguments.addAll(args);
+        return this;
+    }
+
+    @Override
+    public GradleExecuter withArgument(String arg) {
+        arguments.add(arg);
+        return this;
+    }
+    //endregion
+
     protected void reset() {
+        arguments.clear();
+
         workingDirectory = null;
         userHomeDirectory = null;
         settingsFile = null;
@@ -110,6 +135,8 @@ protected List<String> getAllArguments() {
             ensureSettingsFileAvailable();
         }
 
+        allArguments.addAll(arguments);
+
         return allArguments;
     }
 }
diff --git a/.../src/main/groovy/dev/gradleplugins/integtests/fixtures/executer/GradleRunnerExecuter.java b/.../src/main/groovy/dev/gradleplugins/integtests/fixtures/executer/GradleRunnerExecuter.java
@@ -32,7 +32,6 @@
 
 public class GradleRunnerExecuter extends AbstractGradleExecuter {
     private final List<String> tasks = new ArrayList<>();
-    private final List<String> arguments = new ArrayList<>();
     private final List<Consumer<? super GradleExecuter>> beforeExecute = new ArrayList<>();
     private final List<Consumer<? super GradleExecuter>> afterExecute = new ArrayList<>();
     private boolean debuggerAttached = false;
@@ -69,24 +68,6 @@ public GradleExecuter withTasks(List<String> tasks) {
         return this;
     }
 
-    @Override
-    public GradleExecuter withArguments(String... args) {
-        return withArguments(Arrays.asList(args));
-    }
-
-    @Override
-    public GradleExecuter withArguments(List<String> args) {
-        arguments.clear();
-        arguments.addAll(args);
-        return this;
-    }
-
-    @Override
-    public GradleExecuter withArgument(String arg) {
-        arguments.add(arg);
-        return this;
-    }
-
     @Override
     public GradleExecuter withBuildCacheEnabled() {
         return withArgument("--build-cache");
@@ -136,7 +117,6 @@ private void finished() {
     protected void reset() {
         super.reset();
         tasks.clear();
-        arguments.clear();
         debuggerAttached = false;
         gradleVersion = null;
         projectDirectory = null;
@@ -172,7 +152,6 @@ private GradleRunner configureExecuter() {
             allArguments.add(projectDirectory.getAbsolutePath());
         }
 
-        allArguments.addAll(arguments);
         allArguments.addAll(tasks);
 
         runner.withArguments(allArguments);