Revert changes

GitOrigin-RevId: 4d41fe95474b321eff5e0bd0e7d799198ddf29c0
This commit is contained in:
Andrey.Cherkasov
2021-12-30 03:36:17 +04:00
committed by intellij-monorepo-bot
parent 345977a17c
commit e6a9153c9e

View File

@@ -16,7 +16,6 @@ import com.intellij.psi.PsiFileSystemItem;
import com.intellij.testFramework.UsefulTestCase;
import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
import junit.framework.TestCase;
import kotlin.collections.ArraysKt;
@@ -26,6 +25,7 @@ import org.jetbrains.kotlin.test.util.ReferenceUtils;
import org.junit.Assert;
import java.util.*;
import java.util.stream.Collectors;
public final class NavigationTestUtils {
private NavigationTestUtils() {
@@ -43,13 +43,14 @@ public final class NavigationTestUtils {
String documentText = editor.getDocument().getText();
// Get expected references from the tested document
List<String> expectedReferences = InTextDirectivesUtils.findListWithPrefixes(documentText, "// REF:");
expectedReferences.replaceAll(expectedText -> {
for (int i = 0; i < expectedReferences.size(); i++) {
String expectedText = expectedReferences.get(i);
expectedText = expectedText.replace("\\n", "\n");
if (!expectedText.startsWith("<")) {
expectedText = PathUtil.toSystemDependentName(expectedText).replace("//", "/");
}
return expectedText;
});
expectedReferences.set(i, expectedText);
}
Collections.sort(expectedReferences);
@@ -62,10 +63,10 @@ public final class NavigationTestUtils {
targets = Arrays.asList(gotoData.targets);
}
// Transform given reference result to strings
List<String> psiElements = ContainerUtil.map(targets, element -> {
List<String> psiElements = targets.stream().map(element -> {
Assert.assertNotNull(element);
return ReferenceUtils.renderAsGotoImplementation(element, renderModule);
});
}).collect(Collectors.toList());
// Compare
UsefulTestCase.assertOrderedEquals(Ordering.natural().sortedCopy(psiElements), expectedReferences);