Move APIs from internal HttpResponseCache to external one.

Change-Id: Ia6c88f292088bfd3ed546c067376fcb36b435b48
http://b/3180373

2 files changed, 18 insertions, 3 deletions

diff --git a/luni/src/test/java/libcore/io/DiskLruCacheTest.java b/luni/src/test/java/libcore/io/DiskLruCacheTest.java
index 990076f..812248f 100644
--- a/luni/src/test/java/libcore/io/DiskLruCacheTest.java
+++ b/luni/src/test/java/libcore/io/DiskLruCacheTest.java
@@ -34,13 +34,15 @@ import static libcore.io.DiskLruCache.VERSION_1;
 
 public final class DiskLruCacheTest extends TestCase {
     private final int appVersion = 100;
+    private String javaTmpDir;
     private File cacheDir;
     private File journalFile;
     private DiskLruCache cache;
 
     @Override public void setUp() throws Exception {
         super.setUp();
-        cacheDir = new File(System.getProperty("java.io.tmpdir"), "DiskLruCacheTest");
+        javaTmpDir = System.getProperty("java.io.tmpdir");
+        cacheDir = new File(javaTmpDir, "DiskLruCacheTest");
         cacheDir.mkdir();
         journalFile = new File(cacheDir, JOURNAL_FILE);
         for (File file : cacheDir.listFiles()) {
@@ -557,6 +559,16 @@ public final class DiskLruCacheTest extends TestCase {
         assertValue("B", "b", "b");
     }
 
+    public void testOpenCreatesDirectoryIfNecessary() throws Exception {
+        cache.close();
+        File dir = new File(javaTmpDir, "testOpenCreatesDirectoryIfNecessary");
+        cache = DiskLruCache.open(dir, appVersion, 2, Integer.MAX_VALUE);
+        set("A", "a", "a");
+        assertTrue(new File(dir, "A.0").exists());
+        assertTrue(new File(dir, "A.1").exists());
+        assertTrue(new File(dir, "journal").exists());
+    }
+
     private void assertJournalEquals(String... expectedBodyLines) throws Exception {
         List<String> expectedLines = new ArrayList<String>();
         expectedLines.add(MAGIC);
diff --git a/luni/src/test/java/libcore/net/http/HttpResponseCacheTest.java b/luni/src/test/java/libcore/net/http/HttpResponseCacheTest.java
index 266ca89..ba60e0a 100644
--- a/luni/src/test/java/libcore/net/http/HttpResponseCacheTest.java
+++ b/luni/src/test/java/libcore/net/http/HttpResponseCacheTest.java
@@ -60,6 +60,10 @@ import tests.http.RecordedRequest;
 import static tests.http.SocketPolicy.DISCONNECT_AT_END;
 
 public final class HttpResponseCacheTest extends TestCase {
+
+    // TODO: test cache + cookies
+    // TODO: test cache + user-provided Range header
+
     private MockWebServer server = new MockWebServer();
     private HttpResponseCache cache;
 
@@ -68,7 +72,6 @@ public final class HttpResponseCacheTest extends TestCase {
 
         String tmp = System.getProperty("java.io.tmpdir");
         File cacheDir = new File(tmp, "HttpCache-" + UUID.randomUUID());
-        cacheDir.mkdir();
         cache = new HttpResponseCache(cacheDir, Integer.MAX_VALUE);
         ResponseCache.setDefault(cache);
     }
@@ -76,7 +79,7 @@ public final class HttpResponseCacheTest extends TestCase {
     @Override protected void tearDown() throws Exception {
         server.shutdown();
         ResponseCache.setDefault(null);
-        cache.delete();
+        cache.getCache().delete();
         super.tearDown();
     }