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

Ensure ClassPathResourceTests can pass on MS Windows

This commit is contained in:
Sam Brannen 2022-10-03 14:08:05 +02:00
parent 31a84fb38e
commit d79d2fc573
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
spring-core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,6 +31,7 @@ import org.junit.jupiter.api.io.TempDir;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.io.CleanupMode.NEVER;
/** /**
* Unit tests for {@link ClassPathResource}. * Unit tests for {@link ClassPathResource}.
@ -152,17 +153,20 @@ class ClassPathResourceTests {
} }
@Test @Test
void emptyFileReadable(@TempDir File tempDir) throws IOException { // Since the JAR file created in this test cannot be deleted on MS windows,
// we use `cleanup = NEVER`.
void emptyFileReadable(@TempDir(cleanup = NEVER) File tempDir) throws IOException {
File file = new File(tempDir, "empty.txt"); File file = new File(tempDir, "empty.txt");
assertThat(file.createNewFile()).isTrue(); assertThat(file.createNewFile()).isTrue();
assertThat(file.isFile()); assertThat(file.isFile());
ClassLoader fileClassLoader = new URLClassLoader(new URL[]{tempDir.toURI().toURL()}); try (URLClassLoader fileClassLoader = new URLClassLoader(new URL[]{tempDir.toURI().toURL()})) {
Resource emptyFile = new ClassPathResource("empty.txt", fileClassLoader);
Resource emptyFile = new ClassPathResource("empty.txt", fileClassLoader); assertThat(emptyFile.exists()).isTrue();
assertThat(emptyFile.exists()).isTrue(); assertThat(emptyFile.isReadable()).isTrue();
assertThat(emptyFile.isReadable()).isTrue(); assertThat(emptyFile.contentLength()).isEqualTo(0);
assertThat(emptyFile.contentLength()).isEqualTo(0); file.delete();
}
File jarFile = new File(tempDir, "test.jar"); File jarFile = new File(tempDir, "test.jar");
try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(jarFile))) { try (ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(jarFile))) {
@ -171,12 +175,15 @@ class ClassPathResourceTests {
} }
assertThat(jarFile.isFile()); assertThat(jarFile.isFile());
ClassLoader jarClassLoader = new URLClassLoader(new URL[]{jarFile.toURI().toURL()}); try (URLClassLoader jarClassLoader = new URLClassLoader(new URL[]{jarFile.toURI().toURL()})) {
Resource emptyJarEntry = new ClassPathResource("empty2.txt", jarClassLoader);
assertThat(emptyJarEntry.exists()).isTrue();
assertThat(emptyJarEntry.isReadable()).isTrue();
assertThat(emptyJarEntry.contentLength()).isEqualTo(0);
}
Resource emptyJarEntry = new ClassPathResource("empty2.txt", jarClassLoader); jarFile.deleteOnExit();
assertThat(emptyJarEntry.exists()).isTrue(); tempDir.deleteOnExit();
assertThat(emptyJarEntry.isReadable()).isTrue();
assertThat(emptyJarEntry.contentLength()).isEqualTo(0);
} }
} }