Fix and simplify NormalizeOutputGradleRunner

elastic · Aug 15, 2022 · 7e7d0c9 · 7e7d0c9
1 parent 824eac7
commit 7e7d0c9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/...s/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/...s/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy
@@ -79,17 +79,16 @@ abstract class AbstractGradleFuncTest extends Specification {
 
     GradleRunner gradleRunner(File projectDir, Object... arguments) {
         return new NormalizeOutputGradleRunner(
-                new ConfigurationCacheCompatibleAwareGradleRunner(
-                        new InternalAwareGradleRunner(
-                                GradleRunner.create()
-                                        .withDebug(ManagementFactory.getRuntimeMXBean().getInputArguments()
-                                                .toString().indexOf("-agentlib:jdwp") > 0
-                                        )
-                                        .withProjectDir(projectDir)
-                                        .withPluginClasspath()
-                                        .forwardOutput()
-                        ), configurationCacheCompatible),
-                projectDir
+            new ConfigurationCacheCompatibleAwareGradleRunner(
+                    new InternalAwareGradleRunner(
+                            GradleRunner.create()
+                                    .withDebug(ManagementFactory.getRuntimeMXBean().getInputArguments()
+                                            .toString().indexOf("-agentlib:jdwp") > 0
+                                    )
+                                    .withProjectDir(projectDir)
+                                    .withPluginClasspath()
+                                    .forwardOutput()
+                    ), configurationCacheCompatible),
         ).withArguments(arguments.collect { it.toString() })
     }
 

diff --git a/...testFixtures/java/org/elasticsearch/gradle/internal/test/NormalizeOutputGradleRunner.java b/...testFixtures/java/org/elasticsearch/gradle/internal/test/NormalizeOutputGradleRunner.java
@@ -27,9 +27,10 @@
 
 public class NormalizeOutputGradleRunner extends GradleRunner {
 
-    public NormalizeOutputGradleRunner(GradleRunner delegate, File projectRootDir) {
+    private GradleRunner delegate;
+
+    public NormalizeOutputGradleRunner(GradleRunner delegate) {
         this.delegate = delegate;
-        this.projectRootDir = projectRootDir;
     }
 
     @Override
@@ -74,7 +75,8 @@ public List<String> getArguments() {
 
     @Override
     public GradleRunner withArguments(List<String> arguments) {
-        return delegate.withArguments(arguments);
+        delegate.withArguments(arguments);
+        return this;
     }
 
     @Override
@@ -150,9 +152,6 @@ public BuildResult buildAndFail() throws InvalidRunnerConfigurationException, Un
         return new NormalizedBuildResult(delegate.buildAndFail());
     }
 
-    private GradleRunner delegate;
-    private File projectRootDir;
-
     private class NormalizedBuildResult implements BuildResult {
         private BuildResult delegate;
         private String normalizedString;
@@ -164,7 +163,7 @@ private class NormalizedBuildResult implements BuildResult {
         @Override
         public String getOutput() {
             if (normalizedString == null) {
-                normalizedString = normalizeString(delegate.getOutput(), projectRootDir);
+                normalizedString = normalizeString(delegate.getOutput(), getProjectDir());
             }
             return normalizedString;
         }