Changeset 10652 in josm for trunk/test/unit/org/openstreetmap/josm/data/cache

Timestamp:

2016-07-26T22:06:52+02:00 (8 years ago)

Author:

wiktorn

Message:

Fix not using the calculated disk cache size.

Add unit tests for #13128 - using existing file size if greater than desired cache size.

Closes #13128

File:

• trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.cache;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.logging.Logger;
 
+import org.apache.commons.jcs.access.CacheAccess;
+import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -31 +37 @@
         Logger.getLogger("org.apache.commons.jcs").warning("{switch:0}");
     }
+
+    @Test
+    public void testUseBigDiskFile() throws IOException {
+        if (JCSCacheManager.USE_BLOCK_CACHE.get()) {
+            // test only when using block cache
+            File cacheFile = new File("foobar/testUseBigDiskFile_BLOCK_v2.data");
+            if (!cacheFile.exists()) {
+                cacheFile.createNewFile();
+            }
+            try (FileOutputStream fileOutputStream = new FileOutputStream(cacheFile, false)) {
+                fileOutputStream.getChannel().truncate(0);
+                fileOutputStream.write(new byte[1024*1024*10]); // create 10MB empty file
+            }
+
+            CacheAccess<Object, Object> cache = JCSCacheManager.getCache("testUseBigDiskFile", 1, 100, "foobar");
+            assertEquals("BlockDiskCache use file size to calculate its size", 10*1024,
+                    ((BlockDiskCacheAttributes)cache.getCacheControl().getAuxCaches()[0].getAuxiliaryCacheAttributes()).getMaxKeySize());
+        }
+    }
+
 }