From e4bbe2d5e2a098937edbf1a22ea0e985661cd0b8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 17 Aug 2018 05:14:00 +0300 Subject: [PATCH] Fix coroutines default value checks in KotlinProjectIT --- .../kotlin/gradle/model/KotlinProjectIT.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt index 3972f3f1f55..683fcc4eb9d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt @@ -18,7 +18,11 @@ class KotlinProjectIT : BaseGradleIT() { val project = Project("kotlinProject") val kotlinProject = project.getModels(KotlinProject::class.java).getModel(":")!! - kotlinProject.assertBasics("kotlinProject", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_JVM, "WARN") + kotlinProject.assertBasics( + "kotlinProject", + defaultBuildOptions().kotlinVersion, + KotlinProject.ProjectType.PLATFORM_JVM, + "DEFAULT") assertTrue(kotlinProject.expectedByDependencies.isEmpty()) assertEquals(2, kotlinProject.sourceSets.size) @@ -58,7 +62,7 @@ class KotlinProjectIT : BaseGradleIT() { "kotlinJavaProject", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_JVM, - "WARN" + "DEFAULT" ) assertEquals(3, kotlinProject.sourceSets.size) @@ -80,9 +84,9 @@ class KotlinProjectIT : BaseGradleIT() { val libJsKotlinProject = models.getModel(":libJs")!! val libJvmKotlinProject = models.getModel(":libJvm")!! - libKotlinProject.assertBasics("lib", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_COMMON, "WARN") - libJsKotlinProject.assertBasics("libJs", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_JS, "WARN") - libJvmKotlinProject.assertBasics("libJvm", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_JVM, "WARN") + libKotlinProject.assertBasics("lib", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_COMMON, "DEFAULT") + libJsKotlinProject.assertBasics("libJs", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_JS, "DEFAULT") + libJvmKotlinProject.assertBasics("libJvm", defaultBuildOptions().kotlinVersion, KotlinProject.ProjectType.PLATFORM_JVM, "DEFAULT") assertEquals(1, libJsKotlinProject.expectedByDependencies.size) assertTrue(libJsKotlinProject.expectedByDependencies.contains(":lib"))