File tree Expand file tree Collapse file tree 6 files changed +28
-13
lines changed
kotlin/org/assertj/generator/gradle Expand file tree Collapse file tree 6 files changed +28
-13
lines changed Original file line number Diff line number Diff line change @@ -3,11 +3,22 @@ package org.assertj.generator.gradle
33import org.assertj.core.api.AbstractObjectAssert
44import org.gradle.testkit.runner.BuildTask
55import org.gradle.testkit.runner.TaskOutcome
6+ import org.gradle.testkit.runner.TaskOutcome.FROM_CACHE
7+ import org.gradle.testkit.runner.TaskOutcome.SUCCESS
8+ import org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE
69
7- internal fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isSuccessful (): SELF = isOutcome(TaskOutcome .SUCCESS )
8- internal fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isUpToDate (): SELF = isOutcome(TaskOutcome .UP_TO_DATE )
10+ internal fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isSuccessful (): SELF = isOutcome(SUCCESS )
911
10- private fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isOutcome (outcome : TaskOutcome ): SELF {
11- extracting { it?.outcome }.`as ` { " task.outcome == $outcome " }.isEqualTo(outcome)
12+ internal fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isSuccessOrCached (): SELF = isOutcome(
13+ SUCCESS ,
14+ FROM_CACHE
15+ )
16+
17+ internal fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isUpToDate (): SELF = isOutcome(UP_TO_DATE )
18+
19+ private fun <SELF : AbstractObjectAssert <SELF , BuildTask ?>> SELF.isOutcome (vararg outcomes : TaskOutcome ): SELF {
20+ extracting { it?.outcome }
21+ .`as ` { " task.outcome in { ${outcomes.joinToString(" , " )} }" }
22+ .isIn(outcomes.toSet())
1223 return this
1324}
Original file line number Diff line number Diff line change @@ -43,8 +43,8 @@ internal class IncrementalBuild {
4343
4444 val firstBuild = buildRunner.build()
4545
46- assertThat(firstBuild.task(" :generateAssertJ" )).isSuccessful ()
47- assertThat(firstBuild.task(" :test" )).isSuccessful ()
46+ assertThat(firstBuild.task(" :generateAssertJ" )).isSuccessOrCached ()
47+ assertThat(firstBuild.task(" :test" )).isSuccessOrCached ()
4848
4949 root.assertFiles()
5050
@@ -65,8 +65,8 @@ internal class IncrementalBuild {
6565
6666 val firstBuild = buildRunner.build()
6767
68- assertThat(firstBuild.task(" :generateAssertJ" )).isSuccessful ()
69- assertThat(firstBuild.task(" :test" )).isSuccessful ()
68+ assertThat(firstBuild.task(" :generateAssertJ" )).isSuccessOrCached ()
69+ assertThat(firstBuild.task(" :test" )).isSuccessOrCached ()
7070
7171 // get files
7272 root.assertFiles()
Original file line number Diff line number Diff line change @@ -38,8 +38,8 @@ internal class SimpleBuild {
3838
3939 val result = runner.withArguments(" -i" , " -s" , " test" ).build()
4040
41- assertThat(result.task(" :generateAssertJ" )).isSuccessful ()
42- assertThat(result.task(" :test" )).isSuccessful ()
41+ assertThat(result.task(" :generateAssertJ" )).isSuccessOrCached ()
42+ assertThat(result.task(" :test" )).isSuccessOrCached ()
4343 }
4444
4545 @Test
@@ -62,8 +62,8 @@ internal class SimpleBuild {
6262
6363 val result = runner.withArguments(" -i" , " -s" , " test" ).build()
6464
65- assertThat(result.task(" :generateAssertJ" )).isSuccessful ()
66- assertThat(result.task(" :test" )).isSuccessful ()
65+ assertThat(result.task(" :generateAssertJ" )).isSuccessOrCached ()
66+ assertThat(result.task(" :test" )).isSuccessOrCached ()
6767
6868 val packagePath = root.toPath()
6969 .resolve(" build/generated-src/main-test/java" )
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ internal class SkipPackageInfo {
2828 .resolve(" org/example" )
2929
3030 @Test
31- @GradleProject(" simple-build " )
31+ @GradleProject(" skip-package-info " )
3232 fun `does not include package info file` (
3333 @GradleProject.Root root : File ,
3434 @GradleProject.Runner runner : GradleRunner ,
Original file line number Diff line number Diff line change 1+ org.gradle.configuration-cache =true
2+ org.gradle.caching =true
Original file line number Diff line number Diff line change 1+ org.gradle.configuration-cache =true
2+ org.gradle.caching =true
You can’t perform that action at this time.
0 commit comments