Skip to content

Commit ef0bcf2

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Fix tests when kx-benchmark and KGP have the same minSupportedGradleVersion
1 parent 298fdaf commit ef0bcf2

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

integration/src/test/kotlin/kotlinx/benchmark/integration/SupportedGradleVersionTest.kt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ class SupportedGradleVersionTest : GradleTest() {
99

1010
/** The min supported version used in build scripts, provided as a system property. */
1111
private val minSupportedGradleVersion = System.getProperty("minSupportedGradleVersion")
12-
private val warningMessage =
12+
private val unsupportedGradleVersionWarningMessage =
1313
"JetBrains Gradle Benchmarks plugin requires Gradle version ${GradleTestVersion.MinSupportedGradleVersion.versionString}"
14+
private val incompatibleKotlinAndGradleVersionsErrorMessage =
15+
"The applied Kotlin Gradle is not compatible with the used Gradle version (Gradle ${GradleTestVersion.UnsupportedGradleVersion.versionString})"
1416

1517
@Test
1618
fun `test MinSupportedGradleVersion matches the version used in build scripts`() {
@@ -31,16 +33,21 @@ class SupportedGradleVersionTest : GradleTest() {
3133
val runner = project("kotlin-multiplatform", gradleVersion = GradleTestVersion.MinSupportedGradleVersion)
3234

3335
runner.runAndSucceed(":help", "-q") {
34-
assertOutputDoesNotContain(warningMessage)
36+
assertOutputDoesNotContain(unsupportedGradleVersionWarningMessage)
3537
}
3638
}
3739

3840
@Test
3941
fun `when using unsupported Gradle version, expect warning`() {
4042
val runner = project("kotlin-multiplatform", gradleVersion = GradleTestVersion.UnsupportedGradleVersion)
4143

42-
runner.runAndSucceed(":help", "-q") {
43-
assertOutputContains(warningMessage)
44+
runner.run(":help", "-q") {
45+
assertTrue(
46+
// When kotlinx-benchmark-plugin has the same minimum supported Gradle version as KGP, reported by KGP
47+
output.contains(incompatibleKotlinAndGradleVersionsErrorMessage) ||
48+
// When kotlinx-benchmark-plugin has a newer minimum supported Gradle version than KGP, reported by kxb
49+
output.contains(unsupportedGradleVersionWarningMessage)
50+
)
4451
}
4552
}
4653
}

0 commit comments

Comments
 (0)