From 69588b4a641ae3ddd113570a73cc96f133ec97b9 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 9 Feb 2015 16:48:47 +0100
Subject: [PATCH] multiple jdks: test method signatures hierarchy

---
 .../multipleJdks/java7/p/NoOverriding.java         | 14 ++++++++++++++
 .../multipleJdks/java8/p/NoOverriding.java         |  5 +++++
 .../codeInsight/MultipleJdksHighlightingTest.java  |  5 +++++
 3 files changed, 24 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/multipleJdks/java7/p/NoOverriding.java
 create mode 100644 java/java-tests/testData/codeInsight/multipleJdks/java8/p/NoOverriding.java

diff --git a/java/java-tests/testData/codeInsight/multipleJdks/java7/p/NoOverriding.java b/java/java-tests/testData/codeInsight/multipleJdks/java7/p/NoOverriding.java
new file mode 100644
index 000000000000..219a93539fc9
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/multipleJdks/java7/p/NoOverriding.java
@@ -0,0 +1,14 @@
+package p;
+
+abstract class B extends A {
+  public static String getOrDefault(Object key, String defaultValue) {
+    return null;
+  }
+}
+
+abstract class C extends A {
+  <error descr="Method does not override method from its superclass">@Override</error>
+  public String getOrDefault(Object key, String defaultValue) {
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/multipleJdks/java8/p/NoOverriding.java b/java/java-tests/testData/codeInsight/multipleJdks/java8/p/NoOverriding.java
new file mode 100644
index 000000000000..477a992f88cc
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/multipleJdks/java8/p/NoOverriding.java
@@ -0,0 +1,5 @@
+package p;
+import java.util.Map;
+
+public abstract class A implements Map<String, String> {}
+
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
index 4167b01e2bf2..7f8a1b869b16 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
@@ -126,6 +126,11 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase {
     doTestWithoutLibrary();
   }
 
+  @Bombed(day = 20, month = Calendar.FEBRUARY)
+  public void testNoOverriding() throws Exception {
+    doTestWithoutLibrary();
+  }
+
   private void doTestWithoutLibrary() {
     final String name = getTestName(false);
     myFixture.configureByFiles("java7/p/" + name + ".java", "java8/p/" + name + ".java");