From 4b8bcd265b3d3e50e7fa97d65dd1cb0c5f03dea6 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 27 Nov 2021 18:05:25 +0000
Subject: [PATCH] Make sure unit test use a different lists directory, and
 delete it before and after each test.

---
 .../arbitrary/ArbitraryDataStoragePolicyTests.java | 14 ++++++++++++++
 src/test/resources/test-settings-v2.json           |  1 +
 2 files changed, 15 insertions(+)

diff --git a/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java b/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
index 6baa1ee6..8cc561e6 100644
--- a/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
+++ b/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
@@ -1,5 +1,6 @@
 package org.qortal.test.arbitrary;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -22,6 +23,7 @@ import org.qortal.test.common.TransactionUtils;
 import org.qortal.test.common.transaction.TestTransaction;
 import org.qortal.utils.Base58;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -32,11 +34,13 @@ public class ArbitraryDataStoragePolicyTests extends Common {
     @Before
     public void beforeTest() throws DataException {
         Common.useDefaultSettings();
+        this.deleteListsDirectory();
         ArbitraryDataStorageManager.getInstance().start();
     }
 
     @After
     public void afterTest() throws DataException {
+        this.deleteListsDirectory();
         ArbitraryDataStorageManager.getInstance().shutdown();
     }
 
@@ -231,4 +235,14 @@ public class ArbitraryDataStoragePolicyTests extends Common {
         return transactionData;
     }
 
+    private void deleteListsDirectory() {
+        // Delete lists directory if exists
+        Path listsPath = Paths.get(Settings.getInstance().getListsPath());
+        try {
+            FileUtils.deleteDirectory(listsPath.toFile());
+        } catch (IOException e) {
+
+        }
+    }
+
 }
diff --git a/src/test/resources/test-settings-v2.json b/src/test/resources/test-settings-v2.json
index 60eebc3e..1610306e 100644
--- a/src/test/resources/test-settings-v2.json
+++ b/src/test/resources/test-settings-v2.json
@@ -13,5 +13,6 @@
   "bootstrapFilenamePrefix": "test-",
   "dataPath": "data-test",
   "tempDataPath": "data-test/_temp",
+  "listsPath": "lists-test",
   "storagePolicy": "FOLLOWED_AND_VIEWED"
 }