From d32c3a7f43e02c36ea79e9e824c49dbaa182f16e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 9 Mar 2017 14:04:19 +0000 Subject: [PATCH] Correct the URL that's called to test servlet context resources See gh-8299 Closes gh-8525 --- ...mbeddedServletContainerJarDevelopmentIntegrationTests.java | 4 ++-- .../EmbeddedServletContainerJarPackagingIntegrationTests.java | 4 ++-- ...mbeddedServletContainerWarDevelopmentIntegrationTests.java | 4 ++-- .../EmbeddedServletContainerWarPackagingIntegrationTests.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java index ce70ec15faa..7db700c7f5f 100644 --- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java @@ -59,8 +59,8 @@ public class EmbeddedServletContainerJarDevelopmentIntegrationTests @Test public void metaInfResourceFromDependencyIsAvailableViaServletContext() throws Exception { - ResponseEntity entity = this.rest - .getForEntity("/nested-meta-inf-resource.txt", String.class); + ResponseEntity entity = this.rest.getForEntity( + "/servletContext?/nested-meta-inf-resource.txt", String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); } diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java index 98e81854cdd..07cfd5652b5 100644 --- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java @@ -59,8 +59,8 @@ public class EmbeddedServletContainerJarPackagingIntegrationTests @Test public void nestedMetaInfResourceIsAvailableViaServletContext() throws Exception { - ResponseEntity entity = this.rest - .getForEntity("/nested-meta-inf-resource.txt", String.class); + ResponseEntity entity = this.rest.getForEntity( + "/servletContext?/nested-meta-inf-resource.txt", String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); } diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java index 7713ee1a4da..d0d67f42a22 100644 --- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java @@ -59,8 +59,8 @@ public class EmbeddedServletContainerWarDevelopmentIntegrationTests @Test public void metaInfResourceFromDependencyIsAvailableViaServletContext() throws Exception { - ResponseEntity entity = this.rest - .getForEntity("/nested-meta-inf-resource.txt", String.class); + ResponseEntity entity = this.rest.getForEntity( + "/servletContext?/nested-meta-inf-resource.txt", String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); } diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java index c8d23095581..ed9d2d7fc4d 100644 --- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java @@ -59,8 +59,8 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests @Test public void nestedMetaInfResourceIsAvailableViaServletContext() throws Exception { - ResponseEntity entity = this.rest - .getForEntity("/nested-meta-inf-resource.txt", String.class); + ResponseEntity entity = this.rest.getForEntity( + "/servletContext?/nested-meta-inf-resource.txt", String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); }