From 318d955d64498fe564a79350c2eba65740514d29 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Fri, 10 Jun 2022 16:52:38 +0300 Subject: [PATCH] [IC] Add tests for sealed classes (KT-45474) --- ...ghtTreeJvmCompilerRunnerTestGenerated.java | 16 ++++++++-- ...ntalFirJvmCompilerRunnerTestGenerated.java | 16 ++++++++-- ...ghtTreeJvmCompilerRunnerTestGenerated.java | 16 ++++++++-- ...rementalJsCompilerRunnerTestGenerated.java | 16 ++++++++-- ...erRunnerWithMetadataOnlyTestGenerated.java | 16 ++++++++-- ...ementalJvmCompilerRunnerTestGenerated.java | 16 ++++++++-- ...OldBackendCompilerRunnerTestGenerated.java | 16 ++++++++-- .../build/IncrementalJvmJpsTestGenerated.java | 16 ++++++++-- .../A.kt | 0 .../B.kt | 0 .../Base.kt | 0 .../sealedClassesAddIndirectInheritor/C.kt | 3 ++ .../C.kt.new | 3 ++ .../D.kt} | 3 +- .../args.txt | 0 .../build.log | 12 ++------ .../sealedClassesUseSwitch/C.kt.new | 3 -- .../pureKotlin/sealedClassesUseSwitch/D.kt | 5 ---- .../sealedClassesWhenExpression/A.kt | 3 ++ .../sealedClassesWhenExpression/B.kt | 3 ++ .../sealedClassesWhenExpression/Base.kt | 3 ++ .../sealedClassesWhenExpression/Base.kt.new | 7 +++++ .../sealedClassesWhenExpression/Usage.kt | 12 ++++++++ .../sealedClassesWhenExpression/args.txt | 1 + .../sealedClassesWhenExpression/build.log | 25 ++++++++++++++++ .../sealedClassesWithExpectActual/A.kt | 3 ++ .../sealedClassesWithExpectActual/Actual.kt | 9 ++++++ .../sealedClassesWithExpectActual/Actual2.kt | 5 ++++ .../sealedClassesWithExpectActual/B.kt | 9 ++++++ .../sealedClassesWithExpectActual/Base.kt | 3 ++ .../sealedClassesWithExpectActual/C.kt.new | 3 ++ .../Unrelated.kt | 3 ++ .../sealedClassesWithExpectActual/args.txt | 1 + .../sealedClassesWithExpectActual/build.log | 29 +++++++++++++++++++ 34 files changed, 232 insertions(+), 44 deletions(-) rename jps/jps-plugin/testData/incremental/pureKotlin/{sealedClassesUseSwitch => sealedClassesAddIndirectInheritor}/A.kt (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{sealedClassesUseSwitch => sealedClassesAddIndirectInheritor}/B.kt (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{sealedClassesUseSwitch => sealedClassesAddIndirectInheritor}/Base.kt (100%) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt.new rename jps/jps-plugin/testData/incremental/pureKotlin/{sealedClassesUseSwitch/E.kt => sealedClassesAddIndirectInheritor/D.kt} (50%) rename jps/jps-plugin/testData/incremental/pureKotlin/{sealedClassesUseSwitch => sealedClassesAddIndirectInheritor}/args.txt (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{sealedClassesUseSwitch => sealedClassesAddIndirectInheritor}/build.log (74%) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/C.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Unrelated.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/build.log diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java index 9a9e6dbed96..0e22e12c759 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java @@ -597,6 +597,11 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -612,9 +617,14 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java index c7a2c9d243d..97bff33b263 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java @@ -597,6 +597,11 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -612,9 +617,14 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java index 341b290dbbb..501327dd0e9 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java @@ -597,6 +597,11 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -612,9 +617,14 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") 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 5ac4f0b5a27..f033c1a36a3 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 @@ -596,6 +596,11 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -611,9 +616,14 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java index b465d1c40ce..e5e0581f4bd 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java @@ -596,6 +596,11 @@ public class IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated extends Ab runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -611,9 +616,14 @@ public class IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated extends Ab runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") 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 894f43d9ba3..82448511e72 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 @@ -597,6 +597,11 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -612,9 +617,14 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java index d0234adf4c8..66d1a6476da 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java @@ -597,6 +597,11 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -612,9 +617,14 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 82564279cdb..eb9b12b60ac 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -1266,6 +1266,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); } + @TestMetadata("sealedClassesAddIndirectInheritor") + public void testSealedClassesAddIndirectInheritor() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/"); + } + @TestMetadata("sealedClassesAddInheritor") public void testSealedClassesAddInheritor() throws Exception { runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); @@ -1281,9 +1286,14 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); } - @TestMetadata("sealedClassesUseSwitch") - public void testSealedClassesUseSwitch() throws Exception { - runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + @TestMetadata("sealedClassesWhenExpression") + public void testSealedClassesWhenExpression() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/"); + } + + @TestMetadata("sealedClassesWithExpectActual") + public void testSealedClassesWithExpectActual() throws Exception { + runTest("jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/"); } @TestMetadata("secondaryConstructorInlined") diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/A.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/A.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/B.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/B.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/Base.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/Base.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt new file mode 100644 index 00000000000..d3c40f58a35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt @@ -0,0 +1,3 @@ +package test + +open class C : Any() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt.new new file mode 100644 index 00000000000..d419193b5b0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/C.kt.new @@ -0,0 +1,3 @@ +package test + +open class C : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/D.kt similarity index 50% rename from jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/D.kt index 7a1c3583390..cd964407d28 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/D.kt @@ -1,4 +1,3 @@ package test -class E { -} +class D : C() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/args.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/args.txt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/build.log similarity index 74% rename from jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/build.log index d1581952b1f..d8c5bc3598d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddIndirectInheritor/build.log @@ -8,6 +8,7 @@ Marked as dirty by Kotlin: src/B.kt src/Base.kt src/C.kt + src/D.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: @@ -16,22 +17,13 @@ Cleaning output files: out/production/module/test/B.class out/production/module/test/Base.class out/production/module/test/C.class + out/production/module/test/D.class End of files Compiling files: src/A.kt src/B.kt src/Base.kt src/C.kt -End of files -Marked as dirty by Kotlin: - src/D.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/D.class -End of files -Compiling files: src/D.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new deleted file mode 100644 index da276aa99da..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -package test - -interface C : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt deleted file mode 100644 index 71237657cd9..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -class D { - lateinit var x: Base -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt.new new file mode 100644 index 00000000000..f3a37f63de7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Base.kt.new @@ -0,0 +1,7 @@ +package test + +sealed interface Base { + + fun doSmth() = "doSmth" + +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Usage.kt new file mode 100644 index 00000000000..3ec54b9137c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/Usage.kt @@ -0,0 +1,12 @@ +package test + +//sealed interface Base + +class Usage { + + fun doSmth(x: Base) = + when (x) { + is A -> "A" + is B -> "B" + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/build.log new file mode 100644 index 00000000000..71ba03e7a9d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWhenExpression/build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Compiling files: + src/Base.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/A.kt new file mode 100644 index 00000000000..4efbb43f170 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/A.kt @@ -0,0 +1,3 @@ +package test + +open class A: Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual.kt new file mode 100644 index 00000000000..1fefb6dcf71 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual.kt @@ -0,0 +1,9 @@ +package test + +actual class ExpectClass { + actual fun doSmth() = "" +} + +expect class ExpectClass2 { + fun doSmth(): String +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual2.kt new file mode 100644 index 00000000000..46f6e89515b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Actual2.kt @@ -0,0 +1,5 @@ +package test + +actual class ExpectClass2 { + actual fun doSmth() = "" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/B.kt new file mode 100644 index 00000000000..e83c33f3d65 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/B.kt @@ -0,0 +1,9 @@ +package test + +class B : Base { + +} + +expect class ExpectClass { + fun doSmth(): String +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/C.kt.new new file mode 100644 index 00000000000..3d7cf8a529f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/C.kt.new @@ -0,0 +1,3 @@ +package test + +class C : A() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Unrelated.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Unrelated.kt new file mode 100644 index 00000000000..c0966daae0f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/Unrelated.kt @@ -0,0 +1,3 @@ +package test + +class Unrelated {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/args.txt new file mode 100644 index 00000000000..7d56734bb3c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces -Xmulti-platform diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/build.log new file mode 100644 index 00000000000..cff93fb9eeb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesWithExpectActual/build.log @@ -0,0 +1,29 @@ +================ Step #1 ================= + +Compiling files: + src/C.kt +End of files +Marked as dirty by Kotlin: + src/Actual.kt + src/B.kt + src/Base.kt + src/C.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Actual.class + out/production/module/test/B.class + out/production/module/test/Base.class + out/production/module/test/C.class +End of files +Compiling files: + src/Actual.kt + src/Actual2.kt + src/Base.kt + src/A.kt + src/B.kt + src/C.kt +End of files +Exit code: OK +------------------------------------------