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

Fix test fails

Browse Source
This commit is contained in:
Kris De Volder
2018-10-09 12:23:15 -07:00
parent 09dfbb5c42
commit 5ecf55af5f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
View File

@@ -221,7 +221,7 @@ public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientA
@Override
public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
log.info("Initializing: "+params);
log.debug("Initializing: "+params);
// multi-root workspace handling
List<WorkspaceFolder> workspaceFolders = getWorkspaceFolders(params);

18
headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServerInitializerTest.java
View File

@@ -20,22 +20,28 @@ import java.nio.file.Paths;
import org.eclipse.lsp4j.InitializeResult;
import org.eclipse.lsp4j.TextDocumentSyncKind;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.ide.vscode.concourse.ConcourseLanguageServerInitializer;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.concourse.bootiful.ConcourseLanguageServerTest;
import org.springframework.ide.vscode.concourse.github.GithubInfoProvider;
import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
import static org.springframework.ide.vscode.commons.yaml.completion.YamlCompletionEngineOptions.*;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@ConcourseLanguageServerTest
public class ConcourseLanguageServerInitializerTest {
public static File getTestResource(String name) throws URISyntaxException {
return Paths.get(ConcourseLanguageServerInitializerTest.class.getResource(name).toURI()).toFile();
}
@Autowired LanguageServerHarness<SimpleLanguageServer> harness;
@MockBean GithubInfoProvider github;
@Test
public void createAndInitializeServerWithWorkspace() throws Exception {
LanguageServerHarness harness = new LanguageServerHarness(() ->
new ConcourseLanguageServerInitializer(Mockito.mock(GithubInfoProvider.class)));
File workspaceRoot = getTestResource("/workspace/");
assertExpectedInitResult(harness.intialize(workspaceRoot));
}
@@ -43,8 +49,6 @@ public class ConcourseLanguageServerInitializerTest {
@Test
public void createAndInitializeServerWithoutWorkspace() throws Exception {
File workspaceRoot = null;
LanguageServerHarness harness = new LanguageServerHarness(() ->
new ConcourseLanguageServerInitializer(Mockito.mock(GithubInfoProvider.class)));
assertExpectedInitResult(harness.intialize(workspaceRoot));
}