Test improvements (#3)

aSemy · web-flow · commit dfaebcdf90c4 · 2023-03-03T17:42:19.000+01:00
- Update some of the test assertions to ones that provide better error messages
- Remove old comments
- cache Gradle TestKit in GitHub Workflow
- enable Gradle Scan in GitHub Workflow
diff --git a/.github/workflows/gradle_task.yml b/.github/workflows/gradle_task.yml
@@ -47,10 +47,20 @@ jobs:
           distribution: temurin
           java-version: 11
 
+      - name: Cache Gradle TestKit
+        id: cache-gradle-testkit
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ runner.temp }}/.gradle-test-kit/caches
+          key: gradle-testkit-${{ runner.os }}
+
       - uses: gradle/gradle-build-action@v2
+        env:
+          GRADLE_TESTKIT_DIR: ${{ runner.temp }}/.gradle-test-kit/caches
         with:
           gradle-home-cache-cleanup: true
-          arguments: ${{ inputs.gradle-task }}
+          arguments: ${{ inputs.gradle-task }} --scan
 
       - name: Upload build reports
         if: failure()
diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/kotlin-gradle-plugin-tests.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/kotlin-gradle-plugin-tests.gradle.kts
@@ -34,3 +34,12 @@ testing.suites {
     }
   }
 }
+
+tasks.withType<Test>().configureEach {
+  // Help speed up TestKit tests by re-using dependencies cache
+  // https://docs.gradle.org/current/userguide/dependency_resolution.html#sub:shared-readonly-cache
+  environment("GRADLE_RO_DEP_CACHE", gradle.gradleUserHomeDir.resolve("caches"))
+  providers.environmentVariable("GRADLE_TESTKIT_DIR").orNull?.let {
+    systemProperty("gradleTestKitDir", it)
+  }
+}
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/AndroidLibraryTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/AndroidLibraryTest.kt
@@ -8,7 +8,7 @@ import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
-@Disabled("Leftovers after revert of #94")
+@Disabled("Leftovers after revert of https://github.com/Kotlin/binary-compatibility-validator/issues/94")
 internal class AndroidLibraryTest : BaseKotlinGradleTest() {
 
   // region Kotlin Android Library
@@ -25,7 +25,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":kotlin-library:apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":kotlin-library:apiDump", SUCCESS)
     }
   }
 
@@ -38,7 +38,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {
         arguments.add(":kotlin-library:apiCheck")
       }
     }.build {
-      task(":kotlin-library:apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":kotlin-library:apiCheck", SUCCESS)
     }
   }
 
@@ -58,7 +58,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":java-library:apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":java-library:apiDump", SUCCESS)
     }
   }
 
@@ -71,7 +71,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {
         arguments.add(":java-library:apiCheck")
       }
     }.build {
-      task(":java-library:apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":java-library:apiCheck", SUCCESS)
     }
   }
 
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/DefaultConfigTests.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/DefaultConfigTests.kt
@@ -26,7 +26,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
 
     runner.buildAndFail {
       output shouldContain "Please ensure that task ':apiDump' was executed"
-      task(":apiCheck") shouldHaveOutcome FAILED
+      shouldHaveRunTask(":apiCheck", FAILED)
     }
   }
 
@@ -43,7 +43,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.buildAndFail {
-      task(":apiCheck") shouldHaveOutcome FAILED
+      shouldHaveRunTask(":apiCheck", FAILED)
       shouldNotHaveRunTask(":check") // apiCheck fails before we can run check
     }
   }
