Polishing func test assertion methods

Author: breskeby

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy

@@ -20,7 +20,6 @@
 package org.elasticsearch.gradle
 
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
-import org.elasticsearch.gradle.transform.SymbolicLinkPreservingUntarTransform
 import org.gradle.testkit.runner.TaskOutcome
 import spock.lang.Unroll
 
@@ -74,7 +73,7 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
 
         then:
         result.task(":setupDistro").outcome == TaskOutcome.SUCCESS
-        assertOutputContainsNot(result.output, "Unpacking elasticsearch-${version}-linux-x86_64.tar.gz " +
+        assertOutputMissing(result.output, "Unpacking elasticsearch-${version}-linux-x86_64.tar.gz " +
                 "using SymbolicLinkPreservingUntarTransform")
     }
 

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

@@ -63,7 +63,7 @@ abstract class AbstractGradleFuncTest extends Specification {
         true
     }
 
-    def assertOutputContainsNot(String givenOutput, String expected) {
+    def assertOutputMissing(String givenOutput, String expected) {
         assert normalized(givenOutput).contains(normalized(expected)) == false
         true
     }

buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/TestingConventionsTasksIT.java

@@ -62,7 +62,7 @@ public void testNamingConvention() {
             "  * org.elasticsearch.gradle.testkit.LooksLikeATestWithoutNamingConvention2",
             "  * org.elasticsearch.gradle.testkit.LooksLikeATestWithoutNamingConvention3"
         );
-        assertOutputDoesNotContain(result.getOutput(), "LooksLikeTestsButAbstract");
+        assertOutputMissing(result.getOutput(), "LooksLikeTestsButAbstract");
     }
 
     public void testNoEmptyTasks() {

buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTaskIT.java

@@ -74,7 +74,7 @@ public void testViolationFoundAndCompileOnlyIgnored() {
 
         assertTaskFailed(result, ":absurd");
         assertOutputContains(result.getOutput(), "Classes with violations:", "  * TestingIO", "> Audit of third party dependencies failed");
-        assertOutputDoesNotContain(result.getOutput(), "Missing classes:");
+        assertOutputMissing(result.getOutput(), "Missing classes:");
         assertNoDeprecationWarning(result);
     }
 
@@ -96,7 +96,7 @@ public void testClassNotFoundAndCompileOnlyIgnored() {
             "  * org.apache.logging.log4j.LogManager",
             "> Audit of third party dependencies failed"
         );
-        assertOutputDoesNotContain(result.getOutput(), "Classes with violations:");
+        assertOutputMissing(result.getOutput(), "Classes with violations:");
         assertNoDeprecationWarning(result);
     }
 
@@ -118,7 +118,7 @@ public void testJarHellWithJDK() {
             "   Jar Hell with the JDK:",
             "    * java.lang.String"
         );
-        assertOutputDoesNotContain(result.getOutput(), "Classes with violations:");
+        assertOutputMissing(result.getOutput(), "Classes with violations:");
         assertNoDeprecationWarning(result);
     }
 

buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleIntegrationTestCase.java

@@ -99,13 +99,13 @@ protected void assertOutputContains(String output, String line) {
         assertThat("Expected the following line in output:\n\n" + line + "\n\nOutput is:\n" + output, output, containsString(line));
     }
 
-    protected void assertOutputDoesNotContain(String output, String line) {
+    protected void assertOutputMissing(String output, String line) {
         assertFalse("Expected the following line not to be in output:\n\n" + line + "\n\nOutput is:\n" + output, output.contains(line));
     }
 
-    protected void assertOutputDoesNotContain(String output, String... lines) {
+    protected void assertOutputMissing(String output, String... lines) {
         for (String line : lines) {
-            assertOutputDoesNotContain(line);
+            assertOutputMissing(line);
         }
     }
 
@@ -167,7 +167,7 @@ protected void assertTaskUpToDate(BuildResult result, String... taskNames) {
     }
 
     protected void assertNoDeprecationWarning(BuildResult result) {
-        assertOutputDoesNotContain(result.getOutput(), "Deprecated Gradle features were used in this build");
+        assertOutputMissing(result.getOutput(), "Deprecated Gradle features were used in this build");
     }
 
     protected void assertBuildFileExists(BuildResult result, String projectName, String path) {