From 59180e76a7b35f060c056c2f44edc59d6e63a6ca Mon Sep 17 00:00:00 2001 From: jason <819635822@qq.com> Date: Sat, 2 Jul 2022 22:20:39 +0800 Subject: [PATCH] Fix GenericApplicationContextTests on Microsoft Windows The tests introduced in commit 9868c28c73 pass on Mac OS and Linux but fail on Microsoft Windows. This commit updates the tests so that they pass on MS Windows as well. See gh-28703 Closes gh-28746 --- .../context/support/GenericApplicationContextTests.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java index 6f0abe360c..6a3f3e5773 100644 --- a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java @@ -237,10 +237,11 @@ class GenericApplicationContextTests { context.setResourceLoader(resourceLoader); } + String relativePathLocation = "foo"; String pingLocation = "ping:foo"; String fileLocation = "file:foo"; - Resource resource = context.getResource(pingLocation); + Resource resource = context.getResource(relativePathLocation); assertThat(resource).isInstanceOf(defaultResourceType); resource = context.getResource(fileLocation); assertThat(resource).isInstanceOf(FileUrlResource.class); @@ -251,6 +252,9 @@ class GenericApplicationContextTests { assertThat(resource).asInstanceOf(type(ByteArrayResource.class)) .extracting(bar -> new String(bar.getByteArray(), UTF_8)) .isEqualTo("pong:foo"); + + resource = context.getResource(relativePathLocation); + assertThat(resource).isInstanceOf(defaultResourceType); resource = context.getResource(fileLocation); assertThat(resource).isInstanceOf(FileUrlResource.class); }