From 1c7b8ec938bdbf9bb3d76987c481076d61f563fe Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 19 Sep 2017 08:14:16 +0300 Subject: [PATCH] Change test data so IC and non IC warnings count match When IC is on and new Kotlin class is referencing new Java class, new Kotlin file is compiled twice, because JPS thinks new Kotlin class is affected by new Java class (see https://youtrack.jetbrains.com/issue/KT-20318). This does not happen when IC is off, and KotlinBuilder requests chunk rebuild (see previous commit). I decided to remove the reference, because the issue is now known, and the reference is non critical for the test. --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- .../general/SourcePackageLongPrefix/module2/src/module2.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index cce47a59f34..77c3968c5d7 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -337,7 +337,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val buildResult = buildAllModules() buildResult.assertSuccessful() val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) - assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 2, warnings.size) + assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 1, warnings.size) assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) } diff --git a/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt b/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt index 9204cc97b43..54cd6bd4c70 100644 --- a/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt +++ b/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt @@ -3,11 +3,9 @@ package some import bad.prefix.KotlinTestInBadPrefix import good.prefix.KotlinTestInGoodPrefix import good.prefix.JavaTest; -import test.JavaRef val goodTest = KotlinTestInGoodPrefix() val badTest = KotlinTestInBadPrefix() val javaTest = JavaTest().bar() -val javaRef = JavaRef().foo(null)