diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java index 0f618fd23..2e05bd275 100644 --- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java +++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java @@ -46,6 +46,8 @@ import org.springframework.ide.vscode.languageserver.testharness.LanguageServerH import com.google.common.collect.ImmutableMultiset; import com.google.common.collect.ImmutableSet; +import static org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness.*; + public class BoshEditorTest { LanguageServerHarness harness; @@ -1001,10 +1003,7 @@ public class BoshEditorTest { assertEquals(1, completions.size()); CompletionItem c = completions.get(0); c = harness.resolveCompletionItem(c); - assertContains("Couldn't connect to bosh", c.getDocumentation().getLeft()); - System.out.println("label = " + c.getLabel()); - System.out.println("detail = " + c.getDetail()); - System.out.println("doc = " + c.getDocumentation()); + assertContains("Couldn't connect to bosh", getDocString(c)); } @SuppressWarnings("unchecked") @@ -1414,7 +1413,7 @@ public class BoshEditorTest { ); CompletionItem completion = editor.assertCompletionLabels("TimeoutException").get(0); completion = harness.resolveCompletionItem(completion); - assertContains("Reading cloud config timed out", completion.getDocumentation().getLeft()); + assertContains("Reading cloud config timed out", getDocString(completion)); } @Test public void reconcileNetworkName() throws Exception { 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 656b2a725..6e30ae565 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 @@ -56,6 +56,8 @@ import com.google.common.collect.ImmutableList; import reactor.core.publisher.Flux; +import static org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness.*; + public class Editor { public static final Predicate RELAXED_COMPLETION @@ -653,7 +655,7 @@ public class Editor { assertEquals(expectDetail, it.getDetail()); } if (expectDocSnippet!=null) { - assertContains(expectDocSnippet, it.getDocumentation().getLeft()); + assertContains(expectDocSnippet, getDocString(it)); } return it; } diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java index b8cb31643..602a3c820 100644 --- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java +++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java @@ -606,10 +606,10 @@ public class LanguageServerHarness { } public static void assertDocumentation(String expected, CompletionItem completion) { - assertEquals(expected, getDocAsString(completion)); + assertEquals(expected, getDocString(completion)); } - private static String getDocAsString(CompletionItem completion) { + public static String getDocString(CompletionItem completion) { if (completion!=null) { Either doc = completion.getDocumentation(); if (doc.isLeft()) {