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

Fix deprecations in functional tests

Browse Source 
^KT-27301 In Progress
This commit is contained in:
Yahor Berdnikau
2022-09-15 12:18:42 +02:00
parent 47dee4b88c
commit e606018372
4 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt
+3 -2
View File
@@ -14,6 +14,7 @@ import org.gradle.api.internal.project.ProjectInternal
import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.api.plugins.ExtraPropertiesExtension
import org.gradle.testfixtures.ProjectBuilder import org.gradle.testfixtures.ProjectBuilder
import org.jetbrains.kotlin.compilerRunner.konanVersion import org.jetbrains.kotlin.compilerRunner.konanVersion
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
@@ -139,8 +140,8 @@ class BuildKotlinToolingMetadataTest {
project.plugins.apply("kotlin-multiplatform") project.plugins.apply("kotlin-multiplatform")
val kotlin = multiplatformExtension val kotlin = multiplatformExtension
val jvm = kotlin.jvm() val jvm = kotlin.jvm()
jvm.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME).kotlinOptions.jvmTarget = "12" jvm.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME).compilerOptions.options.jvmTarget.set(JvmTarget.JVM_12)
jvm.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME).kotlinOptions.jvmTarget = "10" jvm.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME).compilerOptions.options.jvmTarget.set(JvmTarget.JVM_10)
assertEquals( assertEquals(
"12", getKotlinToolingMetadata().projectTargets "12", getKotlinToolingMetadata().projectTargets
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt
+1 -1
View File
@@ -72,7 +72,7 @@ class JvmAndAndroidIntermediateSourceSetTest {
val compilation = jvmAndAndroidMainMetadataCompilations.single() val compilation = jvmAndAndroidMainMetadataCompilations.single()
assertFalse( assertFalse(
compilation.compileKotlinTaskProvider.get().enabled, compilation.compileTaskProvider.get().enabled,
"Expected compilation task to be disabled, because not supported yet" "Expected compilation task to be disabled, because not supported yet"
) )
} }
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileApiTest.kt
+1 -17
View File
@@ -134,26 +134,10 @@ class KotlinCompileApiTest {
assertEquals(false, taskImpl.useModuleDetection.get()) assertEquals(false, taskImpl.useModuleDetection.get())
} }
@Test
fun testParentKotlinOptions() {
val parentOptions = plugin.createKotlinJvmOptions()
parentOptions.moduleName = "foo"
parentOptions.javaParameters = true
parentOptions.languageVersion = "lang_version"
taskApi.parentKotlinOptions.set(parentOptions)
taskImpl.parentKotlinOptions.get().let {
assertEquals(parentOptions.moduleName, it.moduleName)
assertEquals(parentOptions.javaParameters, it.javaParameters)
assertEquals(parentOptions.languageVersion, it.languageVersion)
}
}
@Test @Test
fun testTopLevelExtension() { fun testTopLevelExtension() {
plugin.kotlinExtension.explicitApi = ExplicitApiMode.Strict plugin.kotlinExtension.explicitApi = ExplicitApiMode.Strict
project.evaluate() project.evaluate()
assertTrue(ExplicitApiMode.Strict.toCompilerArg() in taskImpl.kotlinOptions.freeCompilerArgs) assertTrue(ExplicitApiMode.Strict.toCompilerArg() in taskImpl.compilerOptions.freeCompilerArgs.get())
} }
} }
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/BuildKotlinToolingMetadataTest.kt
+3 -2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.tooling.KotlinToolingMetadata
import org.jetbrains.kotlin.tooling.toJsonString import org.jetbrains.kotlin.tooling.toJsonString
import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.create
import org.jetbrains.kotlin.gradle.disableLegacyWarning import org.jetbrains.kotlin.gradle.disableLegacyWarning
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import kotlin.test.* import kotlin.test.*
@@ -171,8 +172,8 @@ class KotlinToolingMetadataWithModelMappingTest {
project.plugins.apply("kotlin-multiplatform") project.plugins.apply("kotlin-multiplatform")
val kotlin = multiplatformExtension val kotlin = multiplatformExtension
val jvm = kotlin.jvm() val jvm = kotlin.jvm()
jvm.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME).kotlinOptions.jvmTarget = "12" jvm.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME).compilerOptions.options.jvmTarget.set(JvmTarget.JVM_12)
jvm.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME).kotlinOptions.jvmTarget = "10" jvm.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME).compilerOptions.options.jvmTarget.set(JvmTarget.JVM_10)
assertEquals( assertEquals(
"12", getKotlinToolingMetadata().projectTargets "12", getKotlinToolingMetadata().projectTargets