convert Cache to a non-static class that handles the cache for a single storage backend

1 files changed, 42 insertions, 40 deletions

diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 9f35cd889ac..24dd38fa736 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -16,82 +16,83 @@ class Cache extends \UnitTestCase {
 	 */
 	private $storage;
 
-	private function createPath($path) {
-		return new \OC\Files\File($this->storage, $path);
-	}
+	/**
+	 * @var \OC\Files\Cache\Cache $cache
+	 */
+	private $cache;
 
 	public function testSimple() {
-		$file1 = $this->createPath('foo');
-		$file2 = $this->createPath('foo/bar');
+		$file1 = 'foo';
+		$file2 = 'foo/bar';
 		$data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/folder');
 		$data2 = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file');
 
-		$this->assertFalse(FileCache::inCache($file1));
-		$this->assertEqual(FileCache::get($file1), null);
+		$this->assertFalse($this->cache->inCache($file1));
+		$this->assertEqual($this->cache->get($file1), null);
 
-		$id1 = FileCache::put($file1, $data1);
-		$this->assertTrue(FileCache::inCache($file1));
-		$cacheData1 = FileCache::get($file1);
+		$id1 = $this->cache->put($file1, $data1);
+		$this->assertTrue($this->cache->inCache($file1));
+		$cacheData1 = $this->cache->get($file1);
 		foreach ($data1 as $key => $value) {
 			$this->assertEqual($value, $cacheData1[$key]);
 		}
 		$this->assertEqual($cacheData1['fileid'], $id1);
-		$this->assertEqual($id1, FileCache::getId($file1));
+		$this->assertEqual($id1, $this->cache->getId($file1));
 
-		$this->assertFalse(FileCache::inCache($file2));
-		$id2 = FileCache::put($file2, $data2);
-		$this->assertTrue(FileCache::inCache($file2));
-		$cacheData2 = FileCache::get($file2);
+		$this->assertFalse($this->cache->inCache($file2));
+		$id2 = $this->cache->put($file2, $data2);
+		$this->assertTrue($this->cache->inCache($file2));
+		$cacheData2 = $this->cache->get($file2);
 		foreach ($data2 as $key => $value) {
 			$this->assertEqual($value, $cacheData2[$key]);
 		}
 		$this->assertEqual($cacheData1['fileid'], $cacheData2['parent']);
 		$this->assertEqual($cacheData2['fileid'], $id2);
-		$this->assertEqual($id2, FileCache::getId($file2));
-		$this->assertEqual($id1, FileCache::getParentId($file2));
+		$this->assertEqual($id2, $this->cache->getId($file2));
+		$this->assertEqual($id1, $this->cache->getParentId($file2));
 
 		$newSize = 1050;
-		$newId2 = FileCache::put($file2, array('size' => $newSize));
-		$cacheData2 = FileCache::get($file2);
+		$newId2 = $this->cache->put($file2, array('size' => $newSize));
+		$cacheData2 = $this->cache->get($file2);
 		$this->assertEqual($newId2, $id2);
 		$this->assertEqual($cacheData2['size'], $newSize);
-		$this->assertEqual($cacheData1, FileCache::get($file1));
+		$this->assertEqual($cacheData1, $this->cache->get($file1));
 
-		FileCache::remove($file2);
-		$this->assertFalse(FileCache::inCache($file2));
-		$this->assertEqual(FileCache::get($file2), null);
-		$this->assertTrue(FileCache::inCache($file1));
+		$this->cache->remove($file2);
+		$this->assertFalse($this->cache->inCache($file2));
+		$this->assertEqual($this->cache->get($file2), null);
+		$this->assertTrue($this->cache->inCache($file1));
 
-		$this->assertEqual($cacheData1, FileCache::get($id1));
+		$this->assertEqual($cacheData1, $this->cache->get($id1));
 	}
 
 	public function testPartial() {
-		$file1 = $this->createPath('foo');
+		$file1 = 'foo';
 
-		FileCache::put($file1, array('size' => 10));
-		$this->assertEqual(array('size' => 10), FileCache::get($file1));
+		$this->cache->put($file1, array('size' => 10));
+		$this->assertEqual(array('size' => 10), $this->cache->get($file1));
 
-		FileCache::put($file1, array('mtime' => 15));
-		$this->assertEqual(array('size' => 10, 'mtime' => 15), FileCache::get($file1));
+		$this->cache->put($file1, array('mtime' => 15));
+		$this->assertEqual(array('size' => 10, 'mtime' => 15), $this->cache->get($file1));
 
-		FileCache::put($file1, array('size' => 12));
-		$this->assertEqual(array('size' => 12, 'mtime' => 15), FileCache::get($file1));
+		$this->cache->put($file1, array('size' => 12));
+		$this->assertEqual(array('size' => 12, 'mtime' => 15), $this->cache->get($file1));
 	}
 
 	public function testFolder() {
-		$file1 = $this->createPath('folder');
-		$file2 = $this->createPath('folder/bar');
-		$file3 = $this->createPath('folder/foo');
+		$file1 = 'folder';
+		$file2 = 'folder/bar';
+		$file3 = 'folder/foo';
 		$data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/folder');
 		$fileData = array();
 		$fileData['bar'] = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file');
 		$fileData['foo'] = array('size' => 20, 'mtime' => 25, 'mimetype' => 'foo/file');
 
-		FileCache::put($file1, $data1);
-		FileCache::put($file2, $fileData['bar']);
-		FileCache::put($file3, $fileData['foo']);
+		$this->cache->put($file1, $data1);
+		$this->cache->put($file2, $fileData['bar']);
+		$this->cache->put($file3, $fileData['foo']);
 
-		$content = FileCache::getFolderContents($file1);
+		$content = $this->cache->getFolderContents($file1);
 		$this->assertEqual(count($content), 2);
 		foreach ($content as $cachedData) {
 			$data = $fileData[$cachedData['name']];
@@ -102,10 +103,11 @@ class Cache extends \UnitTestCase {
 	}
 
 	public function tearDown() {
-		FileCache::removeStorage($this->storage);
+		$this->cache->clear();
 	}
 
 	public function setUp() {
 		$this->storage = new \OC\Files\Storage\Temporary(array());
+		$this->cache = new \OC\Files\Cache\Cache($this->storage);
 	}
 }