Browse Source

Polish PathResourceTests

pull/29282/head
Sam Brannen 4 years ago
parent
commit
2e05137ff9
  1. 24
      spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java

24
spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java

@ -69,22 +69,19 @@ class PathResourceTests { @@ -69,22 +69,19 @@ class PathResourceTests {
@Test
void nullPath() {
assertThatIllegalArgumentException().isThrownBy(() ->
new PathResource((Path) null))
assertThatIllegalArgumentException().isThrownBy(() -> new PathResource((Path) null))
.withMessageContaining("Path must not be null");
}
@Test
void nullPathString() {
assertThatIllegalArgumentException().isThrownBy(() ->
new PathResource((String) null))
assertThatIllegalArgumentException().isThrownBy(() -> new PathResource((String) null))
.withMessageContaining("Path must not be null");
}
@Test
void nullUri() {
assertThatIllegalArgumentException().isThrownBy(() ->
new PathResource((URI) null))
assertThatIllegalArgumentException().isThrownBy(() -> new PathResource((URI) null))
.withMessageContaining("URI must not be null");
}
@ -166,15 +163,13 @@ class PathResourceTests { @@ -166,15 +163,13 @@ class PathResourceTests {
@Test
void getInputStreamForDir() throws IOException {
PathResource resource = new PathResource(TEST_DIR);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
resource::getInputStream);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::getInputStream);
}
@Test
void getInputStreamDoesNotExist() throws IOException {
PathResource resource = new PathResource(NON_EXISTING_FILE);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
resource::getInputStream);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::getInputStream);
}
@Test
@ -202,8 +197,7 @@ class PathResourceTests { @@ -202,8 +197,7 @@ class PathResourceTests {
given(path.normalize()).willReturn(path);
given(path.toFile()).willThrow(new UnsupportedOperationException());
PathResource resource = new PathResource(path);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
resource::getFile);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::getFile);
}
@Test
@ -283,8 +277,7 @@ class PathResourceTests { @@ -283,8 +277,7 @@ class PathResourceTests {
@Test
void directoryOutputStream() throws IOException {
PathResource resource = new PathResource(TEST_DIR);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
resource::getOutputStream);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::getOutputStream);
}
@Test
@ -312,8 +305,7 @@ class PathResourceTests { @@ -312,8 +305,7 @@ class PathResourceTests {
@Test
void getReadableByteChannelDoesNotExist() throws IOException {
PathResource resource = new PathResource(NON_EXISTING_FILE);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
resource::readableChannel);
assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::readableChannel);
}
@Test

Loading…
Cancel
Save