From 80a20488fde461a54a90628daf1d8a8c68bec107 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 4 Jul 2023 16:38:10 +0200 Subject: [PATCH] Make File/Path tests pass on Windows See gh-30806 --- .../java/org/springframework/util/ObjectUtilsTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java index 025c3a99f5c..1bbd0f9e92d 100644 --- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java @@ -937,10 +937,10 @@ class ObjectUtilsTests { @Test void nullSafeConciseToStringForFile() { - String path = "/tmp/file.txt"; + String path = "/tmp/file.txt".replace('/', File.separatorChar); assertThat(ObjectUtils.nullSafeConciseToString(new File(path))).isEqualTo(path); - path = "/tmp/" + "xyz".repeat(32); + path = ("/tmp/" + "xyz".repeat(32)).replace('/', File.separatorChar); assertThat(ObjectUtils.nullSafeConciseToString(new File(path))) .hasSize(truncatedLength) .startsWith(path.subSequence(0, 100)) @@ -949,10 +949,10 @@ class ObjectUtilsTests { @Test void nullSafeConciseToStringForPath() { - String path = "/tmp/file.txt"; + String path = "/tmp/file.txt".replace('/', File.separatorChar); assertThat(ObjectUtils.nullSafeConciseToString(Path.of(path))).isEqualTo(path); - path = "/tmp/" + "xyz".repeat(32); + path = ("/tmp/" + "xyz".repeat(32)).replace('/', File.separatorChar); assertThat(ObjectUtils.nullSafeConciseToString(Path.of(path))) .hasSize(truncatedLength) .startsWith(path.subSequence(0, 100))