Skip to content

Commit 01bba67

Browse files
committed
#112: touch file to check is cache trimming is required after cache completion
1 parent e0ee4a7 commit 01bba67

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

library/src/main/java/com/danikula/videocache/file/FileCache.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public synchronized void complete() throws ProxyCacheException {
100100
file = completedFile;
101101
try {
102102
dataFile = new RandomAccessFile(file, "r");
103+
diskUsage.touch(file);
103104
} catch (IOException e) {
104105
throw new ProxyCacheException("Error opening " + file + " as disc cache", e);
105106
}

test/src/test/java/com/danikula/videocache/HttpProxyCacheServerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,6 @@ private HttpProxyCacheServer newProxy(File cacheDir) {
365365
}
366366

367367
private void waitForAsyncTrimming() throws InterruptedException {
368-
Thread.sleep(500);
368+
Thread.sleep(100);
369369
}
370370
}

test/src/test/java/com/danikula/videocache/file/FileCacheTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,15 @@ public void testTrimAfterCompletionForTotalCountLru() throws Exception {
161161
public void testTrimAfterCompletionForTotalSizeLru() throws Exception {
162162
File cacheDir = newCacheFile();
163163
byte[] data = loadAssetFile(ASSETS_DATA_NAME);
164-
DiskUsage diskUsage = new TotalSizeLruDiskUsage(data.length*3-1);
164+
DiskUsage diskUsage = new TotalSizeLruDiskUsage(data.length * 3 - 1);
165165
saveAndCompleteCache(diskUsage, data,
166166
new File(cacheDir, "0.dat"),
167167
new File(cacheDir, "1.dat"),
168168
new File(cacheDir, "2.dat")
169169
);
170170
waitForAsyncTrimming();
171-
assertThat(new File(cacheDir, "0.dat")).doesNotExist();
171+
File deletedFile = new File(cacheDir, "0.dat");
172+
assertThat(deletedFile).doesNotExist();
172173
}
173174

174175
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
181182
}
182183

183184
private void waitForAsyncTrimming() throws InterruptedException {
184-
Thread.sleep(500);
185+
Thread.sleep(100);
185186
}
186187
}

0 commit comments

Comments
 (0)