You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2022/05/17 02:31:09 UTC
[tika] branch main updated: TIKA-3766: delete temporary directories, simplify temp directory generation
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new d67d69251 TIKA-3766: delete temporary directories, simplify temp directory generation
d67d69251 is described below
commit d67d69251ac30a2fa2f5e11f3766552ab66e6ad1
Author: THausherr <ti...@snafu.de>
AuthorDate: Tue May 17 04:30:55 2022 +0200
TIKA-3766: delete temporary directories, simplify temp directory generation
---
.../src/test/java/org/apache/tika/cli/TikaCLITest.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
index 91599a649..e7ffb2267 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
@@ -365,9 +365,7 @@ public class TikaCLITest {
private void testExtract(String targetFile, String[] expectedChildrenFileNames,
int expectedLength) throws Exception {
- File tempFile = File.createTempFile("tika-test-", "");
- assertTrue(tempFile.delete());
- assertTrue(tempFile.mkdir());
+ File tempFile = Files.createTempDirectory("tika-test-").toFile();
try {
String[] params = {"--extract-dir=" + tempFile.getAbsolutePath(), "-z",
@@ -391,9 +389,7 @@ public class TikaCLITest {
@Test
public void testExtractTgz() throws Exception {
//TIKA-2564
- File tempFile = File.createTempFile("tika-test-", "");
- assertTrue(tempFile.delete());
- assertTrue(tempFile.mkdir());
+ File tempFile = Files.createTempDirectory("tika-test-").toFile();
try {
String[] params = {"--extract-dir=" + tempFile.getAbsolutePath(), "-z",
@@ -409,7 +405,7 @@ public class TikaCLITest {
assertExtracted(expectedTAR, allFiles);
} finally {
- FileUtils.deleteDirectory(tempFile);
+ FileUtils.forceDeleteOnExit(tempFile);
}
}
@@ -438,10 +434,7 @@ public class TikaCLITest {
@Test
public void testExtractInlineImages() throws Exception {
- File tempFile = File.createTempFile("tika-test-", "");
- assertTrue(tempFile.delete());
- assertTrue(tempFile.mkdir());
- // google guava library has better solution
+ File tempFile = Files.createTempDirectory("tika-test-").toFile();
try {
String[] params = {"--extract-dir=" + tempFile.getAbsolutePath(), "-z",
@@ -463,7 +456,7 @@ public class TikaCLITest {
assertExtracted(jobOptions, allFiles);
assertExtracted(doc, allFiles);
} finally {
- FileUtils.deleteDirectory(tempFile);
+ FileUtils.forceDeleteOnExit(tempFile);
}
}