From 085785aa574792c170725793ca9db75d177980e1 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 13 Dec 2017 17:58:59 +0100
Subject: [PATCH] fix test for incompatible test data

---
 .../com/intellij/java/psi/resolve/ResolveMethod15Test.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveMethod15Test.java b/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveMethod15Test.java
index 356fb8c930ee..1142e4f48b3f 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveMethod15Test.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveMethod15Test.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.java.psi.resolve;
 
+import com.intellij.codeInsight.TargetElementUtil;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.*;
@@ -22,6 +23,8 @@ import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NonNls;
 
+import java.util.Collection;
+
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertThat;
 
@@ -440,7 +443,9 @@ public class ResolveMethod15Test extends Resolve15TestCase {
 
   public void testTestGenericMethodOverloading2() throws Exception{
     PsiReference ref = configureByFile();
-    PsiElement target = ref.resolve();
+    Collection<PsiElement> candidates = TargetElementUtil.getInstance().getTargetCandidates(ref);
+    assertOneElement(candidates);
+    PsiElement target = candidates.iterator().next();
     assertThat(target, instanceOf(PsiMethod.class));
     assertThat(target.getParent(), instanceOf(PsiClass.class));
     assertEquals("A", ((NavigationItem)target.getParent()).getName());