From 448f07e6ac36338d2b55de0e81735e4c776c45b8 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 22 Oct 2013 21:23:30 +0200
Subject: [PATCH] testdata for IDEA-60836

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

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA60836.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA60836.java
new file mode 100644
index 000000000000..1902e1b5b277
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA60836.java
@@ -0,0 +1,29 @@
+import java.util.*;
+public class IdeaGenericsTest {
+    interface Animal<T extends Animal<T>> {
+        List<T> getFriends();
+    }
+
+    class Dog implements Animal<Dog> {
+        public List<Dog> getFriends() {
+            return null;
+        }
+    }
+
+    class Cat implements Animal<Cat> {
+        public List<Cat> getFriends() {
+            return null;
+        }
+    }
+
+    void mixAnimals() {
+        ArrayList<Dog> dogs = null;
+        ArrayList<Cat> cats = null;
+
+        <error descr="Inferred type 'java.util.ArrayList<IdeaGenericsTest.Dog>' for type parameter 'V' is not within its bound; should extend 'java.util.ArrayList<IdeaGenericsTest.Cat>'">makeFriends(cats, dogs)</error>;
+    }
+
+    private<T extends Animal<T>, V extends ArrayList<T>> void makeFriends(ArrayList<T> someAnimals, V otherAnimals) {
+        someAnimals.add(otherAnimals.get(0));
+    }
+}
\ 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 78079281c9fe..04a688be61b6 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
@@ -326,6 +326,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testIDEA114894() { doTest5(false); }
   public void testIDEA60818() { doTest5(false); }
   public void testIDEA63331() { doTest5(false); }
+  public void testIDEA60836() { doTest5(false); }
 
   public void testJavaUtilCollections_NoVerify() throws Exception {
     PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));