root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix resource registration hints in the TestContext framework 

Resource patterns registered for inclusion in a GraalVM native image
must not start with a leading slash.
This commit is contained in:
Sam Brannen 2022-09-05 18:38:38 +02:00
parent 6e93f1187c
commit 6902ff77d9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/java/org/springframework/test/context/aot/hint/StandardTestRuntimeHints.java
View File

@ -114,8 +114,8 @@ class StandardTestRuntimeHints implements TestRuntimeHintsRegistrar {
private String cleanClasspathResource(String location) { private String cleanClasspathResource(String location) {
location = location.substring(CLASSPATH_URL_PREFIX.length()); location = location.substring(CLASSPATH_URL_PREFIX.length());
if (!location.startsWith(SLASH)) { if (location.startsWith(SLASH)) {
location = SLASH + location; location = location.substring(1);
} }
return location; return location;
} }

4
spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
View File

@ -399,8 +399,8 @@ public class SqlScriptsTestExecutionListener extends AbstractTestExecutionListen
private String cleanClasspathResource(String location) { private String cleanClasspathResource(String location) {
location = location.substring(CLASSPATH_URL_PREFIX.length()); location = location.substring(CLASSPATH_URL_PREFIX.length());
if (!location.startsWith(SLASH)) { if (location.startsWith(SLASH)) {
location = SLASH + location; location = location.substring(1);
} }
return location; return location;
} }

12
spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java
View File

@ -181,21 +181,21 @@ class TestContextAotGeneratorTests extends AbstractAotTests {
).forEach(type -> assertReflectionRegistered(runtimeHints, type, INVOKE_DECLARED_CONSTRUCTORS)); ).forEach(type -> assertReflectionRegistered(runtimeHints, type, INVOKE_DECLARED_CONSTRUCTORS));
// @ContextConfiguration(locations = ...) // @ContextConfiguration(locations = ...)
assertThat(resource().forResource("/org/springframework/test/context/aot/samples/xml/test-config.xml")) assertThat(resource().forResource("org/springframework/test/context/aot/samples/xml/test-config.xml"))
.accepts(runtimeHints); .accepts(runtimeHints);
// @TestPropertySource(locations = ...) // @TestPropertySource(locations = ...)
assertThat(resource().forResource("/org/springframework/test/context/aot/samples/basic/BasicSpringVintageTests.properties")) assertThat(resource().forResource("org/springframework/test/context/aot/samples/basic/BasicSpringVintageTests.properties"))
.accepts(runtimeHints); .accepts(runtimeHints);
// @WebAppConfiguration(value = ...) // @WebAppConfiguration(value = ...)
assertThat(resource().forResource("/META-INF/web-resources/resources/Spring.js")).accepts(runtimeHints); assertThat(resource().forResource("META-INF/web-resources/resources/Spring.js")).accepts(runtimeHints);
assertThat(resource().forResource("/META-INF/web-resources/WEB-INF/views/home.jsp")).accepts(runtimeHints); assertThat(resource().forResource("META-INF/web-resources/WEB-INF/views/home.jsp")).accepts(runtimeHints);
// @Sql(scripts = ...) // @Sql(scripts = ...)
assertThat(resource().forResource("/org/springframework/test/context/jdbc/schema.sql")) assertThat(resource().forResource("org/springframework/test/context/jdbc/schema.sql"))
.accepts(runtimeHints); .accepts(runtimeHints);
assertThat(resource().forResource("/org/springframework/test/context/aot/samples/jdbc/SqlScriptsSpringJupiterTests.test.sql")) assertThat(resource().forResource("org/springframework/test/context/aot/samples/jdbc/SqlScriptsSpringJupiterTests.test.sql"))
.accepts(runtimeHints); .accepts(runtimeHints);
} }