You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2022/12/13 12:11:52 UTC
[jackrabbit-oak] branch trunk updated: OAK-9988: MergeRunnerTest leaves temp files/folders behind
This is an automated email from the ASF dual-hosted git repository.
amitj pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new ce48d7fec2 OAK-9988: MergeRunnerTest leaves temp files/folders behind
ce48d7fec2 is described below
commit ce48d7fec2e68e456c14a10750c8bbaad649a8cc
Author: Amit Jain <am...@apache.org>
AuthorDate: Tue Dec 13 17:41:45 2022 +0530
OAK-9988: MergeRunnerTest leaves temp files/folders behind
Use TemporaryFolder to create temp directories
---
.../oak/index/indexer/document/flatfile/MergeRunnerTest.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunnerTest.java b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunnerTest.java
index 7848a295df..a7178a2634 100644
--- a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunnerTest.java
+++ b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunnerTest.java
@@ -23,7 +23,9 @@ import org.apache.jackrabbit.oak.commons.Compression;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.slf4j.event.Level;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
@@ -49,6 +51,8 @@ public class MergeRunnerTest {
.filter(Level.INFO)
.enable(Level.INFO)
.create();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder(new File("target"));
private final String newline = System.lineSeparator();
private final List<File> testFiles = Lists.newArrayList();
private final int threadPoolSize = 1,
@@ -72,7 +76,7 @@ public class MergeRunnerTest {
public void test() throws Exception {
lc.starting();
- File tmpDir = new File(FileUtils.getTempDirectory(), Long.toString(System.nanoTime())),
+ File tmpDir = temporaryFolder.newFolder(),
mergeDir = new File(tmpDir, "merge-reverse"),
sortedFile = new File(tmpDir, "sorted-file.json");
List<String> expectedLogOutput = Lists.newArrayList(),
@@ -160,7 +164,7 @@ public class MergeRunnerTest {
public void testReverse() throws Exception {
lc.starting();
- File tmpDir = new File(FileUtils.getTempDirectory(), Long.toString(System.nanoTime())),
+ File tmpDir = temporaryFolder.newFolder(),
mergeDir = new File(tmpDir, "merge"),
sortedFile = new File(tmpDir, "sorted-file.json");
List<String> expectedLogOutput = Lists.newArrayList(),