From 05518019b574934849011e02e1d1fb19574a5a27 Mon Sep 17 00:00:00 2001
From: remi <rcocula@gmail.com>
Date: Thu, 17 Nov 2016 21:33:28 +0100
Subject: [PATCH] The LIBRESONIC_HOME directory used for tests is now a
 temporary directory.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémi Cocula <rcocula@gmail.com>
---
 .../org/libresonic/player/TestCaseUtils.java  | 29 +++++++++++++++----
 .../service/MediaScannerServiceTestCase.java  |  3 +-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/libresonic-main/src/test/java/org/libresonic/player/TestCaseUtils.java b/libresonic-main/src/test/java/org/libresonic/player/TestCaseUtils.java
index 1bad4c3d..f6ac5d45 100644
--- a/libresonic-main/src/test/java/org/libresonic/player/TestCaseUtils.java
+++ b/libresonic-main/src/test/java/org/libresonic/player/TestCaseUtils.java
@@ -8,6 +8,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -16,17 +17,35 @@ public class TestCaseUtils {
 
   private static final String LIBRESONIC_HOME_FOR_TEST = "/tmp/libresonic";
 
+  private static File libresonicHomeDirForTest = null;
+
+  /**
+   * Returns the path of the LIBRESONIC_HOME directory to use for tests.
+   * This will create a temporary directory.
+   *
+   * @return LIBRESONIC_HOME directory path.
+   * @throws RuntimeException if it fails to create the temp directory.
+   */
   public static String libresonicHomePathForTest() {
 
-    String targetDir = TestCaseUtils.class.getResource("/").toString().replaceFirst("/target.*","/target");
-    if (targetDir.startsWith("file:")) {
-      targetDir = targetDir.replace("file:","");
+    if (libresonicHomeDirForTest == null) {
+      try {
+        libresonicHomeDirForTest = Files.createTempDirectory("libresonic_test_").toFile();
+      } catch (IOException e) {
+        throw new RuntimeException("Error while creating temporary LIBRESONIC_HOME directory for tests");
+      }
+      System.out.println("LIBRESONIC_HOME directory will be "+libresonicHomeDirForTest.getAbsolutePath());
     }
-    return targetDir + LIBRESONIC_HOME_FOR_TEST;
+    return libresonicHomeDirForTest.getAbsolutePath();
   }
 
 
-  public static void deleteLibresonicHome() throws IOException {
+  /**
+   * Cleans the LIBRESONIC_HOME directory used for tests.
+   *
+   * @throws IOException
+     */
+  public static void cleanLibresonicHomeForTest() throws IOException {
 
     File libresonicHomeDir = new File(libresonicHomePathForTest());
     if (libresonicHomeDir.exists() && libresonicHomeDir.isDirectory()) {
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/MediaScannerServiceTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/MediaScannerServiceTestCase.java
index 341bad26..c9a6a226 100644
--- a/libresonic-main/src/test/java/org/libresonic/player/service/MediaScannerServiceTestCase.java
+++ b/libresonic-main/src/test/java/org/libresonic/player/service/MediaScannerServiceTestCase.java
@@ -5,7 +5,6 @@ import com.codahale.metrics.JmxReporter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import junit.framework.Assert;
-import junit.framework.Test;
 import junit.framework.TestCase;
 import org.libresonic.player.TestCaseUtils;
 import org.libresonic.player.dao.*;
@@ -53,7 +52,7 @@ public class MediaScannerServiceTestCase extends TestCase {
 
     System.setProperty("libresonic.home", TestCaseUtils.libresonicHomePathForTest());
 
-    TestCaseUtils.deleteLibresonicHome();
+    TestCaseUtils.cleanLibresonicHomeForTest();
 
     // load spring context
     ApplicationContext context = TestCaseUtils.loadSpringApplicationContext(baseResources);