From 34424d69ccf64ae7dca6bb74446afa70c8280038 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 2 Mar 2018 11:13:34 +0100 Subject: [PATCH] fixed test to work on Windows too, since method keys are generated differently --- .../WebFluxMappingSymbolProviderTest.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java index 6bef3ae57..f5221e23a 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java @@ -72,22 +72,26 @@ public class WebFluxMappingSymbolProviderTest { WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "@/hello -- GET").get(0); assertEquals("@/hello -- GET", handlerInfo1.getSymbol()); assertEquals("org.test.QuoteHandler", handlerInfo1.getDestinationClass()); - assertEquals("Lorg/test/QuoteHandler;.hello(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo1.getMethodKey()); + assertTrue(handlerInfo1.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo1.getMethodKey().endsWith("QuoteHandler;.hello(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "@/echo -- POST").get(0); assertEquals("@/echo -- POST", handlerInfo2.getSymbol()); assertEquals("org.test.QuoteHandler", handlerInfo2.getDestinationClass()); - assertEquals("Lorg/test/QuoteHandler;.echo(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo2.getMethodKey()); + assertTrue(handlerInfo2.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo2.getMethodKey().endsWith("QuoteHandler;.echo(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "@/quotes -- GET").get(0); assertEquals("@/quotes -- GET", handlerInfo3.getSymbol()); assertEquals("org.test.QuoteHandler", handlerInfo3.getDestinationClass()); - assertEquals("Lorg/test/QuoteHandler;.streamQuotes(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo3.getMethodKey()); + assertTrue(handlerInfo3.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo3.getMethodKey().endsWith("QuoteHandler;.streamQuotes(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); WebfluxHandlerInformation handlerInfo4 = getWebfluxHandler(addons, "@/quotes -- GET").get(1); assertEquals("@/quotes -- GET", handlerInfo4.getSymbol()); assertEquals("org.test.QuoteHandler", handlerInfo4.getDestinationClass()); - assertEquals("Lorg/test/QuoteHandler;.fetchQuotes(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo4.getMethodKey()); + assertTrue(handlerInfo4.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo4.getMethodKey().endsWith("QuoteHandler;.fetchQuotes(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); } @Test @@ -108,17 +112,20 @@ public class WebFluxMappingSymbolProviderTest { WebfluxHandlerInformation handlerInfo1 = getWebfluxHandler(addons, "@/person/{id} -- GET").get(0); assertEquals("@/person/{id} -- GET", handlerInfo1.getSymbol()); assertEquals("org.test.PersonHandler", handlerInfo1.getDestinationClass()); - assertEquals("Lorg/test/PersonHandler;.getPerson(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo1.getMethodKey()); + assertTrue(handlerInfo1.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo1.getMethodKey().endsWith("PersonHandler;.getPerson(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); WebfluxHandlerInformation handlerInfo2 = getWebfluxHandler(addons, "@/person/ -- POST").get(0); assertEquals("@/person/ -- POST", handlerInfo2.getSymbol()); assertEquals("org.test.PersonHandler", handlerInfo2.getDestinationClass()); - assertEquals("Lorg/test/PersonHandler;.createPerson(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo2.getMethodKey()); + assertTrue(handlerInfo2.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo2.getMethodKey().endsWith("PersonHandler;.createPerson(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); WebfluxHandlerInformation handlerInfo3 = getWebfluxHandler(addons, "@/person -- GET").get(0); assertEquals("@/person -- GET", handlerInfo3.getSymbol()); assertEquals("org.test.PersonHandler", handlerInfo3.getDestinationClass()); - assertEquals("Lorg/test/PersonHandler;.listPeople(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;", handlerInfo3.getMethodKey()); + assertTrue(handlerInfo3.getMethodKey().startsWith("Lorg/test/")); + assertTrue(handlerInfo3.getMethodKey().endsWith("PersonHandler;.listPeople(Lorg/springframework/web/reactive/function/server/ServerRequest;)Lreactor/core/publisher/Mono;")); } private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {