Skip to content

Commit 0a0f4c7

Browse files
committed
Accept file separator difference in exception message (for Windows compatibility)
1 parent d9a2e0b commit 0a0f4c7

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

spring-core/src/test/java/org/springframework/aot/generate/FileSystemGeneratedFilesTests.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ void addFileWhenPathIsOutsideOfRootThrowsException() {
101101
@Test
102102
void addFileWhenFileAlreadyAddedThrowsException() {
103103
FileSystemGeneratedFiles generatedFiles = new FileSystemGeneratedFiles(this.root);
104-
generatedFiles.addResourceFile("META-INF/test", "test");
105-
assertThatIllegalStateException().isThrownBy(
106-
() -> generatedFiles.addResourceFile("META-INF/test", "test"))
107-
.withMessageContaining("META-INF/test", "already exists");
104+
generatedFiles.addResourceFile("META-INF/mydir", "test");
105+
assertThatIllegalStateException()
106+
.isThrownBy(() -> generatedFiles.addResourceFile("META-INF/mydir", "test"))
107+
.withMessageContainingAll("META-INF", "mydir", "already exists");
108108
}
109109

110110
@Test
@@ -122,20 +122,21 @@ void handleFileWhenFileExistsProvidesFileHandler() {
122122
@Test
123123
void handleFileWhenFileExistsFailsToCreate() {
124124
FileSystemGeneratedFiles generatedFiles = new FileSystemGeneratedFiles(this.root);
125-
generatedFiles.addResourceFile("META-INF/test", "test");
126-
ThrowingConsumer<FileHandler> consumer = handler -> handler.create(new ByteArrayResource("should fail".getBytes(StandardCharsets.UTF_8)));
125+
generatedFiles.addResourceFile("META-INF/mydir", "test");
126+
ThrowingConsumer<FileHandler> consumer = handler ->
127+
handler.create(new ByteArrayResource("should fail".getBytes(StandardCharsets.UTF_8)));
127128
assertThatIllegalStateException()
128-
.isThrownBy(() -> generatedFiles.handleFile(Kind.RESOURCE, "META-INF/test", consumer))
129-
.withMessageContaining("META-INF/test", "already exists");
129+
.isThrownBy(() -> generatedFiles.handleFile(Kind.RESOURCE, "META-INF/mydir", consumer))
130+
.withMessageContainingAll("META-INF", "mydir", "already exists");
130131
}
131132

132133
@Test
133134
void handleFileWhenFileExistsCanOverrideContent() {
134135
FileSystemGeneratedFiles generatedFiles = new FileSystemGeneratedFiles(this.root);
135-
generatedFiles.addResourceFile("META-INF/test", "test");
136-
generatedFiles.handleFile(Kind.RESOURCE, "META-INF/test", handler ->
136+
generatedFiles.addResourceFile("META-INF/mydir", "test");
137+
generatedFiles.handleFile(Kind.RESOURCE, "META-INF/mydir", handler ->
137138
handler.override(new ByteArrayResource("overridden".getBytes(StandardCharsets.UTF_8))));
138-
assertThat(this.root.resolve("resources/META-INF/test")).content().isEqualTo("overridden");
139+
assertThat(this.root.resolve("resources/META-INF/mydir")).content().isEqualTo("overridden");
139140
}
140141

141142
private void assertPathMustBeRelative(FileSystemGeneratedFiles generatedFiles, String path) {

0 commit comments

Comments
 (0)