add tests

assertj · Aug 17, 2023 · 759a6c7 · 759a6c7
1 parent 1f877b6
commit 759a6c7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 13 deletions.
diff --git a/src/test/kotlin/org/assertj/generator/gradle/AssertExtensions.kt b/src/test/kotlin/org/assertj/generator/gradle/AssertExtensions.kt
@@ -3,11 +3,22 @@ package org.assertj.generator.gradle
 import org.assertj.core.api.AbstractObjectAssert
 import org.gradle.testkit.runner.BuildTask
 import org.gradle.testkit.runner.TaskOutcome
+import org.gradle.testkit.runner.TaskOutcome.FROM_CACHE
+import org.gradle.testkit.runner.TaskOutcome.SUCCESS
+import org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE
 
-internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isSuccessful(): SELF = isOutcome(TaskOutcome.SUCCESS)
-internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isUpToDate(): SELF = isOutcome(TaskOutcome.UP_TO_DATE)
+internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isSuccessful(): SELF = isOutcome(SUCCESS)
 
-private fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isOutcome(outcome: TaskOutcome): SELF {
-  extracting { it?.outcome }.`as` { "task.outcome == $outcome" }.isEqualTo(outcome)
+internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isSuccessOrCached(): SELF = isOutcome(
+  SUCCESS,
+  FROM_CACHE
+)
+
+internal fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isUpToDate(): SELF = isOutcome(UP_TO_DATE)
+
+private fun <SELF : AbstractObjectAssert<SELF, BuildTask?>> SELF.isOutcome(vararg outcomes: TaskOutcome): SELF {
+  extracting { it?.outcome }
+    .`as` { "task.outcome in { ${outcomes.joinToString(", ")} }" }
+    .isIn(outcomes.toSet())
   return this
 }
diff --git a/src/test/kotlin/org/assertj/generator/gradle/IncrementalBuild.kt b/src/test/kotlin/org/assertj/generator/gradle/IncrementalBuild.kt
@@ -43,8 +43,8 @@ internal class IncrementalBuild {
 
     val firstBuild = buildRunner.build()
 
-    assertThat(firstBuild.task(":generateAssertJ")).isSuccessful()
-    assertThat(firstBuild.task(":test")).isSuccessful()
+    assertThat(firstBuild.task(":generateAssertJ")).isSuccessOrCached()
+    assertThat(firstBuild.task(":test")).isSuccessOrCached()
 
     root.assertFiles()
 
@@ -65,8 +65,8 @@ internal class IncrementalBuild {
 
     val firstBuild = buildRunner.build()
 
-    assertThat(firstBuild.task(":generateAssertJ")).isSuccessful()
-    assertThat(firstBuild.task(":test")).isSuccessful()
+    assertThat(firstBuild.task(":generateAssertJ")).isSuccessOrCached()
+    assertThat(firstBuild.task(":test")).isSuccessOrCached()
 
     // get files
     root.assertFiles()

diff --git a/src/test/kotlin/org/assertj/generator/gradle/SimpleBuild.kt b/src/test/kotlin/org/assertj/generator/gradle/SimpleBuild.kt
@@ -38,8 +38,8 @@ internal class SimpleBuild {
 
     val result = runner.withArguments("-i", "-s", "test").build()
 
-    assertThat(result.task(":generateAssertJ")).isSuccessful()
-    assertThat(result.task(":test")).isSuccessful()
+    assertThat(result.task(":generateAssertJ")).isSuccessOrCached()
+    assertThat(result.task(":test")).isSuccessOrCached()
   }
 
   @Test
@@ -62,8 +62,8 @@ internal class SimpleBuild {
 
     val result = runner.withArguments("-i", "-s", "test").build()
 
-    assertThat(result.task(":generateAssertJ")).isSuccessful()
-    assertThat(result.task(":test")).isSuccessful()
+    assertThat(result.task(":generateAssertJ")).isSuccessOrCached()
+    assertThat(result.task(":test")).isSuccessOrCached()
 
     val packagePath = root.toPath()
       .resolve("build/generated-src/main-test/java")

diff --git a/src/test/kotlin/org/assertj/generator/gradle/SkipPackageInfo.kt b/src/test/kotlin/org/assertj/generator/gradle/SkipPackageInfo.kt
@@ -28,7 +28,7 @@ internal class SkipPackageInfo {
       .resolve("org/example")
 
   @Test
-  @GradleProject("simple-build")
+  @GradleProject("skip-package-info")
   fun `does not include package info file`(
     @GradleProject.Root root: File,
     @GradleProject.Runner runner: GradleRunner,

diff --git a/src/test/projects/incremental-build/gradle.properties b/src/test/projects/incremental-build/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.configuration-cache=true
+org.gradle.caching=true
diff --git a/src/test/projects/simple-build/gradle.properties b/src/test/projects/simple-build/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.configuration-cache=true
+org.gradle.caching=true