GH-1652: additional polish

Author: martinlippert

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebConfigCodeLensProviderTest.java

@@ -11,13 +11,15 @@
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -55,7 +57,7 @@ public class WebConfigCodeLensProviderTest {
 
 	@BeforeEach
 	public void setup() throws Exception {
-		testProject = ProjectsHarness.INSTANCE.mavenProject("test-request-mapping-version-support-symbols");
+		testProject = ProjectsHarness.INSTANCE.mavenProject("test-web-config-support");
 		harness.useProject(testProject);
 		harness.intialize(null);
 
@@ -76,8 +78,14 @@ void codeLensOverMethod() throws Exception {
 		Editor editor = harness.newEditor(LanguageId.JAVA, new String(Files.readAllBytes(filePath), StandardCharsets.UTF_8), filePath.toUri().toASCIIString());
 
 		List<CodeLens> cls = editor.getCodeLenses("MappingClassWithMultipleVersions", 1);
-		assertEquals("Web Config - Versioning via Request Header: X-API-Version - Supported Versions: 1", cls.get(0).getCommand().getTitle());
-		assertEquals("Web Config - Path Prefix: /{version} - Versioning via Path Segment: 0 - Supported Versions: 1.1, 1.2", cls.get(1).getCommand().getTitle());
+		
+		Optional<CodeLens> lens1 = cls.stream().filter(lens -> lens.getCommand().getTitle().equals("Web Config - Versioning via Request Header: X-API-Version - Supported Versions: 1")).findFirst();
+		assertTrue(lens1.isPresent());
+
+		Optional<CodeLens> lens2 = cls.stream().filter(lens -> lens.getCommand().getTitle().equals("Web Config - Path Prefix: /{version} - Versioning via Path Segment: 0 - Supported Versions: 1.1, 1.2")).findFirst();
+		assertTrue(lens2.isPresent());
+		
+		assertEquals(2, cls.size());
 	}
 
 }

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-version-support-symbols/.mvn/wrapper/maven-wrapper.properties renamed to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-web-config-support/.mvn/wrapper/maven-wrapper.properties

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.example</groupId>
-	<artifactId>test-request-mapping-version-support-symbols</artifactId>
+	<artifactId>test-web-config-support</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-version-support-symbols/mvnw renamed to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-web-config-support/mvnw

@@ -0,0 +1,4 @@
+spring.mvc.apiversion.supported=1
+#spring.mvc.apiversion.use.path-segment=0
+spring.mvc.apiversion.use.header=X-API-Version
+spring.mvc.apiversion.default=2