Improve deprecation checks for smoke tests

build-logic/profiling/src/main/kotlin/gradlebuild.buildscan.gradle.kts

@@ -243,7 +243,7 @@ fun Project.extractAllReportsFromCI() {
 
     gradle.taskGraph.afterTask {
         if (state.failure != null && this is Reporting<*>) {
-            this.reports.filter { it.name in capturedReportingTypes && it.isEnabled && it.destination.exists() }
+            this.reports.filter { it.name in capturedReportingTypes && it.required.get() && it.destination.exists() }
                 .forEach { report ->
                     val linkName = "${this::class.java.simpleName.split("_")[0]} Report ($path)" // Strip off '_Decorated' addition to class names
                     // see: ciReporting.gradle

subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractAndroidSantaTrackerSmokeTest.groovy

@@ -22,13 +22,11 @@ import org.gradle.internal.scan.config.fixtures.ApplyGradleEnterprisePluginFixtu
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.testkit.runner.BuildResult
-import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
-import org.gradle.testkit.runner.internal.DefaultGradleRunner
 import org.gradle.testkit.runner.internal.ToolingApiGradleExecutor
+import org.gradle.util.GradleVersion
 import org.junit.Rule
 
-
 class AbstractAndroidSantaTrackerSmokeTest extends AbstractSmokeTest {
 
     protected static final Iterable<String> TESTED_AGP_VERSIONS = TestedVersions.androidGradle.versions
@@ -55,15 +53,30 @@ class AbstractAndroidSantaTrackerSmokeTest extends AbstractSmokeTest {
         return runnerForLocation(projectDir, agpVersion, "assembleDebug").build()
     }
 
+    protected BuildResult buildLocationMaybeExpectingWorkerExecutorDeprecation(File location, String agpVersion) {
+        return runnerForLocationMaybeExpectingWorkerExecutorDeprecation(location, agpVersion, "assembleDebug")
+            .build()
+    }
+
+    protected SmokeTestGradleRunner runnerForLocationMaybeExpectingWorkerExecutorDeprecation(File location, String agpVersion, String... tasks) {
+        return runnerForLocation(location, agpVersion, tasks)
+            .expectLegacyDeprecationWarningIf(agpVersion.startsWith("4.1"),
+                "The WorkerExecutor.submit() method has been deprecated. " +
+                    "This is scheduled to be removed in Gradle 8.0. " +
+                    "Please use the noIsolation(), classLoaderIsolation() or processIsolation() method instead. " +
+                    "See https://docs.gradle.org/${GradleVersion.current().version}/userguide/upgrading_version_5.html#method_workerexecutor_submit_is_deprecated for more details."
+            )
+    }
+
     protected BuildResult cleanLocation(File projectDir, String agpVersion) {
         return runnerForLocation(projectDir, agpVersion, "clean").build()
     }
 
-    protected GradleRunner runnerForLocation(File projectDir, String agpVersion, String... tasks) {
+    protected SmokeTestGradleRunner runnerForLocation(File projectDir, String agpVersion, String... tasks) {
         def runner = runner(*[["-DagpVersion=$agpVersion", "-DkotlinVersion=${TestedVersions.kotlin.latest()}", "--stacktrace"], tasks].flatten())
             .withProjectDir(projectDir)
             .withTestKitDir(homeDir)
-            .forwardOutput() as DefaultGradleRunner
+            .forwardOutput()
         if (JavaVersion.current().isJava9Compatible()) {
             runner.withJvmArguments(
                 "-Xmx8g", "-XX:MaxMetaspaceSize=1024m", "-XX:+HeapDumpOnOutOfMemoryError",

subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractGradleceptionSmokeTest.groovy

@@ -24,7 +24,6 @@ import org.gradle.integtests.fixtures.executer.IntegrationTestBuildContext
 import org.gradle.internal.jvm.inspection.JvmInstallationMetadata
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.testkit.runner.BuildResult
-import org.gradle.testkit.runner.GradleRunner
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 
@@ -66,14 +65,16 @@ abstract class AbstractGradleceptionSmokeTest extends AbstractSmokeTest {
         result = runnerFor(tasks, testKitDir).buildAndFail()
     }
 
-    private GradleRunner runnerFor(List<String> tasks, File testKitDir) {
+    private SmokeTestGradleRunner runnerFor(List<String> tasks, File testKitDir) {
         List<String> gradleArgs = tasks + GRADLE_BUILD_TEST_ARGS
-        return testKitDir != null
+        def runner = testKitDir != null
             ? runnerWithTestKitDir(testKitDir, gradleArgs)
             : runner(*gradleArgs)
+        runner.ignoreDeprecationWarnings()
+        return runner
     }
 
-    private GradleRunner runnerWithTestKitDir(File testKitDir, List<String> gradleArgs) {
+    private SmokeTestGradleRunner runnerWithTestKitDir(File testKitDir, List<String> gradleArgs) {
         runner(*(gradleArgs + ["-g", IntegrationTestBuildContext.INSTANCE.gradleUserHomeDir.absolutePath]))
             .withTestKitDir(testKitDir)
     }

subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy

@@ -32,7 +32,6 @@ import org.gradle.internal.featurelifecycle.LoggingDeprecatedFeatureHandler
 import org.gradle.internal.operations.trace.BuildOperationTrace
 import org.gradle.test.fixtures.dsl.GradleDsl
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.internal.DefaultGradleRunner
 import org.junit.Rule
@@ -231,8 +230,8 @@ abstract class AbstractSmokeTest extends Specification {
         file
     }
 
-    GradleRunner runner(String... tasks) {
-        GradleRunner gradleRunner = GradleRunner.create()
+    SmokeTestGradleRunner runner(String... tasks) {
+        def gradleRunner = GradleRunner.create()
             .withGradleInstallation(IntegrationTestBuildContext.INSTANCE.gradleHomeDir)
             .withTestKitDir(IntegrationTestBuildContext.INSTANCE.gradleUserHomeDir)
             .withProjectDir(testProjectDir.root)
@@ -241,6 +240,7 @@ abstract class AbstractSmokeTest extends Specification {
                 tasks.toList() + outputParameters() + repoMirrorParameters() + configurationCacheParameters()
             ) as DefaultGradleRunner
         gradleRunner.withJvmArguments(["-Xmx8g", "-XX:MaxMetaspaceSize=1024m", "-XX:+HeapDumpOnOutOfMemoryError"])
+        return new SmokeTestGradleRunner(gradleRunner)
     }
 
     private List<String> configurationCacheParameters() {
@@ -309,7 +309,7 @@ abstract class AbstractSmokeTest extends Specification {
         FileUtils.copyDirectory(smokeTestDirectory, testProjectDir.root)
     }
 
-    protected GradleRunner useAgpVersion(String agpVersion, GradleRunner runner) {
+    protected SmokeTestGradleRunner useAgpVersion(String agpVersion, SmokeTestGradleRunner runner) {
         def extraArgs = [AGP_VERSIONS.OVERRIDE_VERSION_CHECK]
         if (AGP_VERSIONS.isAgpNightly(agpVersion)) {
             def init = AGP_VERSIONS.createAgpNightlyRepositoryInitScript()
@@ -342,37 +342,7 @@ abstract class AbstractSmokeTest extends Specification {
         RepoScriptBlockUtil.googleRepository(dsl)
     }
 
-    protected static void expectNoDeprecationWarnings(BuildResult result) {
-        verifyDeprecationWarnings(result, [])
-    }
-
-    protected static void expectDeprecationWarnings(BuildResult result, String... warnings) {
-        if (warnings.length == 0) {
-            throw new IllegalArgumentException("Use expectNoDeprecationWarnings() when no deprecation warnings are to be expected")
-        }
-        verifyDeprecationWarnings(result, warnings as List)
-    }
-
-    private static void verifyDeprecationWarnings(BuildResult result, List<String> remainingWarnings) {
-        def lines = result.output.readLines()
-        int foundDeprecations = 0
-        lines.eachWithIndex { String line, int lineIndex ->
-            if (remainingWarnings.remove(line)) {
-                foundDeprecations++
-                return
-            }
-            assert !containsDeprecationWarning(line), "Found an unexpected deprecation warning on line ${lineIndex + 1}: $line"
-        }
-        assert remainingWarnings.empty, "Expected ${remainingWarnings.size()} deprecation warnings, found ${foundDeprecations} deprecation warnings:\n${remainingWarnings.collect { " - $it" }.join("\n")}"
-    }
-
-    private static boolean containsDeprecationWarning(String line) {
-        line.contains("has been deprecated and is scheduled to be removed in Gradle") ||
-            line.contains("has been deprecated. This is scheduled to be removed in Gradle")
-    }
-
     void copyRemoteProject(String remoteProject, File targetDir) {
         new TestFile(new File("build/$remoteProject")).copyTo(targetDir)
     }
-
 }

subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AndroidPluginsSmokeTest.groovy

@@ -19,12 +19,11 @@ package org.gradle.smoketests
 import org.gradle.integtests.fixtures.UnsupportedWithConfigurationCache
 import org.gradle.integtests.fixtures.android.AndroidHome
 import org.gradle.internal.reflect.validation.ValidationMessageChecker
+import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.TaskOutcome
 import org.gradle.util.GradleVersion
-import org.gradle.util.internal.VersionNumber
 
 import static org.gradle.internal.reflect.validation.Severity.ERROR
-
 /**
  * For these tests to run you need to set ANDROID_SDK_ROOT to your Android SDK directory
  *
@@ -84,45 +83,15 @@ class AndroidPluginsSmokeTest extends AbstractPluginValidatingSmokeTest implemen
         ))
 
         when: 'first build'
-        def result = runner.build()
+        def result = buildMaybeExpectingWorkerExecutorDeprecation(runner, agpVersion)
 
         then:
         result.task(':app:compileDebugJavaWithJavac').outcome == TaskOutcome.SUCCESS
         result.task(':library:assembleDebug').outcome == TaskOutcome.SUCCESS
         result.task(':app:assembleDebug').outcome == TaskOutcome.SUCCESS
 
         and:
-        def agpBaseVersion = baseVersionNumberOf(agpVersion)
-        def threeDotSixBaseVersion = baseVersionNumberOf("3.6.0")
-        if (agpBaseVersion < threeDotSixBaseVersion) {
-            assert result.output.contains(JAVA_COMPILE_DEPRECATION_MESSAGE)
-        } else {
-            assert !result.output.contains(JAVA_COMPILE_DEPRECATION_MESSAGE)
-            if (agpBaseVersion == baseVersionNumberOf("3.6.4")) {
-                expectDeprecationWarnings(
-                        result,
-                        "Internal API constructor DefaultDomainObjectSet(Class<T>) has been deprecated. " +
-                                "This is scheduled to be removed in Gradle 8.0. Please use ObjectFactory.domainObjectSet(Class<T>) instead. " +
-                                "See https://docs.gradle.org/${GradleVersion.current().version}/userguide/custom_gradle_types.html#domainobjectset for more details.",
-                        "The WorkerExecutor.submit() method has been deprecated. " +
-                                "This is scheduled to be removed in Gradle 8.0. Please use the noIsolation(), classLoaderIsolation() or processIsolation() method instead. " +
-                                "See https://docs.gradle.org/${GradleVersion.current().version}/userguide/upgrading_version_5.html#method_workerexecutor_submit_is_deprecated for more details."
-                )
-            } else if (agpVersion.startsWith('4.0.2')) {
-                expectDeprecationWarnings(
-                        result,
-                        "The WorkerExecutor.submit() method has been deprecated. " +
-                                "This is scheduled to be removed in Gradle 8.0. Please use the noIsolation(), classLoaderIsolation() or processIsolation() method instead. " +
-                                "See https://docs.gradle.org/${GradleVersion.current().version}/userguide/upgrading_version_5.html#method_workerexecutor_submit_is_deprecated for more details."
-                )
-            } else if (agpVersion.startsWith('4.1')) {
-                expectDeprecationWarnings(result, "The WorkerExecutor.submit() method has been deprecated. " +
-                    "This is scheduled to be removed in Gradle 8.0. Please use the noIsolation(), classLoaderIsolation() or processIsolation() method instead. " +
-                    "See https://docs.gradle.org/${GradleVersion.current().version}/userguide/upgrading_version_5.html#method_workerexecutor_submit_is_deprecated for more details.")
-            } else {
-                expectNoDeprecationWarnings(result)
-            }
-        }
+        assert !result.output.contains(JAVA_COMPILE_DEPRECATION_MESSAGE)
 
         and:
         assertConfigurationCacheStateStored()
@@ -133,18 +102,15 @@ class AndroidPluginsSmokeTest extends AbstractPluginValidatingSmokeTest implemen
         then:
         result.task(':app:compileDebugJavaWithJavac').outcome == TaskOutcome.UP_TO_DATE
         result.task(':library:assembleDebug').outcome == TaskOutcome.UP_TO_DATE
-        // In AGP 3.4 and 3.5 some of the dependencies of `:app:assembleDebug` are invalid and are thus forced to re-execute every time
-        result.task(':app:assembleDebug').outcome == (VersionNumber.parse(agpVersion) < VersionNumber.parse("3.6.0")
-            ? TaskOutcome.SUCCESS
-            : TaskOutcome.UP_TO_DATE)
+        result.task(':app:assembleDebug').outcome == TaskOutcome.UP_TO_DATE
         result.task(':app:processDebugAndroidTestManifest').outcome == TaskOutcome.UP_TO_DATE
 
         and:
         assertConfigurationCacheStateLoaded()
 
         when: 'abi change on library'
         abiChange.run()
-        result = runner.build()
+        result = buildMaybeExpectingWorkerExecutorDeprecation(runner, agpVersion)
 
         then: 'dependent sources are recompiled'
         result.task(':library:compileDebugJavaWithJavac').outcome == TaskOutcome.SUCCESS
@@ -157,7 +123,7 @@ class AndroidPluginsSmokeTest extends AbstractPluginValidatingSmokeTest implemen
 
         when: 'clean re-build'
         useAgpVersion(agpVersion, this.runner('clean')).build()
-        result = runner.build()
+        result = buildMaybeExpectingWorkerExecutorDeprecation(runner, agpVersion)
 
         then:
         result.task(':app:compileDebugJavaWithJavac').outcome == TaskOutcome.SUCCESS
@@ -174,8 +140,13 @@ class AndroidPluginsSmokeTest extends AbstractPluginValidatingSmokeTest implemen
         ].combinations()
     }
 
-    private VersionNumber baseVersionNumberOf(String versionString) {
-        VersionNumber.parse(versionString).baseVersion
+    private static BuildResult buildMaybeExpectingWorkerExecutorDeprecation(SmokeTestGradleRunner runner, String agpVersion) {
+        return runner
+            .expectLegacyDeprecationWarningIf(agpVersion.startsWith('4.1'),
+                "The WorkerExecutor.submit() method has been deprecated. " +
+                    "This is scheduled to be removed in Gradle 8.0. Please use the noIsolation(), classLoaderIsolation() or processIsolation() method instead. " +
+                    "See https://docs.gradle.org/${GradleVersion.current().version}/userguide/upgrading_version_5.html#method_workerexecutor_submit_is_deprecated for more details.")
+            .build()
     }
 
     /**

subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AndroidSantaTrackerCachingSmokeTest.groovy

@@ -43,7 +43,7 @@ class AndroidSantaTrackerCachingSmokeTest extends AbstractAndroidSantaTrackerSmo
         setupCopyOfSantaTracker(relocatedDir)
 
         when: 'clean build'
-        buildLocation(originalDir, agpVersion)
+        buildLocationMaybeExpectingWorkerExecutorDeprecation(originalDir, agpVersion)
 
         then:
         assertConfigurationCacheStateStored()
@@ -55,7 +55,7 @@ class AndroidSantaTrackerCachingSmokeTest extends AbstractAndroidSantaTrackerSmo
         assertConfigurationCacheStateLoaded()
 
         when: 'clean cached build'
-        BuildResult relocatedResult = buildLocation(relocatedDir, agpVersion)
+        BuildResult relocatedResult = buildLocationMaybeExpectingWorkerExecutorDeprecation(relocatedDir, agpVersion)
 
         then:
         assertConfigurationCacheStateStored()
@@ -70,7 +70,7 @@ class AndroidSantaTrackerCachingSmokeTest extends AbstractAndroidSantaTrackerSmo
 
         when: 'clean cached build, reusing configuration cache when enabled'
         cleanLocation(relocatedDir, agpVersion)
-        buildLocation(relocatedDir, agpVersion)
+        buildLocationMaybeExpectingWorkerExecutorDeprecation(relocatedDir, agpVersion)
 
         then:
         assertConfigurationCacheStateLoaded()