From 40541fadfe5f5f2e40ee1a7bad94a83c33ece544 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 16 Aug 2016 11:19:42 +0200
Subject: [PATCH] clearOldFiles() test must run on the emulator

It seems that Robolectric does not implement android.system.Os so the
atime checking code cannot be tested there.  Works fine on the emulator.
---
 .../fdroid/fdroid/CleanCacheServiceTest.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)
 rename app/src/{test => androidTest}/java/org/fdroid/fdroid/CleanCacheServiceTest.java (71%)

diff --git a/app/src/test/java/org/fdroid/fdroid/CleanCacheServiceTest.java b/app/src/androidTest/java/org/fdroid/fdroid/CleanCacheServiceTest.java
similarity index 71%
rename from app/src/test/java/org/fdroid/fdroid/CleanCacheServiceTest.java
rename to app/src/androidTest/java/org/fdroid/fdroid/CleanCacheServiceTest.java
index 0c32ef893..ea2e4eb5e 100644
--- a/app/src/test/java/org/fdroid/fdroid/CleanCacheServiceTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/CleanCacheServiceTest.java
@@ -1,12 +1,10 @@
 package org.fdroid.fdroid;
 
+import android.support.test.runner.AndroidJUnit4;
+
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.BuildConfig;
-import org.fdroid.fdroid.CleanCacheService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,11 +12,11 @@ import java.io.IOException;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-// TODO: Use sdk=24 when Robolectric supports this
-@Config(constants = BuildConfig.class, sdk = 23)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class CleanCacheServiceTest {
 
+    public static final String TAG = "CleanCacheServiceTest";
+
     @Test
     public void testClearOldFiles() throws IOException, InterruptedException {
         File tempDir = new File(System.getProperty("java.io.tmpdir"));
@@ -46,13 +44,18 @@ public class CleanCacheServiceTest {
         assertTrue(second.createNewFile());
         assertTrue(second.exists());
 
-        CleanCacheService.clearOldFiles(dir, 3000);
+        CleanCacheService.clearOldFiles(dir, 3000);  // check all in dir
         assertFalse(first.exists());
         assertTrue(second.exists());
 
         Thread.sleep(7000);
-        CleanCacheService.clearOldFiles(dir, 3000);
+        CleanCacheService.clearOldFiles(second, 3000);  // check just second file
         assertFalse(first.exists());
         assertFalse(second.exists());
+
+        // make sure it doesn't freak out on a non-existant file
+        File nonexistant = new File(tempDir, "nonexistant");
+        CleanCacheService.clearOldFiles(nonexistant, 1);
+        CleanCacheService.clearOldFiles(null, 1);
     }
 }