From 33c6d526437d4b493d0e7e964eac3f030401ee31 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 2 May 2017 13:12:07 +0300 Subject: [PATCH] Remove old IC: update KotlinJpsBuildTest Original commit: a4a0335b201bf9026b992ba59e38053f0b9de1c1 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index daee35d4491..7c90d6981aa 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -497,10 +497,8 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"))) checkWhen(del("src/main.kt"), - arrayOf("src/Bar.kt", "src/boo.kt"), - mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"), - packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"), - arrayOf(klass("kotlinProject", "foo.Bar")))) + pathsToCompile = null, + pathsToDelete = packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) assertFilesExistInOutput(module, "boo/BooKt.class", "foo/Bar.class") assertFilesNotExistInOutput(module, "foo/MainKt.class") @@ -523,11 +521,8 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { module("kotlinProject"))) checkWhen(del("src/main.kt"), - arrayOf("src/Bar.kt", "src/boo.kt"), - mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"), - packageClasses("kotlinProject", "src/Bar.kt", "foo.MainKt"), - packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"), - arrayOf(klass("kotlinProject", "foo.Bar")))) + pathsToCompile = null, + pathsToDelete = packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) assertFilesExistInOutput(module, "boo/BooKt.class", "foo/Bar.class") checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))