From 840825704a61bfb099b4d7f1dd0e371883329a31 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 20 Oct 2017 20:34:12 +0300 Subject: [PATCH] Misc: Skip duplicates in navigation tests --- .../multiModule/expectClassSuperclass/common/common.kt | 1 - .../kotlin/idea/navigation/NavigationTestUtils.java | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/testData/navigation/implementations/multiModule/expectClassSuperclass/common/common.kt b/idea/testData/navigation/implementations/multiModule/expectClassSuperclass/common/common.kt index dc8b3ebe6bf..944f6e6b8ee 100644 --- a/idea/testData/navigation/implementations/multiModule/expectClassSuperclass/common/common.kt +++ b/idea/testData/navigation/implementations/multiModule/expectClassSuperclass/common/common.kt @@ -8,7 +8,6 @@ class ExpectedChildChild : ExpectedChild() class SimpleChild : SimpleParent() -// REF: [common] (test).ExpectedChild // REF: [common] (test).ExpectedChild // REF: [common] (test).ExpectedChildChild // REF: [common] (test).SimpleChild diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.java index 59612ca58e7..ee7a1847b94 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.java @@ -33,8 +33,10 @@ import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import com.intellij.util.PathUtil; import com.intellij.util.containers.MultiMap; import junit.framework.TestCase; +import kotlin.collections.ArraysKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.util.ReferenceUtils; import org.junit.Assert; @@ -68,8 +70,9 @@ public final class NavigationTestUtils { Collections.sort(expectedReferences); if (gotoData != null) { + List distinctTargets = ArraysKt.distinctBy(gotoData.targets, element -> LightClassUtilsKt.getUnwrapped(element)); // Transform given reference result to strings - List psiElements = Lists.transform(Arrays.asList(gotoData.targets), new Function() { + List psiElements = Lists.transform(distinctTargets, new Function() { @Override public String apply(@Nullable PsiElement element) { Assert.assertNotNull(element);