From ef0e601398fd364cf5953e8801cf9a79275e5ba5 Mon Sep 17 00:00:00 2001 From: aboyko Date: Wed, 26 Apr 2023 22:40:24 -0400 Subject: [PATCH] Switch back link target assert to comparing sets --- .../ide/vscode/languageserver/testharness/Editor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java index e318a12ca..69deca8b1 100644 --- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java +++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java @@ -20,6 +20,7 @@ import static org.springframework.ide.vscode.languageserver.testharness.TestAsse import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashSet; @@ -785,7 +786,7 @@ public class Editor { return "Editor(\n"+getText()+"\n)"; } - public void assertLinkTargets(String hoverOver, List expectedLocations) throws Exception { + public void assertLinkTargets(String hoverOver, Collection expectedLocations) throws Exception { int pos = getRawText().indexOf(hoverOver); if (pos>=0) { pos += hoverOver.length() / 2; @@ -795,10 +796,10 @@ public class Editor { assertLinkTargets(doc.toPosition(pos), expectedLocations); } - public void assertLinkTargets(Position pos, List expectedLocations) throws Exception { + public void assertLinkTargets(Position pos, Collection expectedLocations) throws Exception { DefinitionParams params = new DefinitionParams(new TextDocumentIdentifier(getUri()), pos); List definitions = harness.getDefinitions(params); - assertEquals(ImmutableList.copyOf(expectedLocations), ImmutableList.copyOf(definitions)); + assertEquals(ImmutableSet.copyOf(expectedLocations), ImmutableSet.copyOf(definitions)); }