From 3b4a49eebf70a34fbf1f9c3a7f1534bd2725cb24 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 13 Aug 2018 02:01:29 +0300 Subject: [PATCH] Add test for KT-26064 --- .../IncrementalJsCompilerRunnerTestGenerated.java | 10 ++++++++++ .../IncrementalJvmCompilerRunnerTestGenerated.java | 10 ++++++++++ .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 10 ++++++++++ .../incremental/pureKotlin/overloadInlined/build.log | 11 +++++++++++ .../incremental/pureKotlin/overloadInlined/dummy.kt | 1 + .../pureKotlin/overloadInlined/dummy.kt.touch | 0 .../pureKotlin/overloadInlined/overloaded.kt | 2 ++ .../pureKotlin/overloadInlined/overloadedInline.kt | 3 +++ .../pureKotlin/overloadInlined/useOverloaded.kt | 3 +++ .../pureKotlin/overloadInlined/useOverloadedInline.kt | 3 +++ .../pureKotlin/secondaryConstructorInlined/Err.kt | 4 ++++ .../pureKotlin/secondaryConstructorInlined/build.log | 11 +++++++++++ .../secondaryConstructorInlined/createErr.kt | 3 +++ .../pureKotlin/secondaryConstructorInlined/dummy.kt | 1 + .../secondaryConstructorInlined/dummy.kt.touch | 0 .../secondaryConstructorInlined/useCreateErr.kt | 3 +++ 16 files changed, 75 insertions(+) create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch create mode 100644 jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt 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 57abcc047e3..d341fcebaba 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 @@ -361,6 +361,11 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa runTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); } + @TestMetadata("overloadInlined") + public void testOverloadInlined() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/overloadInlined/"); + } + @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); @@ -551,6 +556,11 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("secondaryConstructorInlined") + public void testSecondaryConstructorInlined() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); + } + @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); 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 0eaf723ebbe..143aae7ad6f 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 @@ -361,6 +361,11 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement runTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); } + @TestMetadata("overloadInlined") + public void testOverloadInlined() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/overloadInlined/"); + } + @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); @@ -551,6 +556,11 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("secondaryConstructorInlined") + public void testSecondaryConstructorInlined() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); + } + @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); 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 4f411008224..0656fe495d5 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 @@ -909,6 +909,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { runTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); } + @TestMetadata("overloadInlined") + public void testOverloadInlined() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/overloadInlined/"); + } + @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); @@ -1099,6 +1104,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("secondaryConstructorInlined") + public void testSecondaryConstructorInlined() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); + } + @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log new file mode 100644 index 00000000000..2f4d6edd44c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/DummyKt.class + out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: + src/dummy.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt new file mode 100644 index 00000000000..3f0c1c77242 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt @@ -0,0 +1 @@ +fun dummy() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt new file mode 100644 index 00000000000..fb56a46b7a3 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt @@ -0,0 +1,2 @@ +fun overloaded(x: Int) {} +fun overloaded(s: String) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt new file mode 100644 index 00000000000..ed0031e1a7e --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt @@ -0,0 +1,3 @@ +inline fun overloadedInline() { + overloaded("overloadedInline") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt new file mode 100644 index 00000000000..d7def58140a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt @@ -0,0 +1,3 @@ +fun useOverloaded() { + overloaded("useOverloadedInline") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt new file mode 100644 index 00000000000..df6229de93f --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt @@ -0,0 +1,3 @@ +fun useOverloadedInline() { + overloadedInline() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt new file mode 100644 index 00000000000..32814adc2ef --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt @@ -0,0 +1,4 @@ +class Err constructor(msg: String?, unused: Any?) { + constructor() : this(null, null) + constructor(msg: String) : this(msg, null) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log new file mode 100644 index 00000000000..2f4d6edd44c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/DummyKt.class + out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: + src/dummy.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt new file mode 100644 index 00000000000..e63a8fa372c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt @@ -0,0 +1,3 @@ +inline fun createErr() { + Err("createErr") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt new file mode 100644 index 00000000000..3f0c1c77242 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt @@ -0,0 +1 @@ +fun dummy() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt new file mode 100644 index 00000000000..b8650c4ca7c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt @@ -0,0 +1,3 @@ +fun useCreateErr() { + createErr() +} \ No newline at end of file