Skip to content

Commit f7e9346

Browse files
martinlippertmartinlippert
committed
allow tests to deal correctly with presence of new stereotype nodes
1 parent 56f6d95 commit f7e9346

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringIndexStructureTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void testStructureRestController() {
123123

124124
// document node
125125
DocumentElement document = springIndex.getDocument(docUri);
126-
List<SpringIndexElement> docChildren = document.getChildren();
126+
List<Bean> docChildren = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
127127
assertEquals(1, docChildren.size());
128128

129129
// rest controller node

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringIndexerBeanRegistrarTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.ide.vscode.boot.java.Annotations;
3434
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
3535
import org.springframework.ide.vscode.commons.protocol.spring.Bean;
36+
import org.springframework.ide.vscode.commons.protocol.spring.BeanMethodContainerElement;
3637
import org.springframework.ide.vscode.commons.protocol.spring.BeanRegistrarElement;
3738
import org.springframework.ide.vscode.commons.protocol.spring.DocumentElement;
3839
import org.springframework.ide.vscode.commons.protocol.spring.SpringIndexElement;
@@ -78,9 +79,8 @@ void testSimpleBeanRegistration() throws Exception {
7879
assertFalse(Arrays.stream(beansOfDoc).anyMatch(bean -> bean.getName().equals("myBeanRegistrar")));
7980

8081
DocumentElement document = springIndex.getDocument(docUri);
81-
List<SpringIndexElement> docChildren = document.getChildren();
82+
List<BeanRegistrarElement> docChildren = SpringMetamodelIndex.getNodesOfType(BeanRegistrarElement.class, List.of(document));
8283
assertEquals(1, docChildren.size());
83-
assertTrue(docChildren.get(0) instanceof BeanRegistrarElement);
8484

8585
List<SpringIndexElement> children = docChildren.get(0).getChildren();
8686
assertEquals(4, children.size());

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexerBeansTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,11 +553,10 @@ void testBeanMethodsWithoutConfiguration() {
553553
String docUri = directory.toPath().resolve("src/main/java/org/test/BeanMethodsWithoutConfiguration.java").toUri().toString();
554554

555555
DocumentElement document = springIndex.getDocument(docUri);
556-
List<SpringIndexElement> docChildren = document.getChildren();
556+
List<BeanMethodContainerElement> docChildren = SpringMetamodelIndex.getNodesOfType(BeanMethodContainerElement.class, List.of(document));
557557
assertEquals(1, docChildren.size());
558-
assertTrue(docChildren.get(0) instanceof BeanMethodContainerElement);
559558

560-
BeanMethodContainerElement container = (BeanMethodContainerElement) docChildren.get(0);
559+
BeanMethodContainerElement container = docChildren.get(0);
561560
assertEquals(docUri, container.getLocation().getUri());
562561
assertEquals("org.test.BeanMethodsWithoutConfiguration", container.getType());
563562
assertFalse(container instanceof SymbolElement);

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositoryIndexElementsTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*******************************************************************************/
1111
package org.springframework.ide.vscode.boot.java.data.test;
1212

13-
import static org.junit.Assert.assertNull;
13+
import static org.junit.Assert.assertTrue;
1414
import static org.junit.jupiter.api.Assertions.assertEquals;
1515

1616
import java.io.File;
@@ -73,8 +73,8 @@ void testSimpleRepositoryElements() throws Exception {
7373
String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString();
7474

7575
DocumentElement document = springIndex.getDocument(docUri);
76-
List<SpringIndexElement> children = document.getChildren();
77-
Bean repositoryElement = (Bean) children.get(0);
76+
List<Bean> children = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
77+
Bean repositoryElement = children.get(0);
7878
assertEquals("customerRepository", repositoryElement.getName());
7979
assertEquals(1, children.size());
8080

@@ -93,8 +93,8 @@ void testSimpleQueryMethodElements() throws Exception {
9393
String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString();
9494

9595
DocumentElement document = springIndex.getDocument(docUri);
96-
List<SpringIndexElement> children = document.getChildren();
97-
Bean repositoryElement = (Bean) children.get(0);
96+
List<Bean> children = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
97+
Bean repositoryElement = children.get(0);
9898

9999
List<SpringIndexElement> queryMethods = repositoryElement.getChildren();
100100
assertEquals(1, queryMethods.size());
@@ -108,8 +108,8 @@ void testSimpleQueryMethodElementsWithTwoParams() throws Exception {
108108
String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepositoryWithTwoParamsMethod.java").toUri().toString();
109109

110110
DocumentElement document = springIndex.getDocument(docUri);
111-
List<SpringIndexElement> children = document.getChildren();
112-
Bean repositoryElement = (Bean) children.get(0);
111+
List<Bean> children = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
112+
Bean repositoryElement = children.get(0);
113113

114114
List<SpringIndexElement> queryMethods = repositoryElement.getChildren();
115115
assertEquals(1, queryMethods.size());
@@ -123,8 +123,8 @@ void testQueryMethodElementWithQueryString() throws Exception {
123123
String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepositoryWithQuery.java").toUri().toString();
124124

125125
DocumentElement document = springIndex.getDocument(docUri);
126-
List<SpringIndexElement> children = document.getChildren();
127-
Bean repositoryElement = (Bean) children.get(0);
126+
List<Bean> children = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
127+
Bean repositoryElement = children.get(0);
128128

129129
List<SpringIndexElement> queryMethods = repositoryElement.getChildren();
130130
assertEquals(1, queryMethods.size());
@@ -139,7 +139,7 @@ void testNoRepositoryBeanAnnotationResultsInNoBeanIndexElement() throws Exceptio
139139
String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepositoryParentInterface.java").toUri().toString();
140140

141141
DocumentElement document = springIndex.getDocument(docUri);
142-
assertNull(document); // nothing in the doc, therefore not even the doc node is around
142+
assertTrue(document == null || SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document)).size() == 0);
143143
}
144144

145145
@Test
@@ -148,8 +148,8 @@ void testQueryMethodsFromParentInterfaces() throws Exception {
148148
String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepositoryWithParentInterfaces.java").toUri().toString();
149149

150150
DocumentElement document = springIndex.getDocument(docUri);
151-
List<SpringIndexElement> children = document.getChildren();
152-
Bean repositoryElement = (Bean) children.get(0);
151+
List<Bean> children = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
152+
Bean repositoryElement = children.get(0);
153153

154154
List<SpringIndexElement> queryMethods = repositoryElement.getChildren();
155155
assertEquals(2, queryMethods.size());

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/events/test/SpringIndexerEventsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.springframework.ide.vscode.boot.java.events.EventPublisherIndexElement;
4444
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
4545
import org.springframework.ide.vscode.commons.protocol.spring.Bean;
46+
import org.springframework.ide.vscode.commons.protocol.spring.BeanMethodContainerElement;
4647
import org.springframework.ide.vscode.commons.protocol.spring.DocumentElement;
4748
import org.springframework.ide.vscode.commons.protocol.spring.SpringIndexElement;
4849
import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
@@ -141,9 +142,8 @@ void testEventListenerIndexElementForEventListenerInterfaceImplementation() thro
141142
assertEquals(1, beans.length);
142143

143144
DocumentElement document = springIndex.getDocument(docUri);
144-
List<SpringIndexElement> docChildren = document.getChildren();
145+
List<Bean> docChildren = SpringMetamodelIndex.getNodesOfType(Bean.class, List.of(document));
145146
assertEquals(1, docChildren.size());
146-
assertTrue(docChildren.get(0) instanceof Bean);
147147

148148
Bean listenerComponentBean = Arrays.stream(beans).filter(bean -> bean.getName().equals("eventListenerPerInterface")).findFirst().get();
149149
assertEquals("com.example.events.demo.EventListenerPerInterface", listenerComponentBean.getType());

0 commit comments

Comments
 (0)