From a78f1f04b727cdad5a76bad4afeb5b890e2213c0 Mon Sep 17 00:00:00 2001
From: Patrick Doyle <810052+prdoyle@users.noreply.github.com>
Date: Tue, 27 May 2025 13:50:26 -0400
Subject: [PATCH] Refactor TestBuildInfoPluginFuncTest for clarity (#128469)

* Refactor TestBuildInfoPluginFuncTest for clarity

* Further simplify TestBuildInfoPluginFuncTest
---
 .../test/TestBuildInfoPluginFuncTest.groovy   | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/TestBuildInfoPluginFuncTest.groovy b/build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/TestBuildInfoPluginFuncTest.groovy
index a652deb726d1..266c1ab1b107 100644
--- a/build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/TestBuildInfoPluginFuncTest.groovy
+++ b/build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/TestBuildInfoPluginFuncTest.groovy
@@ -39,17 +39,6 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
         }
         """
 
-        when:
-        def result = gradleRunner('generateTestBuildInfo').build()
-        def task = result.task(":generateTestBuildInfo")
-
-
-        then:
-        task.outcome == TaskOutcome.SUCCESS
-
-        def output = file("build/generated-build-info/plugin-test-build-info.json")
-        output.exists() == true
-
         def location = Map.of(
             "module", "com.example",
             "representative_class", "com/example/Example.class"
@@ -58,6 +47,15 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
             "component", "example-component",
             "locations", List.of(location)
         )
+
+        def output = file("build/generated-build-info/plugin-test-build-info.json")
+
+        when:
+        def result = gradleRunner('generateTestBuildInfo').build()
+
+        then:
+        result.task(":generateTestBuildInfo").outcome == TaskOutcome.SUCCESS
+        output.exists() == true
         new ObjectMapper().readValue(output, Map.class) == expectedOutput
     }
 
@@ -87,16 +85,7 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
         }
         """
 
-        when:
-        def result = gradleRunner('generateTestBuildInfo').build()
-        def task = result.task(":generateTestBuildInfo")
-
-
-        then:
-        task.outcome == TaskOutcome.SUCCESS
-
         def output = file("build/generated-build-info/plugin-test-build-info.json")
-        output.exists() == true
 
         def locationFromModuleInfo = Map.of(
             "module", "org.objectweb.asm",
@@ -115,7 +104,12 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest {
             "locations", List.of(locationFromModuleInfo, locationFromManifest, locationFromJarFileName)
         )
 
-        def value = new ObjectMapper().readValue(output, Map.class)
-        value == expectedOutput
+        when:
+        def result = gradleRunner('generateTestBuildInfo').build()
+
+        then:
+        result.task(":generateTestBuildInfo").outcome == TaskOutcome.SUCCESS
+        output.exists() == true
+        new ObjectMapper().readValue(output, Map.class) == expectedOutput
     }
 }