From e8ea496b8af9671b0ece876470b4a472be6a531e Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 16 Jan 2019 17:04:55 +0100 Subject: [PATCH] enable first unit tests for xml config indexing --- .../boot/java/utils/test/SpringIndexerTest.java | 1 + .../utils/test/SpringIndexerXMLProjectTest.java | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java index 657641880..840d3323b 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java @@ -59,6 +59,7 @@ public class SpringIndexerTest { @Before public void setup() throws Exception { harness.intialize(null); + indexer.configureIndexer(false); directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI()); projectDir = directory.toURI().toString(); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java index a9c9be0d4..5cc57a32f 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java @@ -54,6 +54,7 @@ public class SpringIndexerXMLProjectTest { @Before public void setup() throws Exception { harness.intialize(null); + indexer.configureIndexer(true); directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-xml-project/").toURI()); projectDir = directory.toURI().toString(); @@ -69,12 +70,12 @@ public class SpringIndexerXMLProjectTest { public void testScanningSimpleSpringXMLConfig() throws Exception { List allSymbols = indexer.getAllSymbols(""); -// assertEquals(3, allSymbols.size()); -// -// String docUri = directory.toPath().resolve("config/simple-spring-config.xml").toUri().toString(); -// assertTrue(containsSymbol(allSymbols, "@+ 'transactionManager' DataSourceTransactionManager", docUri, 7, 143, 7, 144)); -// assertTrue(containsSymbol(allSymbols, "@+ 'jdbcTemplate' JdbcTemplate", docUri, 9, 84, 9, 85)); -// assertTrue(containsSymbol(allSymbols, "@+ 'namedParameterJdbcTemplate' NamedParameterJdbcTemplate", docUri, 14, 91, 14, 92)); + assertEquals(3, allSymbols.size()); + + String docUri = directory.toPath().resolve("config/simple-spring-config.xml").toUri().toString(); + assertTrue(containsSymbol(allSymbols, "@+ 'transactionManager' DataSourceTransactionManager", docUri, 7, 143, 7, 144)); + assertTrue(containsSymbol(allSymbols, "@+ 'jdbcTemplate' JdbcTemplate", docUri, 9, 84, 9, 85)); + assertTrue(containsSymbol(allSymbols, "@+ 'namedParameterJdbcTemplate' NamedParameterJdbcTemplate", docUri, 14, 91, 14, 92)); } private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {