From cb1ffdccd73be9d59bb9631b65565c685f26cceb Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Aug 2017 19:15:14 +0300 Subject: [PATCH] Add test where unused file is removed --- .../IncrementalJsCompilerRunnerTestGenerated.java | 6 ++++++ .../IncrementalJvmCompilerRunnerTestGenerated.java | 6 ++++++ .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../incremental/pureKotlin/removeUnusedFile/build.log | 11 +++++++++++ .../incremental/pureKotlin/removeUnusedFile/dummy.kt | 3 +++ .../incremental/pureKotlin/removeUnusedFile/unused.kt | 5 +++++ .../pureKotlin/removeUnusedFile/unused.kt.delete | 0 7 files changed, 37 insertions(+) create mode 100644 jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java index d14b84e63fa..06b84cc457a 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java @@ -644,6 +644,12 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } + @TestMetadata("removeUnusedFile") + public void testRemoveUnusedFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/"); + doTest(fileName); + } + @TestMetadata("renameClass") public void testRenameClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java index aacb8f2e3ba..692f04a3a9a 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java @@ -644,6 +644,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } + @TestMetadata("removeUnusedFile") + public void testRemoveUnusedFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/"); + doTest(fileName); + } + @TestMetadata("renameClass") public void testRenameClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index f21f9e6c48b..e15506bfb9e 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -815,6 +815,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("removeUnusedFile") + public void testRemoveUnusedFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/"); + doTest(fileName); + } + @TestMetadata("renameClass") public void testRenameClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log new file mode 100644 index 00000000000..d92fc98392a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Bar.class + out/production/module/test/UnusedKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt new file mode 100644 index 00000000000..789dc274f72 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt @@ -0,0 +1,3 @@ +package test + +fun dummy() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt new file mode 100644 index 00000000000..41afa7127ce --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt @@ -0,0 +1,5 @@ +package test + +fun foo() {} + +class Bar() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete b/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete new file mode 100644 index 00000000000..e69de29bb2d