Cache: simplify cached content cleanup, improve tests

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

1 files changed, 17 insertions, 1 deletions

diff --git a/tests/CacheTest.php b/tests/CacheTest.php
index 4caf6552..aa5395b0 100644
--- a/tests/CacheTest.php
+++ b/tests/CacheTest.php
@@ -27,11 +27,14 @@ class CachedTest extends PHPUnit_Framework_TestCase
     {
         if (! is_dir(self::$testCacheDir)) {
             mkdir(self::$testCacheDir);
+        } else {
+            array_map('unlink', glob(self::$testCacheDir.'/*'));
         }
         
         foreach (self::$pages as $page) {
             file_put_contents(self::$testCacheDir.'/'.$page.'.cache', $page);
         }
+        file_put_contents(self::$testCacheDir.'/intru.der', 'ShouldNotBeThere');
     }
 
     /**
@@ -42,7 +45,20 @@ class CachedTest extends PHPUnit_Framework_TestCase
         purgeCachedPages(self::$testCacheDir);
         foreach (self::$pages as $page) {
             $this->assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache');
-        }        
+        }
+
+        $this->assertFileExists(self::$testCacheDir.'/intru.der');
+    }
+
+    /**
+     * Purge cached pages - missing directory
+     */
+    public function testPurgeCachedPagesMissingDir()
+    {
+        $this->assertEquals(
+            'Cannot purge tests/dummycache_missing: no directory',
+            purgeCachedPages(self::$testCacheDir.'_missing')
+        );
     }
 
     /**