From b40ec2d2d171ee7ac81b9ddc26f87e67598b271e Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 23 Oct 2012 19:01:01 +0200
Subject: [PATCH] testdata for IDEA-57411

---
 .../genericsHighlighting/IDEA57411.java        | 18 ++++++++++++++++++
 .../daemon/GenericsHighlightingTest.java       |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57411.java

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57411.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57411.java
new file mode 100644
index 000000000000..0ca6f6ee8f86
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57411.java
@@ -0,0 +1,18 @@
+class A<S> {
+    <T> T foo(T x, S y){
+        return x;
+    }
+}
+
+class B<S> extends A<S> {
+    Object foo(Object x, Object y){
+        return x;
+    }
+}
+
+<error descr="'foo(T, S)' in 'A' clashes with 'foo(Object, Object)' in 'B'; both methods have same erasure, yet neither overrides the other">class C extends B<String></error> {
+    @Override
+    <T> T foo(T x, String y) {
+        <error descr="Incompatible types. Found: 'java.lang.Object', required: 'T'">return super.foo(x, y);</error>
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
index 18bfe93c34a5..847b1c65ac95 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
@@ -161,6 +161,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testIDEA57533() throws Exception { doTest(false); }
   public void testIDEA57509() throws Exception { doTest(false); }
   public void testIDEA57410() throws Exception { doTest(false); }
+  public void testIDEA57411() throws Exception { doTest(false); }
   public void testInconvertibleTypes() throws Exception { doTest(false); }
   public void testIncompatibleReturnType() throws Exception { doTest(false); }
   public void testContinueInferenceAfterFirstRawResult() throws Exception { doTest(false); }