azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix flaky test

Browse Source 
Commonizer may run first and produce compiler arguments output as well
in test output.
This commit is contained in:
Yahor Berdnikau
2023-04-12 17:35:25 +02:00
committed by Space Team
parent 73d99019bd
commit 86540bdbb4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt
+9 -3
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2NativeCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.gradle.util.parseCompilerArguments import org.jetbrains.kotlin.gradle.util.parseCompilerArguments
import org.jetbrains.kotlin.gradle.util.parseCompilerArgumentsFromBuildOutput
import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.fail import org.junit.jupiter.api.fail
import kotlin.io.path.appendText import kotlin.io.path.appendText
@@ -223,7 +224,10 @@ internal class CompilerOptionsIT : KGPBaseTest() {
fun combinesOptInFromLanguageSettingsNative(gradleVersion: GradleVersion) { fun combinesOptInFromLanguageSettingsNative(gradleVersion: GradleVersion) {
project( project(
projectName = "new-mpp-lib-and-app/sample-lib", projectName = "new-mpp-lib-and-app/sample-lib",
gradleVersion = gradleVersion gradleVersion = gradleVersion,
// We need to get specific task output as commonizer may run first producing
// arguments as well in output
buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)
) { ) {
buildGradle.appendText( buildGradle.appendText(
//language=Groovy //language=Groovy
@@ -251,7 +255,8 @@ internal class CompilerOptionsIT : KGPBaseTest() {
build("compileNativeMainKotlinMetadata") { build("compileNativeMainKotlinMetadata") {
assertTasksExecuted(":compileNativeMainKotlinMetadata") assertTasksExecuted(":compileNativeMainKotlinMetadata")
val arguments = parseCompilerArguments<K2NativeCompilerArguments>() val taskOutput = getOutputForTask("compileNativeMainKotlinMetadata")
val arguments = parseCompilerArgumentsFromBuildOutput(K2NativeCompilerArguments::class, taskOutput)
assertEquals( assertEquals(
setOf("another.custom.UnderOptIn", "my.custom.OptInAnnotation"), arguments.optIn?.toSet(), setOf("another.custom.UnderOptIn", "my.custom.OptInAnnotation"), arguments.optIn?.toSet(),
"Arguments optIn does not match '-opt-in=another.custom.UnderOptIn, -opt-in=my.custom.OptInAnnotation'" "Arguments optIn does not match '-opt-in=another.custom.UnderOptIn, -opt-in=my.custom.OptInAnnotation'"
@@ -260,7 +265,8 @@ internal class CompilerOptionsIT : KGPBaseTest() {
build("compileKotlinLinux64") { build("compileKotlinLinux64") {
assertTasksExecuted(":compileKotlinLinux64") assertTasksExecuted(":compileKotlinLinux64")
val arguments = parseCompilerArguments<K2NativeCompilerArguments>() val taskOutput = getOutputForTask("compileKotlinLinux64")
val arguments = parseCompilerArgumentsFromBuildOutput(K2NativeCompilerArguments::class, taskOutput)
assertEquals( assertEquals(
setOf("another.custom.UnderOptIn", "my.custom.OptInAnnotation"), arguments.optIn?.toSet(), setOf("another.custom.UnderOptIn", "my.custom.OptInAnnotation"), arguments.optIn?.toSet(),
"Arguments optIn does not match '-opt-in=another.custom.UnderOptIn, -opt-in=my.custom.OptInAnnotation'" "Arguments optIn does not match '-opt-in=another.custom.UnderOptIn, -opt-in=my.custom.OptInAnnotation'"