Simplify task outcome checks

Author: Goooler

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

@@ -1,5 +1,8 @@
 package com.github.jengelman.gradle.plugins.shadow
 
+import assertk.Assert
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
 import com.github.jengelman.gradle.plugins.shadow.ShadowApplicationPlugin.Companion.SHADOW_RUN_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin.Companion.SHADOW_JAR_TASK_NAME
 import com.github.jengelman.gradle.plugins.shadow.tasks.JavaJarExec
@@ -24,6 +27,7 @@ import kotlin.io.path.toPath
 import kotlin.io.path.writeText
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
@@ -363,6 +367,10 @@ abstract class BasePluginTest {
       }
     }
 
+    fun Assert<BuildResult>.taskOutcomeEquals(taskPath: String, expectedOutcome: TaskOutcome) {
+      return transform { it.task(taskPath)?.outcome }.isNotNull().isEqualTo(expectedOutcome)
+    }
+
     private fun containsDeprecationWarning(output: String): Boolean {
       return output.contains("has been deprecated and is scheduled to be removed in Gradle") ||
         output.contains("has been deprecated. This is scheduled to be removed in Gradle")

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt

@@ -1,15 +1,13 @@
 package com.github.jengelman.gradle.plugins.shadow
 
 import assertk.assertThat
-import assertk.assertions.isEqualTo
-import assertk.assertions.isNotNull
 import com.github.jengelman.gradle.plugins.shadow.util.containsEntries
 import com.github.jengelman.gradle.plugins.shadow.util.doesNotContainEntries
 import com.github.jengelman.gradle.plugins.shadow.util.useAll
 import kotlin.io.path.appendText
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
-import org.gradle.testkit.runner.TaskOutcome
+import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -111,8 +109,7 @@ class FilteringTest : BasePluginTest() {
     projectScriptPath.writeText(replaced)
     val result = run(shadowJarTask)
 
-    assertThat(result.task(shadowJarTask)).isNotNull()
-      .transform { it.outcome }.isEqualTo(TaskOutcome.SUCCESS)
+    assertThat(result).taskOutcomeEquals(shadowJarTask, SUCCESS)
     assertThat(outputShadowJar).useAll {
       containsEntries(
         "a.properties",
@@ -140,8 +137,7 @@ class FilteringTest : BasePluginTest() {
 
     val result = run(shadowJarTask)
 
-    assertThat(result.task(shadowJarTask)).isNotNull()
-      .transform { it.outcome }.isEqualTo(TaskOutcome.SUCCESS)
+    assertThat(result).taskOutcomeEquals(shadowJarTask, SUCCESS)
     assertThat(outputShadowJar).useAll {
       containsEntries(
         "a2.properties",

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPluginTest.kt

@@ -19,7 +19,8 @@ import kotlin.io.path.readText
 import kotlin.io.path.writeText
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.testfixtures.ProjectBuilder
-import org.gradle.testkit.runner.TaskOutcome
+import org.gradle.testkit.runner.TaskOutcome.SUCCESS
+import org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.condition.EnabledForJreRange
@@ -793,8 +794,7 @@ class ShadowPluginTest : BasePluginTest() {
 
     val result = run(testShadowJarTask)
 
-    assertThat(result.task(":$testShadowJarTask")).isNotNull()
-      .transform { it.outcome }.isEqualTo(TaskOutcome.SUCCESS)
+    assertThat(result).taskOutcomeEquals(":$testShadowJarTask", SUCCESS)
     val junitEntry = jarPath("build/libs/shadow-1.0-tests.jar").use { it.getEntry("junit") }
     assertThat(junitEntry).isNotNull()
   }
@@ -830,8 +830,7 @@ class ShadowPluginTest : BasePluginTest() {
     run(libShadowJarTask)
     val result = run(libShadowJarTask)
 
-    assertThat(result.task(libShadowJarTask)).isNotNull()
-      .transform { it.outcome }.isEqualTo(TaskOutcome.UP_TO_DATE)
+    assertThat(result).taskOutcomeEquals(libShadowJarTask, UP_TO_DATE)
     assertThat(result.output).contains("Reusing configuration cache.")
   }
 

src/funcTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/BaseCachingTest.kt

@@ -1,8 +1,6 @@
 package com.github.jengelman.gradle.plugins.shadow.caching
 
 import assertk.assertThat
-import assertk.assertions.isEqualTo
-import assertk.assertions.isNotNull
 import com.github.jengelman.gradle.plugins.shadow.BasePluginTest
 import java.nio.file.Path
 import kotlin.io.path.ExperimentalPathApi
@@ -77,7 +75,6 @@ sealed class BaseCachingTest : BasePluginTest() {
     runnerBlock: (GradleRunner) -> GradleRunner = { it },
   ) {
     val result = run("--build-cache", shadowJarTask, runnerBlock = runnerBlock)
-    assertThat(result.task(shadowJarTask)).isNotNull()
-      .transform { it.outcome }.isEqualTo(expectedOutcome)
+    assertThat(result).taskOutcomeEquals(shadowJarTask, expectedOutcome)
   }
 }