Repository: commons-fileupload Updated Branches: refs/heads/master d579c72f2 -> b1498c987
Use Apache Commons I/O in tests. Closes #16. Project: http://git-wip-us.apache.org/repos/asf/commons-fileupload/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-fileupload/commit/b1498c98 Tree: http://git-wip-us.apache.org/repos/asf/commons-fileupload/tree/b1498c98 Diff: http://git-wip-us.apache.org/repos/asf/commons-fileupload/diff/b1498c98 Branch: refs/heads/master Commit: b1498c9877d751f8bc4635a6f252ebdfcba28518 Parents: d579c72 Author: Karl-Philipp Richter <krichter...@aol.de> Authored: Mon May 21 14:20:56 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon May 21 14:20:56 2018 -0600 ---------------------------------------------------------------------- .../org/apache/commons/fileupload/DefaultFileItemTest.java | 5 +++-- .../apache/commons/fileupload/DiskFileItemSerializeTest.java | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/b1498c98/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java b/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java index 9d06252..0855cb5 100644 --- a/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java +++ b/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java @@ -27,6 +27,7 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; +import org.apache.commons.io.FileUtils; import org.junit.Test; @@ -140,11 +141,11 @@ public class DefaultFileItemTest { * configured threshold, where a specific repository is configured. */ @Test - public void testAboveThresholdSpecifiedRepository() { + public void testAboveThresholdSpecifiedRepository() throws IOException { String tempPath = System.getProperty("java.io.tmpdir"); String tempDirName = "testAboveThresholdSpecifiedRepository"; File tempDir = new File(tempPath, tempDirName); - tempDir.mkdir(); + FileUtils.forceMkdir(tempDir); doTestAboveThreshold(tempDir); assertTrue(tempDir.delete()); } http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/b1498c98/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java b/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java index c773aed..4507d58 100644 --- a/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java +++ b/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java @@ -50,17 +50,15 @@ public class DiskFileItemSerializeTest { if (REPO.exists()) { FileUtils.deleteDirectory(REPO); } - assertFalse("Must not exist", REPO.exists()); - REPO.mkdir(); + FileUtils.forceMkdir(REPO); } @After - public void tearDown() { + public void tearDown() throws IOException { for(File file : FileUtils.listFiles(REPO, null, true)) { System.out.println("Found leftover file " + file); } - REPO.delete(); - assertFalse(REPO + " is not empty", REPO.exists()); + FileUtils.deleteDirectory(REPO); } /**
