ambiguous method calls: conflict resolver, tests

(IDEA-25097)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/ambiguousIDEA25097/pck/AmbiguousMethodCall.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pck;
+class Generics<T> {
+  public void render(T t) {
+    System.out.println("generic");
+  }
+
+  public void render(Integer t) {
+    System.out.println("int");
+  }
+
+  static {
+    new Generics<Integer>().render<error descr="Ambiguous method call: both 'Generics.render(Integer)' and 'Generics.render(Integer)' match">(5)</error>;
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingJdk7Test.java

@@ -168,4 +168,8 @@ public class AdvHighlightingJdk7Test extends DaemonAnalyzerTestCase {
   public void testAmbiguousIDEA78027() throws Exception {
     doTestAmbiguous();
   }
+
+  public void testAmbiguousIDEA25097() throws Exception {
+    doTestAmbiguous();
+  }
 }