Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that test closes InputStream that reads contents of output files

Browse Source
This commit is contained in:
Andy Wilkinson 2017-01-17 21:16:20 +00:00
parent 5c9aa41c07
commit 29adf2d85e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java
View File

@ -18,6 +18,7 @@ package sample.integration.consumer;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@ -57,13 +58,7 @@ public class SampleIntegrationApplicationTests {
private void deleteIfExists(File directory) throws InterruptedException {
if (directory.exists()) {
for (int i = 0; i < 10; i++) {
if (FileSystemUtils.deleteRecursively(directory)) {
return;
}
Thread.sleep(500);
}
throw new IllegalStateException("Failed to delete '" + directory + "'");
assertThat(FileSystemUtils.deleteRecursively(directory)).isTrue();
}
}
@ -102,8 +97,14 @@ public class SampleIntegrationApplicationTests {
}
StringBuilder builder = new StringBuilder();
for (Resource resource : resources) {
builder.append(new String(StreamUtils
.copyToByteArray(resource.getInputStream())));
InputStream inputStream = resource.getInputStream();
try {
builder.append(new String(
StreamUtils.copyToByteArray(inputStream)));
}
finally {
inputStream.close();
}
}
return builder.toString();
}