X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FCacheTest.php;h=f60fad91099048ba5d1c8c2d3d34289175880a4f;hb=067c2dd8f5f6eb6cc808ddc4bd30aec104caf73d;hp=aa5395b0ab8f16b1906dfa8ece3b1976a43d9d94;hpb=aedd62e2b84b4ea0d3c03f5c23ec594f4ebb1c17;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/CacheTest.php b/tests/CacheTest.php
index aa5395b0..f60fad91 100644
--- a/tests/CacheTest.php
+++ b/tests/CacheTest.php
@@ -11,10 +11,10 @@ require_once 'application/Cache.php';
 /**
  * Unitary tests for cached pages
  */
-class CachedTest extends PHPUnit_Framework_TestCase
+class CacheTest extends PHPUnit_Framework_TestCase
 {
     // test cache directory
-    protected static $testCacheDir = 'tests/dummycache';
+    protected static $testCacheDir = 'sandbox/dummycache';
 
     // dummy cached file names / content
     protected static $pages = array('a', 'toto', 'd7b59c');
@@ -30,13 +30,22 @@ class CachedTest extends PHPUnit_Framework_TestCase
         } 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');
     }
 
+    /**
+     * Remove dummycache folder after each tests.
+     */
+    public function tearDown()
+    {
+        array_map('unlink', glob(self::$testCacheDir.'/*'));
+        rmdir(self::$testCacheDir);
+    }
+
     /**
      * Purge cached pages
      */
@@ -55,10 +64,13 @@ class CachedTest extends PHPUnit_Framework_TestCase
      */
     public function testPurgeCachedPagesMissingDir()
     {
+        $oldlog = ini_get('error_log');
+        ini_set('error_log', '/dev/null');
         $this->assertEquals(
-            'Cannot purge tests/dummycache_missing: no directory',
+            'Cannot purge sandbox/dummycache_missing: no directory',
             purgeCachedPages(self::$testCacheDir.'_missing')
         );
+        ini_set('error_log', $oldlog);
     }
 
     /**
@@ -72,7 +84,7 @@ class CachedTest extends PHPUnit_Framework_TestCase
         invalidateCaches(self::$testCacheDir);
         foreach (self::$pages as $page) {
             $this->assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache');
-        }        
+        }
 
         $this->assertArrayNotHasKey('tags', $_SESSION);
     }