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 ba64f65e805..13886425f8e 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -358,6 +358,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("methodAddedInSuper") + public void testMethodAddedInSuper() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); + doTest(fileName); + } + @TestMetadata("methodRenamed") public void testMethodRenamed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); @@ -411,6 +417,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("methodAddedInSuper") + public void testMethodAddedInSuper() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt new file mode 100644 index 00000000000..34fce1c44ec --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt @@ -0,0 +1,4 @@ +public class Sub: Super() { + private fun y() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java new file mode 100644 index 00000000000..93dd06a5f94 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java @@ -0,0 +1,4 @@ +public class Super { + public void x() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new new file mode 100644 index 00000000000..821c0e89edf --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new @@ -0,0 +1,7 @@ +public class Super { + public void x() { + } + + public void y() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log new file mode 100644 index 00000000000..a44ae0a4d8c --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/Super.class +End of files +Compiling files: +src/Super.java +End of files +Cleaning output files: +out/production/module/Sub.class +End of files +Compiling files: +src/Sub.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Cannot weaken access privilege 'public' for 'y' in 'Super' +Kotlin:ERROR:'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java new file mode 100644 index 00000000000..d3a612801c6 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java @@ -0,0 +1,5 @@ +public class Sub extends Super { + private void y() { + + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt new file mode 100644 index 00000000000..4529a54de25 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt @@ -0,0 +1,4 @@ +public open class Super { + public fun x() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new new file mode 100644 index 00000000000..051e9812972 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new @@ -0,0 +1,7 @@ +public open class Super { + public fun x() { + } + + public fun y() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log new file mode 100644 index 00000000000..739009bbe79 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/Super.class +End of files +Compiling files: +src/Super.kt +End of files +Compiling files: +src/Sub.java +End of files +COMPILATION FAILED +java:ERROR:$PROJECT/src/Sub.java:2: y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file