From 791854ed232c805e83cc4b87f6e514c846e99b97 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 30 Apr 2017 19:13:21 -0400
Subject: [PATCH] cache: remove old cache from test resources, instead pull in
 as a dependnecy via maven

This also updates the cache the tests use to 140
---
 cache/pom.xml                                 |  6 ++
 .../net/runelite/cache/StoreLocation.java     | 55 +++++++++++++++----
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/cache/pom.xml b/cache/pom.xml
index 45efccbf18..c61b934420 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -99,6 +99,12 @@
 			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>net.runelite.rs</groupId>
+			<artifactId>cache</artifactId>
+			<version>140</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/cache/src/test/java/net/runelite/cache/StoreLocation.java b/cache/src/test/java/net/runelite/cache/StoreLocation.java
index b532982811..015714e7e8 100644
--- a/cache/src/test/java/net/runelite/cache/StoreLocation.java
+++ b/cache/src/test/java/net/runelite/cache/StoreLocation.java
@@ -22,11 +22,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package net.runelite.cache;
 
 import java.io.File;
-import java.net.URISyntaxException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +36,7 @@ public class StoreLocation
 {
 	private static final Logger logger = LoggerFactory.getLogger(StoreLocation.class);
 
+	private static final int NUM_INDEXES = 15;
 	private static final String TMP_DIR = "d:/temp";
 
 	public static File LOCATION;
@@ -42,21 +44,48 @@ public class StoreLocation
 
 	static
 	{
-		try
-		{
-			LOCATION = new File(StoreLocation.class.getResource("/cache").toURI());
-		}
-		catch (URISyntaxException ex)
-		{
-			logger.error(null, ex);
-		}
-
 		File tmp = new File(TMP_DIR);
 		if (tmp.exists() || tmp.mkdir())
 		{
 			System.setProperty("java.io.tmpdir", TMP_DIR);
 			TMP = tmp;
 		}
+
+		try
+		{
+			LOCATION = setupCacheDir();
+		}
+		catch (IOException ex)
+		{
+			logger.warn("unable to initialize cache tmp area", ex);
+		}
+	}
+
+	private static File setupCacheDir() throws IOException
+	{
+		File file = new File(System.getProperty("java.io.tmpdir"), "cache-work");
+
+		if (file.exists())
+		{
+			logger.info("Using preexisting cache working directory {}", file);
+			return file;
+		}
+
+		file.mkdir();
+
+		// Copy over files
+		InputStream in = StoreLocation.class.getResourceAsStream("/main_file_cache.dat2");
+		Files.copy(in, new File(file, "main_file_cache.dat2").toPath());
+
+		for (int i = 0; i <= NUM_INDEXES; ++i)
+		{
+			in = StoreLocation.class.getResourceAsStream("/main_file_cache.idx" + i);
+			Files.copy(in, new File(file, "main_file_cache.idx" + i).toPath());
+		}
+
+		logger.info("Set up cache working directory to {}", file);
+
+		return file;
 	}
 
 	public static TemporaryFolder getTemporaryFolder()
@@ -68,8 +97,10 @@ public class StoreLocation
 			{
 				// don't cleanup if using local tmpdir
 				if (TMP == null)
+				{
 					super.after();
+				}
 			}
 		};
 	}
-}
\ No newline at end of file
+}