danikula#112: touch file to check is cache trimming is required after cache completion

danikula · danikula · commit 01bba672892f · 2017-04-21T17:20:04.000+03:00
diff --git a/library/src/main/java/com/danikula/videocache/file/FileCache.java b/library/src/main/java/com/danikula/videocache/file/FileCache.java
@@ -100,6 +100,7 @@ public synchronized void complete() throws ProxyCacheException {
         file = completedFile;
         try {
             dataFile = new RandomAccessFile(file, "r");
+            diskUsage.touch(file);
         } catch (IOException e) {
             throw new ProxyCacheException("Error opening " + file + " as disc cache", e);
         }
diff --git a/test/src/test/java/com/danikula/videocache/HttpProxyCacheServerTest.java b/test/src/test/java/com/danikula/videocache/HttpProxyCacheServerTest.java
@@ -365,6 +365,6 @@ private HttpProxyCacheServer newProxy(File cacheDir) {
     }
 
     private void waitForAsyncTrimming() throws InterruptedException {
-        Thread.sleep(500);
+        Thread.sleep(100);
     }
 }
diff --git a/test/src/test/java/com/danikula/videocache/file/FileCacheTest.java b/test/src/test/java/com/danikula/videocache/file/FileCacheTest.java
@@ -161,14 +161,15 @@ public void testTrimAfterCompletionForTotalCountLru() throws Exception {
     public void testTrimAfterCompletionForTotalSizeLru() throws Exception {
         File cacheDir = newCacheFile();
         byte[] data = loadAssetFile(ASSETS_DATA_NAME);
-        DiskUsage diskUsage = new TotalSizeLruDiskUsage(data.length*3-1);
+        DiskUsage diskUsage = new TotalSizeLruDiskUsage(data.length * 3 - 1);
         saveAndCompleteCache(diskUsage, data,
                 new File(cacheDir, "0.dat"),
                 new File(cacheDir, "1.dat"),
                 new File(cacheDir, "2.dat")
         );
         waitForAsyncTrimming();
-        assertThat(new File(cacheDir, "0.dat")).doesNotExist();
+        File deletedFile = new File(cacheDir, "0.dat");
+        assertThat(deletedFile).doesNotExist();
     }
 
     private void saveAndCompleteCache(DiskUsage diskUsage, byte[] data, File... files) throws ProxyCacheException, IOException {
@@ -181,6 +182,6 @@ private void saveAndCompleteCache(DiskUsage diskUsage, byte[] data, File... file
     }
 
     private void waitForAsyncTrimming() throws InterruptedException {
-        Thread.sleep(500);
+        Thread.sleep(100);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ public synchronized void complete() throws ProxyCacheException {`
`100`	`100`	`file = completedFile;`
`101`	`101`	`try {`
`102`	`102`	`dataFile = new RandomAccessFile(file, "r");`
	`103`	`+ diskUsage.touch(file);`
`103`	`104`	`} catch (IOException e) {`
`104`	`105`	`throw new ProxyCacheException("Error opening " + file + " as disc cache", e);`
`105`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,6 @@ private HttpProxyCacheServer newProxy(File cacheDir) {`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`private void waitForAsyncTrimming() throws InterruptedException {`
`368`		`- Thread.sleep(500);`
	`368`	`+ Thread.sleep(100);`
`369`	`369`	`}`
`370`	`370`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,14 +161,15 @@ public void testTrimAfterCompletionForTotalCountLru() throws Exception {`
`161`	`161`	`public void testTrimAfterCompletionForTotalSizeLru() throws Exception {`
`162`	`162`	`File cacheDir = newCacheFile();`
`163`	`163`	`byte[] data = loadAssetFile(ASSETS_DATA_NAME);`
`164`		`- DiskUsage diskUsage = new TotalSizeLruDiskUsage(data.length*3-1);`
	`164`	`+ DiskUsage diskUsage = new TotalSizeLruDiskUsage(data.length * 3 - 1);`
`165`	`165`	`saveAndCompleteCache(diskUsage, data,`
`166`	`166`	`new File(cacheDir, "0.dat"),`
`167`	`167`	`new File(cacheDir, "1.dat"),`
`168`	`168`	`new File(cacheDir, "2.dat")`
`169`	`169`	`);`
`170`	`170`	`waitForAsyncTrimming();`
`171`		`- assertThat(new File(cacheDir, "0.dat")).doesNotExist();`
	`171`	`+ File deletedFile = new File(cacheDir, "0.dat");`
	`172`	`+ assertThat(deletedFile).doesNotExist();`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`private void saveAndCompleteCache(DiskUsage diskUsage, byte[] data, File... files) throws ProxyCacheException, IOException {`
`@@ -181,6 +182,6 @@ private void saveAndCompleteCache(DiskUsage diskUsage, byte[] data, File... file`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`private void waitForAsyncTrimming() throws InterruptedException {`
`184`		`- Thread.sleep(500);`
	`185`	`+ Thread.sleep(100);`
`185`	`186`	`}`
`186`	`187`	`}`