@@ -63,7 +63,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -86,7 +86,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -109,7 +109,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -132,7 +132,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.buildAndFail {
-      task(":apiCheck") shouldHaveOutcome FAILED
+      shouldHaveRunTask(":apiCheck", FAILED)
 
       // note that tabs are used as function indents!
       val dumpOutput = /*language=TEXT*/ """
@@ -160,7 +160,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiDump", SUCCESS)
 
       assertTrue(
         rootProjectApiDump.exists(),
@@ -187,7 +187,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiDump", SUCCESS)
 
       val apiDumpFile = rootProjectDir.resolve("api/testproject.api")
       assertTrue(apiDumpFile.exists(), "api dump file ${apiDumpFile.path} should exist")
@@ -217,7 +217,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiDump", SUCCESS)
 
       assertTrue(rootProjectApiDump.exists(), "api dump file should exist")
 
@@ -242,8 +242,8 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":check") shouldHaveOutcome SUCCESS
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":check", SUCCESS)
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 }
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/IgnoredClassesTests.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/IgnoredClassesTests.kt
@@ -2,7 +2,7 @@ package kotlinx.validation.test
 
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.build
-import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveOutcome
+import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveRunTask
 import io.kotest.matchers.comparables.shouldBeEqualComparingTo
 import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -30,7 +30,7 @@ internal class IgnoredClassesTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -54,7 +54,7 @@ internal class IgnoredClassesTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -78,7 +78,7 @@ internal class IgnoredClassesTests : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiDump", SUCCESS)
 
       assertTrue(rootProjectApiDump.exists(), "api dump file should exist")
 
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/InputJarTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/InputJarTest.kt
@@ -2,7 +2,7 @@ package kotlinx.validation.test
 
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.build
-import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveOutcome
+import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveRunTask
 import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.junit.jupiter.api.Test
 
@@ -30,8 +30,8 @@ class InputJarTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":jar") shouldHaveOutcome SUCCESS
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":jar", SUCCESS)
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 }
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/JavaTestFixturesTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/JavaTestFixturesTest.kt
@@ -22,7 +22,7 @@ class JavaTestFixturesTest : FunSpec({
       test("expect :apiDump task passes") {
         project.runner.withArguments("apiDump").build {
           withClue(output) {
-            task(":apiDump") shouldHaveOutcome SUCCESS
+            shouldHaveRunTask(":apiDump", SUCCESS)
           }
         }
       }
@@ -36,7 +36,7 @@ class JavaTestFixturesTest : FunSpec({
           )
           .build {
             withClue(output) {
-              task(":apiCheck") shouldHaveOutcome SUCCESS
+              shouldHaveRunTask(":apiCheck", SUCCESS)
             }
           }
       }
@@ -74,7 +74,7 @@ class JavaTestFixturesTest : FunSpec({
       test("expect :apiDump task passes") {
         project.runner.withArguments("apiDump").build {
           withClue(output) {
-            task(":apiDump") shouldHaveOutcome SUCCESS
+            shouldHaveRunTask(":apiDump", SUCCESS)
           }
         }
       }
@@ -88,7 +88,7 @@ class JavaTestFixturesTest : FunSpec({
           )
           .build {
             withClue(output) {
-              task(":apiCheck") shouldHaveOutcome SUCCESS
+              shouldHaveRunTask(":apiCheck", SUCCESS)
             }
           }
       }
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/MultiPlatformSingleJvmTargetTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/MultiPlatformSingleJvmTargetTest.kt
@@ -3,7 +3,8 @@ package kotlinx.validation.test
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.*
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*
 import io.kotest.assertions.withClue
-import io.kotest.matchers.comparables.shouldBeEqualComparingTo
+import io.kotest.matchers.file.shouldBeAFile
+import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import java.io.File
 import org.gradle.testkit.runner.TaskOutcome.FAILED
@@ -46,7 +47,7 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -119,7 +120,7 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiDump") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiDump", SUCCESS)
 
       val mainExpectedApi = """
         |${readResourceFile("/examples/classes/Subsub1Class.dump").trim()}
@@ -129,9 +130,8 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
         |
       """.trimMargin()
 
-      val actual = jvmApiDump.readText().invariantNewlines()
-
-      actual.shouldBeEqualComparingTo(mainExpectedApi)
+      jvmApiDump.shouldBeAFile()
+      jvmApiDump.readText().invariantNewlines() shouldBe mainExpectedApi
     }
   }
 
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/MultipleJvmTargetsTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/MultipleJvmTargetsTest.kt
@@ -53,7 +53,7 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveRunTask(":apiCheck", SUCCESS)
     }
   }
 
@@ -92,7 +92,7 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {
 
     runner.buildAndFail {
       withClue(output) {
-        shouldHaveRunTask(":apiCheck") shouldHaveOutcome FAILED
+        shouldHaveRunTask(":apiCheck", FAILED)
         output shouldContain "API check failed for project :testproject"
         shouldNotHaveRunTask(":check")
       }
@@ -118,22 +118,21 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {
 
     }
     runner.build {
-      task(":apiDump") shouldHaveOutcome SUCCESS
-
-      System.err.println(output)
+      withClue(output) {
+        shouldHaveRunTask(":apiDump", SUCCESS)
 
-      val anotherExpectedApi = readResourceFile("/examples/classes/Subsub1Class.dump")
-      anotherApiDump.shouldBeAFile()
-      anotherApiDump.readText().invariantNewlines().shouldBe(anotherExpectedApi)
+        val anotherExpectedApi = readResourceFile("/examples/classes/Subsub1Class.dump")
+        anotherApiDump.shouldBeAFile()
+        anotherApiDump.readText().invariantNewlines() shouldBe anotherExpectedApi
 
-      val mainExpectedApi =
-        anotherExpectedApi + readResourceFile("/examples/classes/Subsub2Class.dump")
-      jvmApiDump.shouldBeAFile()
-      jvmApiDump.readText().invariantNewlines().shouldBe(mainExpectedApi)
+        val mainExpectedApi =
+          anotherExpectedApi + readResourceFile("/examples/classes/Subsub2Class.dump")
+        jvmApiDump.shouldBeAFile()
+        jvmApiDump.readText().invariantNewlines() shouldBe mainExpectedApi
+      }
     }
   }
 
   private val jvmApiDump: File get() = rootProjectDir.resolve("api/jvm/testproject.api")
   private val anotherApiDump: File get() = rootProjectDir.resolve("api/anotherJvm/testproject.api")
-
 }
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/NonPublicMarkersTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/NonPublicMarkersTest.kt
@@ -3,6 +3,7 @@ package kotlinx.validation.test
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.build
 import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveOutcome
+import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveTaskWithOutcome
 import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.junit.jupiter.api.Test
 
@@ -30,7 +31,7 @@ class NonPublicMarkersTest : BaseKotlinGradleTest() {
     }
 
     runner.build {
-      task(":apiCheck") shouldHaveOutcome SUCCESS
+      shouldHaveTaskWithOutcome(":apiCheck", SUCCESS)
     }
   }
 }
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/SettingsPluginDslTest.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/SettingsPluginDslTest.kt
@@ -9,7 +9,7 @@ import io.kotest.matchers.paths.shouldExist
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import kotlin.io.path.readText
-import org.gradle.testkit.runner.TaskOutcome
+import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.intellij.lang.annotations.Language
 
 internal class SettingsPluginDslTest : FunSpec({
@@ -71,8 +71,8 @@ internal class SettingsPluginDslTest : FunSpec({
                 shouldNotHaveRunTask(":apiDump")
               }
 
-              task(":sub1:apiDump") shouldHaveOutcome TaskOutcome.SUCCESS
-              task(":sub2:apiDump") shouldHaveOutcome TaskOutcome.SUCCESS
+              shouldHaveRunTask(":sub1:apiDump", SUCCESS)
+              shouldHaveRunTask(":sub2:apiDump", SUCCESS)
             }
 
           testCase.project.projectDir.resolve("sub1/api/sub1.api").asClue { apiDump ->
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/SubprojectsWithPluginOnRootTests.kt b/modules/bcv-gradle-plugin-functional-tests/src/functionalTest/kotlin/kotlinx/validation/test/SubprojectsWithPluginOnRootTests.kt
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/testFixtures/kotlin/GradleTestKitUtils.kt b/modules/bcv-gradle-plugin-functional-tests/src/testFixtures/kotlin/GradleTestKitUtils.kt
diff --git a/modules/bcv-gradle-plugin-functional-tests/src/testFixtures/kotlin/api/TestDsl.kt b/modules/bcv-gradle-plugin-functional-tests/src/testFixtures/kotlin/api/TestDsl.kt

Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,12 @@ testing.suites {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+tasks.withType<Test>().configureEach {`
	`39`	`+ // Help speed up TestKit tests by re-using dependencies cache`
	`40`	`+ // https://docs.gradle.org/current/userguide/dependency_resolution.html#sub:shared-readonly-cache`
	`41`	`+ environment("GRADLE_RO_DEP_CACHE", gradle.gradleUserHomeDir.resolve("caches"))`
	`42`	`+ providers.environmentVariable("GRADLE_TESTKIT_DIR").orNull?.let {`
	`43`	`+ systemProperty("gradleTestKitDir", it)`
	`44`	`+ }`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import org.gradle.testkit.runner.TaskOutcome.SUCCESS`
`8`	`8`	`import org.junit.jupiter.api.Disabled`
`9`	`9`	`import org.junit.jupiter.api.Test`
`10`	`10`
`11`		`-@Disabled("Leftovers after revert of #94")`
	`11`	`+@Disabled("Leftovers after revert of https://github.com/Kotlin/binary-compatibility-validator/issues/94")`
`12`	`12`	`internal class AndroidLibraryTest : BaseKotlinGradleTest() {`
`13`	`13`
`14`	`14`	`// region Kotlin Android Library`
`@@ -25,7 +25,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`runner.build {`
`28`		`- task(":kotlin-library:apiDump") shouldHaveOutcome SUCCESS`
	`28`	`+ shouldHaveRunTask(":kotlin-library:apiDump", SUCCESS)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -38,7 +38,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {`
`38`	`38`	`arguments.add(":kotlin-library:apiCheck")`
`39`	`39`	`}`
`40`	`40`	`}.build {`
`41`		`- task(":kotlin-library:apiCheck") shouldHaveOutcome SUCCESS`
	`41`	`+ shouldHaveRunTask(":kotlin-library:apiCheck", SUCCESS)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -58,7 +58,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`runner.build {`
`61`		`- task(":java-library:apiDump") shouldHaveOutcome SUCCESS`
	`61`	`+ shouldHaveRunTask(":java-library:apiDump", SUCCESS)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`@@ -71,7 +71,7 @@ internal class AndroidLibraryTest : BaseKotlinGradleTest() {`
`71`	`71`	`arguments.add(":java-library:apiCheck")`
`72`	`72`	`}`
`73`	`73`	`}.build {`
`74`		`- task(":java-library:apiCheck") shouldHaveOutcome SUCCESS`
	`74`	`+ shouldHaveRunTask(":java-library:apiCheck", SUCCESS)`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`26`	`26`
`27`	`27`	`runner.buildAndFail {`
`28`	`28`	`output shouldContain "Please ensure that task ':apiDump' was executed"`
`29`		`- task(":apiCheck") shouldHaveOutcome FAILED`
	`29`	`+ shouldHaveRunTask(":apiCheck", FAILED)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -43,7 +43,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`runner.buildAndFail {`
`46`		`- task(":apiCheck") shouldHaveOutcome FAILED`
	`46`	`+ shouldHaveRunTask(":apiCheck", FAILED)`
`47`	`47`	`shouldNotHaveRunTask(":check") // apiCheck fails before we can run check`
`48`	`48`	`}`
`49`	`49`	`}`
`@@ -63,7 +63,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`runner.build {`
`66`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`66`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`@@ -86,7 +86,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`runner.build {`
`89`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`89`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`@@ -109,7 +109,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`runner.build {`
`112`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`112`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`@@ -132,7 +132,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`runner.buildAndFail {`
`135`		`- task(":apiCheck") shouldHaveOutcome FAILED`
	`135`	`+ shouldHaveRunTask(":apiCheck", FAILED)`
`136`	`136`
`137`	`137`	`// note that tabs are used as function indents!`
`138`	`138`	`val dumpOutput = /language=TEXT/ """`
`@@ -160,7 +160,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`runner.build {`
`163`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`163`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`164`	`164`
`165`	`165`	`assertTrue(`
`166`	`166`	`rootProjectApiDump.exists(),`
`@@ -187,7 +187,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`runner.build {`
`190`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`190`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`191`	`191`
`192`	`192`	`val apiDumpFile = rootProjectDir.resolve("api/testproject.api")`
`193`	`193`	`assertTrue(apiDumpFile.exists(), "api dump file ${apiDumpFile.path} should exist")`
`@@ -217,7 +217,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`runner.build {`
`220`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`220`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`221`	`221`
`222`	`222`	`assertTrue(rootProjectApiDump.exists(), "api dump file should exist")`
`223`	`223`
`@@ -242,8 +242,8 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`runner.build {`
`245`		`- task(":check") shouldHaveOutcome SUCCESS`
`246`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`245`	`+ shouldHaveRunTask(":check", SUCCESS)`
	`246`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package kotlinx.validation.test`
`2`	`2`
`3`	`3`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*`
`4`	`4`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.build`
`5`		`-import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveOutcome`
	`5`	`+import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveRunTask`
`6`	`6`	`import io.kotest.matchers.comparables.shouldBeEqualComparingTo`
`7`	`7`	`import org.gradle.testkit.runner.TaskOutcome.SUCCESS`
`8`	`8`	`import org.junit.jupiter.api.Assertions.assertTrue`
`@@ -30,7 +30,7 @@ internal class IgnoredClassesTests : BaseKotlinGradleTest() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`runner.build {`
`33`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`33`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`@@ -54,7 +54,7 @@ internal class IgnoredClassesTests : BaseKotlinGradleTest() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`runner.build {`
`57`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`57`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`@@ -78,7 +78,7 @@ internal class IgnoredClassesTests : BaseKotlinGradleTest() {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`runner.build {`
`81`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`81`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`82`	`82`
`83`	`83`	`assertTrue(rootProjectApiDump.exists(), "api dump file should exist")`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class JavaTestFixturesTest : FunSpec({`
`22`	`22`	`test("expect :apiDump task passes") {`
`23`	`23`	`project.runner.withArguments("apiDump").build {`
`24`	`24`	`withClue(output) {`
`25`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`25`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -36,7 +36,7 @@ class JavaTestFixturesTest : FunSpec({`
`36`	`36`	`)`
`37`	`37`	`.build {`
`38`	`38`	`withClue(output) {`
`39`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`39`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
`@@ -74,7 +74,7 @@ class JavaTestFixturesTest : FunSpec({`
`74`	`74`	`test("expect :apiDump task passes") {`
`75`	`75`	`project.runner.withArguments("apiDump").build {`
`76`	`76`	`withClue(output) {`
`77`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`77`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -88,7 +88,7 @@ class JavaTestFixturesTest : FunSpec({`
`88`	`88`	`)`
`89`	`89`	`.build {`
`90`	`90`	`withClue(output) {`
`91`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`91`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ package kotlinx.validation.test`
`3`	`3`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.*`
`4`	`4`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*`
`5`	`5`	`import io.kotest.assertions.withClue`
`6`		`-import io.kotest.matchers.comparables.shouldBeEqualComparingTo`
	`6`	`+import io.kotest.matchers.file.shouldBeAFile`
	`7`	`+import io.kotest.matchers.shouldBe`
`7`	`8`	`import io.kotest.matchers.string.shouldContain`
`8`	`9`	`import java.io.File`
`9`	`10`	`import org.gradle.testkit.runner.TaskOutcome.FAILED`
`@@ -46,7 +47,7 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`runner.build {`
`49`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`50`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`
`@@ -119,7 +120,7 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`runner.build {`
`122`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
	`123`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`123`	`124`
`124`	`125`	`val mainExpectedApi = """`
`125`	`126`	`\|${readResourceFile("/examples/classes/Subsub1Class.dump").trim()}`
`@@ -129,9 +130,8 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {`
`129`	`130`	`\|`
`130`	`131`	`""".trimMargin()`
`131`	`132`
`132`		`- val actual = jvmApiDump.readText().invariantNewlines()`
`133`		`-`
`134`		`- actual.shouldBeEqualComparingTo(mainExpectedApi)`
	`133`	`+ jvmApiDump.shouldBeAFile()`
	`134`	`+ jvmApiDump.readText().invariantNewlines() shouldBe mainExpectedApi`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`runner.build {`
`56`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`56`	`+ shouldHaveRunTask(":apiCheck", SUCCESS)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`@@ -92,7 +92,7 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {`
`92`	`92`
`93`	`93`	`runner.buildAndFail {`
`94`	`94`	`withClue(output) {`
`95`		`- shouldHaveRunTask(":apiCheck") shouldHaveOutcome FAILED`
	`95`	`+ shouldHaveRunTask(":apiCheck", FAILED)`
`96`	`96`	`output shouldContain "API check failed for project :testproject"`
`97`	`97`	`shouldNotHaveRunTask(":check")`
`98`	`98`	`}`
`@@ -118,22 +118,21 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {`
`118`	`118`
`119`	`119`	`}`
`120`	`120`	`runner.build {`
`121`		`- task(":apiDump") shouldHaveOutcome SUCCESS`
`122`		`-`
`123`		`- System.err.println(output)`
	`121`	`+ withClue(output) {`
	`122`	`+ shouldHaveRunTask(":apiDump", SUCCESS)`
`124`	`123`
`125`		`- val anotherExpectedApi = readResourceFile("/examples/classes/Subsub1Class.dump")`
`126`		`- anotherApiDump.shouldBeAFile()`
`127`		`- anotherApiDump.readText().invariantNewlines().shouldBe(anotherExpectedApi)`
	`124`	`+ val anotherExpectedApi = readResourceFile("/examples/classes/Subsub1Class.dump")`
	`125`	`+ anotherApiDump.shouldBeAFile()`
	`126`	`+ anotherApiDump.readText().invariantNewlines() shouldBe anotherExpectedApi`
`128`	`127`
`129`		`- val mainExpectedApi =`
`130`		`- anotherExpectedApi + readResourceFile("/examples/classes/Subsub2Class.dump")`
`131`		`- jvmApiDump.shouldBeAFile()`
`132`		`- jvmApiDump.readText().invariantNewlines().shouldBe(mainExpectedApi)`
	`128`	`+ val mainExpectedApi =`
	`129`	`+ anotherExpectedApi + readResourceFile("/examples/classes/Subsub2Class.dump")`
	`130`	`+ jvmApiDump.shouldBeAFile()`
	`131`	`+ jvmApiDump.readText().invariantNewlines() shouldBe mainExpectedApi`
	`132`	`+ }`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`private val jvmApiDump: File get() = rootProjectDir.resolve("api/jvm/testproject.api")`
`137`	`137`	`private val anotherApiDump: File get() = rootProjectDir.resolve("api/anotherJvm/testproject.api")`
`138`		`-`
`139`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package kotlinx.validation.test`
`3`	`3`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.api.*`
`4`	`4`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.build`
`5`	`5`	`import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveOutcome`
	`6`	`+import dev.adamko.kotlin.binary_compatibility_validator.test.utils.shouldHaveTaskWithOutcome`
`6`	`7`	`import org.gradle.testkit.runner.TaskOutcome.SUCCESS`
`7`	`8`	`import org.junit.jupiter.api.Test`
`8`	`9`
`@@ -30,7 +31,7 @@ class NonPublicMarkersTest : BaseKotlinGradleTest() {`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`runner.build {`
`33`		`- task(":apiCheck") shouldHaveOutcome SUCCESS`
	`34`	`+ shouldHaveTaskWithOutcome(":apiCheck", SUCCESS)`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`