spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-03-06 17:32:49 +01:00
parent e09cdcd920 8334cb1abb
commit aeaf52ee96
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
+4 -2
View File
@@ -31,6 +31,8 @@ import org.springframework.core.io.Resource;
import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
import org.springframework.web.testfixture.server.MockServerWebExchange;
import static org.assertj.core.api.Assertions.assertThatNoException;
/**
* @author Arjen Poutsma
*/
@@ -128,13 +130,13 @@ class PathResourceLookupFunctionTests {
@SuppressWarnings("removal")
void withPathResource() {
org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
}
@Test
void withFileSystemResource() {
FileSystemResource location = new FileSystemResource("/static/");
PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
}
}
spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java
+3 -2
View File
@@ -29,6 +29,7 @@ import org.springframework.core.io.Resource;
import org.springframework.web.servlet.handler.PathPatternsTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
/**
* @author Arjen Poutsma
@@ -107,13 +108,13 @@ class PathResourceLookupFunctionTests {
@SuppressWarnings("removal")
void withPathResource() {
org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
}
@Test
void withFileSystemResource() {
FileSystemResource location = new FileSystemResource("/static/");
PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
}
}