From 0a0f4c7460ec50c49677b5717f1033957da37e63 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 24 Jun 2024 12:28:43 +0200 Subject: [PATCH] Accept file separator difference in exception message (for Windows compatibility) --- .../FileSystemGeneratedFilesTests.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/aot/generate/FileSystemGeneratedFilesTests.java b/spring-core/src/test/java/org/springframework/aot/generate/FileSystemGeneratedFilesTests.java index b9050eee45..33afab14b6 100644 --- a/spring-core/src/test/java/org/springframework/aot/generate/FileSystemGeneratedFilesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/generate/FileSystemGeneratedFilesTests.java @@ -101,10 +101,10 @@ class FileSystemGeneratedFilesTests { @Test void addFileWhenFileAlreadyAddedThrowsException() { FileSystemGeneratedFiles generatedFiles = new FileSystemGeneratedFiles(this.root); - generatedFiles.addResourceFile("META-INF/test", "test"); - assertThatIllegalStateException().isThrownBy( - () -> generatedFiles.addResourceFile("META-INF/test", "test")) - .withMessageContaining("META-INF/test", "already exists"); + generatedFiles.addResourceFile("META-INF/mydir", "test"); + assertThatIllegalStateException() + .isThrownBy(() -> generatedFiles.addResourceFile("META-INF/mydir", "test")) + .withMessageContainingAll("META-INF", "mydir", "already exists"); } @Test @@ -122,20 +122,21 @@ class FileSystemGeneratedFilesTests { @Test void handleFileWhenFileExistsFailsToCreate() { FileSystemGeneratedFiles generatedFiles = new FileSystemGeneratedFiles(this.root); - generatedFiles.addResourceFile("META-INF/test", "test"); - ThrowingConsumer consumer = handler -> handler.create(new ByteArrayResource("should fail".getBytes(StandardCharsets.UTF_8))); + generatedFiles.addResourceFile("META-INF/mydir", "test"); + ThrowingConsumer consumer = handler -> + handler.create(new ByteArrayResource("should fail".getBytes(StandardCharsets.UTF_8))); assertThatIllegalStateException() - .isThrownBy(() -> generatedFiles.handleFile(Kind.RESOURCE, "META-INF/test", consumer)) - .withMessageContaining("META-INF/test", "already exists"); + .isThrownBy(() -> generatedFiles.handleFile(Kind.RESOURCE, "META-INF/mydir", consumer)) + .withMessageContainingAll("META-INF", "mydir", "already exists"); } @Test void handleFileWhenFileExistsCanOverrideContent() { FileSystemGeneratedFiles generatedFiles = new FileSystemGeneratedFiles(this.root); - generatedFiles.addResourceFile("META-INF/test", "test"); - generatedFiles.handleFile(Kind.RESOURCE, "META-INF/test", handler -> + generatedFiles.addResourceFile("META-INF/mydir", "test"); + generatedFiles.handleFile(Kind.RESOURCE, "META-INF/mydir", handler -> handler.override(new ByteArrayResource("overridden".getBytes(StandardCharsets.UTF_8)))); - assertThat(this.root.resolve("resources/META-INF/test")).content().isEqualTo("overridden"); + assertThat(this.root.resolve("resources/META-INF/mydir")).content().isEqualTo("overridden"); } private void assertPathMustBeRelative(FileSystemGeneratedFiles generatedFiles, String path) {