Skip to content

Commit d32c3a7

Browse files
committed
Correct the URL that's called to test servlet context resources
See gh-8299 Closes gh-8525
1 parent a2cf045 commit d32c3a7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public void metaInfResourceFromDependencyIsAvailableViaHttp() throws Exception {
5959
@Test
6060
public void metaInfResourceFromDependencyIsAvailableViaServletContext()
6161
throws Exception {
62-
ResponseEntity<String> entity = this.rest
63-
.getForEntity("/nested-meta-inf-resource.txt", String.class);
62+
ResponseEntity<String> entity = this.rest.getForEntity(
63+
"/servletContext?/nested-meta-inf-resource.txt", String.class);
6464
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
6565
}
6666

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public void nestedMetaInfResourceIsAvailableViaHttp() throws Exception {
5959

6060
@Test
6161
public void nestedMetaInfResourceIsAvailableViaServletContext() throws Exception {
62-
ResponseEntity<String> entity = this.rest
63-
.getForEntity("/nested-meta-inf-resource.txt", String.class);
62+
ResponseEntity<String> entity = this.rest.getForEntity(
63+
"/servletContext?/nested-meta-inf-resource.txt", String.class);
6464
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
6565
}
6666

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public void metaInfResourceFromDependencyIsAvailableViaHttp() throws Exception {
5959
@Test
6060
public void metaInfResourceFromDependencyIsAvailableViaServletContext()
6161
throws Exception {
62-
ResponseEntity<String> entity = this.rest
63-
.getForEntity("/nested-meta-inf-resource.txt", String.class);
62+
ResponseEntity<String> entity = this.rest.getForEntity(
63+
"/servletContext?/nested-meta-inf-resource.txt", String.class);
6464
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
6565
}
6666

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public void nestedMetaInfResourceIsAvailableViaHttp() throws Exception {
5959

6060
@Test
6161
public void nestedMetaInfResourceIsAvailableViaServletContext() throws Exception {
62-
ResponseEntity<String> entity = this.rest
63-
.getForEntity("/nested-meta-inf-resource.txt", String.class);
62+
ResponseEntity<String> entity = this.rest.getForEntity(
63+
"/servletContext?/nested-meta-inf-resource.txt", String.class);
6464
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
6565
}
6666

0 commit comments

Comments
 (0)