From 335c3f450687de9ae00e2dba07824293aeb83065 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 23 Oct 2014 18:01:10 +0400 Subject: [PATCH] Tests with renamed method, incremental compilation between Kotlin and Java. --- .../build/IncrementalJpsTestGenerated.java | 57 ++++++++++++------- .../methodRenamed/JavaClass.java | 5 ++ .../methodRenamed/JavaClass.java.new | 5 ++ .../javaUsedInKotlin/methodRenamed/build.log | 18 ++++++ .../methodRenamed/willBeResolvedToOther.kt | 6 ++ .../methodRenamed/willBeUnresolved.kt | 3 + .../funRenamed/WillBeUnresolved.java | 5 ++ .../kotlinUsedInJava/funRenamed/build.log | 14 +++++ .../kotlinUsedInJava/funRenamed/fun.kt | 5 ++ .../kotlinUsedInJava/funRenamed/fun.kt.new | 5 ++ .../propertyRenamed/WillBeUnresolved.java | 5 ++ .../propertyRenamed/build.log | 14 +++++ .../kotlinUsedInJava/propertyRenamed/prop.kt | 3 + .../propertyRenamed/prop.kt.new | 3 + 14 files changed, 128 insertions(+), 20 deletions(-) create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt create mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index a0845818323..81773acfea9 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -290,99 +290,116 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); doTest(fileName); } - + } - + @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); doTest(fileName); } - + @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); doTest(fileName); } - + @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); doTest(fileName); } - + @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); doTest(fileName); } - + + @TestMetadata("methodRenamed") + public void testMethodRenamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); doTest(fileName); } - + } - + @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInKotlinUsedInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); doTest(fileName); } - + @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); doTest(fileName); } - + @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); doTest(fileName); } - + @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); doTest(fileName); } - + + @TestMetadata("funRenamed") + public void testFunRenamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); doTest(fileName); } - - } + @TestMetadata("propertyRenamed") + public void testPropertyRenamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); + doTest(fileName); + } + + } } } diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java new file mode 100644 index 00000000000..588b1e9ad44 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java @@ -0,0 +1,5 @@ +public class JavaClass { + public void f(String s) { + + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new new file mode 100644 index 00000000000..43dd2ac8345 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new @@ -0,0 +1,5 @@ +public class JavaClass { + public void g(String s) { + + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log new file mode 100644 index 00000000000..7dcafae29b6 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files +Cleaning output files: +out/production/module/_DefaultPackage$willBeResolvedToOther$*$willBeResolvedToOther$1.class +out/production/module/_DefaultPackage$willBeResolvedToOther$*.class +out/production/module/_DefaultPackage$willBeUnresolved$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/willBeResolvedToOther.kt +src/willBeUnresolved.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Unresolved reference: f diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt new file mode 100644 index 00000000000..72082d09fc6 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt @@ -0,0 +1,6 @@ +fun willBeResolvedToOther() { + fun JavaClass.f(s: String) { + } + + JavaClass().f(":|") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt new file mode 100644 index 00000000000..ee4c233631a --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt @@ -0,0 +1,3 @@ +fun willBeUnresolved() { + JavaClass().f(":(") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java new file mode 100644 index 00000000000..7d43b904ef1 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java @@ -0,0 +1,5 @@ +class WillBeUnresolved { + void main() { + test.TestPackage.f(":("); + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log new file mode 100644 index 00000000000..0c78e0c1820 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files +Compiling files: +src/WillBeUnresolved.java +End of files +COMPILATION FAILED +java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +symbol : method f(java.lang.String) +location: class test.TestPackage \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt new file mode 100644 index 00000000000..470b3d1fd17 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(s: String) { + +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new new file mode 100644 index 00000000000..af45b699cb1 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new @@ -0,0 +1,5 @@ +package test + +fun g(s: String) { + +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java new file mode 100644 index 00000000000..38666b4ad3c --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java @@ -0,0 +1,5 @@ +class WillBeUnresolved { + void main() { + test.TestPackage.getProp(); + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log new file mode 100644 index 00000000000..59f1f29a253 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/TestPackage$prop$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/prop.kt +End of files +Compiling files: +src/WillBeUnresolved.java +End of files +COMPILATION FAILED +java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +symbol : method getProp() +location: class test.TestPackage diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt new file mode 100644 index 00000000000..43ed22b0657 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt @@ -0,0 +1,3 @@ +package test + +val prop = ":)" \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new new file mode 100644 index 00000000000..af84143993b --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new @@ -0,0 +1,3 @@ +package test + +val prop1 = ":)" \ No newline at end of file