@@ -5,7 +5,6 @@ import org.gradle.testkit.runner.TaskOutcome
55import org.gradle.testkit.runner.UnexpectedBuildFailure
66import java.io.File
77import kotlin.test.Test
8- import kotlin.test.Ignore
98import kotlin.test.assertEquals
109import kotlin.test.assertTrue
1110
@@ -34,10 +33,9 @@ class ApolloVersionTest {
3433
3534 @Test
3635 @Synchronized
37- @Ignore(" There is no 5.0.0 release yet" )
3836 fun apollo_5_0_succeeds () {
3937 withProject {
40- it.version(" 5.0.0-SNAPSHOT " )
38+ it.version(" 5.0.0-alpha.1 " )
4139 }.assertSuccess(" build" )
4240 }
4341
@@ -54,10 +52,9 @@ class ApolloVersionTest {
5452
5553 @Test
5654 @Synchronized
57- @Ignore(" There is no 5.0.0 release yet" )
5855 fun apollo_5_0_shows_error_message () {
5956 withProject {
60- it.version(" 5.0.0-SNAPSHOT " )
57+ it.version(" 5.0.0-alpha.1 " )
6158 it.addBadCacheControl()
6259 }.assertFailure(" generateServiceApolloSources" ) {
6360 assertTrue(it.message!! .contains(" `maxAge` must not be negative" ))
@@ -81,6 +78,7 @@ private fun File.addBadCacheControl() {
8178private fun File.version (version : String ) {
8279 resolve(" build.gradle.kts" ).replace(" 4.2.0" , version)
8380}
81+
8482private fun File.assertFailure (taskName : String , onFailure : (UnexpectedBuildFailure ) -> Unit ) {
8583 newRunner().assertFailure(taskName, onFailure)
8684}
@@ -91,25 +89,25 @@ private fun File.assertSuccess(taskName: String) {
9189
9290private fun File.newRunner (): GradleRunner {
9391 return GradleRunner .create()
94- .withProjectDir(this )
92+ .withProjectDir(this )
9593}
9694
9795private fun GradleRunner.assertFailure (taskName : String , onFailure : (UnexpectedBuildFailure ) -> Unit ) {
9896 try {
9997 withArguments(taskName)
100- .build()
98+ .build()
10199 } catch (e: UnexpectedBuildFailure ) {
102100 onFailure(e)
103101 }
104102}
105103
106104private fun GradleRunner.assertSuccess (taskName : String ) {
107105 withArguments(taskName)
108- .build().apply {
109- assertEquals(TaskOutcome .SUCCESS , task(" :$taskName " )!! .outcome)
110- }
106+ .build().apply {
107+ assertEquals(TaskOutcome .SUCCESS , task(" :$taskName " )!! .outcome)
108+ }
111109}
112110
113111private fun File.replace (str : String , replacement : String ) {
114112 writeText(readText().replace(str, replacement))
115- }
113+ }
0 commit comments