Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.

diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 6956e7aa9488c84c3086ce346b5448a322b80958..3f3a045377a8efba7351a4987f59dd749b748a99 100644 (file)
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -24,6 +24,21 @@ class Scanner extends \PHPUnit_Framework_TestCase {
         */
        private $cache;
 
+       function setUp() {
+               $this->storage = new \OC\Files\Storage\Temporary(array());
+               $this->scanner = new \OC\Files\Cache\Scanner($this->storage);
+               $this->cache = new \OC\Files\Cache\Cache($this->storage);
+       }
+
+       function tearDown() {
+               if ($this->cache) {
+                       $ids = $this->cache->getAll();
+                       $permissionsCache = $this->storage->getPermissionsCache();
+                       $permissionsCache->removeMultiple($ids, \OC_User::getUser());
+                       $this->cache->clear();
+               }
+       }
+
        function testFile() {
                $data = "dummy file data\n";
                $this->storage->file_put_contents('foo.txt', $data);
@@ -218,19 +233,4 @@ class Scanner extends \PHPUnit_Framework_TestCase {
                $this->assertNotEquals($data1['etag'], $newData1['etag']);
                $this->assertNotEquals($data2['etag'], $newData2['etag']);
        }
-
-       function setUp() {
-               $this->storage = new \OC\Files\Storage\Temporary(array());
-               $this->scanner = new \OC\Files\Cache\Scanner($this->storage);
-               $this->cache = new \OC\Files\Cache\Cache($this->storage);
-       }
-
-       function tearDown() {
-               if ($this->cache) {
-                       $ids = $this->cache->getAll();
-                       $permissionsCache = $this->storage->getPermissionsCache();
-                       $permissionsCache->removeMultiple($ids, \OC_User::getUser());
-                       $this->cache->clear();
-               }
-       }
 }