From b86d7668b05011d11e5a67087896fb8286428aad Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 30 Jun 2014 21:50:34 +0400 Subject: [PATCH] Added hacky checks for accessing compiled functions from our module via package part instead of facade. #KT-4590 fixed Original commit: 65010662742bb8313c047e1d4a1eb73d5dc9c5b7 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 10 ++++++++++ .../incremental/accessingFunctionsViaPackagePart/a.kt | 3 +++ .../incremental/accessingFunctionsViaPackagePart/b.kt | 3 +++ .../accessingFunctionsViaPackagePart/b.kt.new | 3 +++ .../accessingFunctionsViaPackagePart/build.log | 9 +++++++++ .../accessingFunctionsViaPackagePart/other.kt | 3 +++ .../accessingFunctionsViaPackagePart/usage.kt | 5 +++++ .../accessingFunctionsViaPackagePart/usage.kt.new | 5 +++++ .../incremental/accessingPropertiesViaField/a.kt | 3 +++ .../incremental/accessingPropertiesViaField/b.kt | 4 ++++ .../incremental/accessingPropertiesViaField/b.kt.new | 3 +++ .../incremental/accessingPropertiesViaField/build.log | 9 +++++++++ .../incremental/accessingPropertiesViaField/other.kt | 3 +++ .../incremental/accessingPropertiesViaField/usage.kt | 8 ++++++++ .../accessingPropertiesViaField/usage.kt.new | 8 ++++++++ 15 files changed, 79 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 487dbaee338..cc039994a2f 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -32,6 +32,16 @@ import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { + @TestMetadata("accessingFunctionsViaPackagePart") + public void testAccessingFunctionsViaPackagePart() throws Exception { + doTest("jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/"); + } + + @TestMetadata("accessingPropertiesViaField") + public void testAccessingPropertiesViaField() throws Exception { + doTest("jps-plugin/testData/incremental/accessingPropertiesViaField/"); + } + @TestMetadata("allConstants") public void testAllConstants() throws Exception { doTest("jps-plugin/testData/incremental/allConstants/"); diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt new file mode 100644 index 00000000000..0228de5e71d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt new file mode 100644 index 00000000000..f3809d03866 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new new file mode 100644 index 00000000000..f3809d03866 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new @@ -0,0 +1,3 @@ +package test + +fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log new file mode 100644 index 00000000000..ee902811972 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt new file mode 100644 index 00000000000..2ff821a2d52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() = "other" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt new file mode 100644 index 00000000000..db702d74fea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + println(a() + b() + other.other()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new new file mode 100644 index 00000000000..db702d74fea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + println(a() + b() + other.other()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt new file mode 100644 index 00000000000..14b203d66ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt @@ -0,0 +1,3 @@ +package test + +var a = "a" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt new file mode 100644 index 00000000000..ac2faa5147e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt @@ -0,0 +1,4 @@ +// TODO add var +package test + +var b = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new new file mode 100644 index 00000000000..43cf69057ff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new @@ -0,0 +1,3 @@ +package test + +var b = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log new file mode 100644 index 00000000000..5e565b356f6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log @@ -0,0 +1,9 @@ + Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt new file mode 100644 index 00000000000..aeb30beb244 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt @@ -0,0 +1,3 @@ +package other + +var other = "other" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt new file mode 100644 index 00000000000..024de4a9c42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt @@ -0,0 +1,8 @@ +package test + +fun main(args: Array) { + val x = a + b + other.other + a = "aa" + b = "bb" + other.other = "other.other" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new new file mode 100644 index 00000000000..024de4a9c42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new @@ -0,0 +1,8 @@ +package test + +fun main(args: Array) { + val x = a + b + other.other + a = "aa" + b = "bb" + other.other = "other.other" +} \ No newline at end of file