Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No getDocumentation().getLeft() directly in test code

Browse Source
This commit is contained in:
Kris De Volder
2018-04-19 13:59:36 -07:00
parent c1f4458c35
commit 052242d46c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
View File

@@ -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<BoshLanguageServer> 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 {

4
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
View File

@@ -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<CompletionItem> 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;
}

4
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
View File

@@ -606,10 +606,10 @@ public class LanguageServerHarness<S extends SimpleLanguageServerWrapper> {
}
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<String, MarkupContent> doc = completion.getDocumentation();
if (doc.isLeft()) {