From 28c4cbbda4488ee44b5460b84d0c52edd8cc200c Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Mon, 30 Apr 2018 14:52:44 +0200 Subject: [PATCH] adapted additional tests to refactored spring indexer mechanics --- .../DataRepositorySymbolProviderTest.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java index c08097124..7782ffb3c 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java @@ -16,10 +16,15 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.util.Iterator; import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import org.eclipse.lsp4j.SymbolInformation; +import org.eclipse.lsp4j.TextDocumentIdentifier; import org.junit.Before; import org.junit.Test; +import org.springframework.ide.vscode.boot.java.utils.SpringIndexer; +import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.project.harness.BootJavaLanguageServerHarness; import org.springframework.ide.vscode.project.harness.ProjectsHarness; @@ -29,19 +34,28 @@ import org.springframework.ide.vscode.project.harness.ProjectsHarness; public class DataRepositorySymbolProviderTest { private BootJavaLanguageServerHarness harness; + private SpringIndexer indexer; + private File directory; @Before public void setup() throws Exception { harness = BootJavaLanguageServerHarness.builder().build(); + + harness.intialize(null); + indexer = harness.getServerWrapper().getComponents().getSpringIndexer(); + + directory = new File(ProjectsHarness.class.getResource("/test-projects/test-spring-data-symbols/").toURI()); + String projectDir = directory.toURI().toString(); + IJavaProject project = harness.getServerWrapper().getComponents().getProjectFinder().find(new TextDocumentIdentifier(projectDir)).get(); + + CompletableFuture initProject = indexer.initializeProject(project); + initProject.get(5, TimeUnit.SECONDS); } @Test public void testSimpleReppositorySymbol() throws Exception { - harness.intialize(new File(ProjectsHarness.class.getResource("/test-projects/test-spring-data-symbols/").toURI())); - File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-spring-data-symbols/").toURI()); - String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString(); - List symbols = getSymbols(docUri); + List symbols = indexer.getSymbols(docUri); assertEquals(1, symbols.size()); assertTrue(containsSymbol(symbols, "@+ 'customerRepository' (Customer) Repository", docUri, 6, 17, 6, 35)); } @@ -63,7 +77,4 @@ public class DataRepositorySymbolProviderTest { return false; } - private List getSymbols(String docUri) { - return harness.getServerWrapper().getComponents().getSpringIndexer().getSymbols(docUri); - } }