From cfea16328e9870336e55f8b0da37b2210c67889e Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 22 Jan 2015 17:37:53 +0100
Subject: [PATCH] multiple jdks test of correct check of inheritance with
 different type arguments

---
 .../java7/p/GenericCallableWithDifferentTypeArgs.java      | 6 ++++++
 .../java8/p/GenericCallableWithDifferentTypeArgs.java      | 5 +++++
 .../intellij/codeInsight/MultipleJdksHighlightingTest.java | 7 +++++++
 3 files changed, 18 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/multipleJdks/java7/p/GenericCallableWithDifferentTypeArgs.java
 create mode 100644 java/java-tests/testData/codeInsight/multipleJdks/java8/p/GenericCallableWithDifferentTypeArgs.java

diff --git a/java/java-tests/testData/codeInsight/multipleJdks/java7/p/GenericCallableWithDifferentTypeArgs.java b/java/java-tests/testData/codeInsight/multipleJdks/java7/p/GenericCallableWithDifferentTypeArgs.java
new file mode 100644
index 000000000000..9251d93caba2
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/multipleJdks/java7/p/GenericCallableWithDifferentTypeArgs.java
@@ -0,0 +1,6 @@
+package p;
+import java.io.Closeable;
+import java.util.concurrent.*;
+
+<error descr="'java.util.concurrent.Callable' cannot be inherited with different type arguments: 'java.lang.AutoCloseable' and 'java.io.Closeable'">abstract class B extends A implements Callable<Closeable></error> {
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/multipleJdks/java8/p/GenericCallableWithDifferentTypeArgs.java b/java/java-tests/testData/codeInsight/multipleJdks/java8/p/GenericCallableWithDifferentTypeArgs.java
new file mode 100644
index 000000000000..e92d71c7732f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/multipleJdks/java8/p/GenericCallableWithDifferentTypeArgs.java
@@ -0,0 +1,5 @@
+package p;
+import java.util.concurrent.*;
+
+public abstract class A implements Callable<AutoCloseable> {
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
index a80d40064f96..101a93aee41e 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
@@ -117,6 +117,13 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase {
     myFixture.checkHighlighting();
   }
 
+  @Bombed(month = Calendar.FEBRUARY, day = 20)
+  public void testGenericCallableWithDifferentTypeArgs() throws Exception {
+    final String name = getTestName(false);
+    myFixture.configureByFiles("java7/p/" + name + ".java", "java8/p/" + name + ".java");
+    myFixture.checkHighlighting();
+  }
+
   private void doTest() {
     final String name = getTestName(false);
     for (Module module : new Module[] {myJava7Module, myJava8Module}) {