Fix unit tests

diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 4610e2b4d46f6661c4ac0f220486d882e10e53fe..267fc63302dad35846f4ac683d07c8b2b27d9862 100644 (file)
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -42,6 +42,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
        public function testReuseExistingRoot() {
                $storage = new Temporary(array());
                $mount = new Mount($storage, '');
+               Filesystem::getMountManager()->addMount($mount);
                $cache = $storage->getCache();
 
                $storage->mkdir('folder');
@@ -63,6 +64,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
        public function testReuseExistingFile() {
                $storage = new Temporary(array());
                $mount = new Mount($storage, '');
+               Filesystem::getMountManager()->addMount($mount);
                $cache = $storage->getCache();
 
                $storage->mkdir('folder');

diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index c26c6f29fc0687bed9acb5ab10df741f3f2aa31d..cdaec8554523711ffa38f34b4c1817a620dc9fa6 100644 (file)
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -49,14 +49,18 @@ class View extends \PHPUnit_Framework_TestCase {
                $storage1 = $this->getTestStorage();
                $storage2 = $this->getTestStorage();
                $storage3 = $this->getTestStorage();
-               \OC\Files\Filesystem::mount($storage1, array(), '/');
-               \OC\Files\Filesystem::mount($storage2, array(), '/substorage');
-               \OC\Files\Filesystem::mount($storage3, array(), '/folder/anotherstorage');
+               $root = '/' . uniqid();
+               \OC\Files\Filesystem::mount($storage1, array(), $root . '/');
+               \OC\Files\Filesystem::mount($storage2, array(), $root . '/substorage');
+               \OC\Files\Filesystem::mount($storage3, array(), $root . '/folder/anotherstorage');
                $textSize = strlen("dummy file data\n");
                $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
                $storageSize = $textSize * 2 + $imageSize;
 
-               $rootView = new \OC\Files\View('');
+               $storageInfo = $storage3->getCache()->get('');
+               $this->assertEquals($storageSize, $storageInfo['size']);
+
+               $rootView = new \OC\Files\View($root);
 
                $cachedData = $rootView->getFileInfo('/foo.txt');
                $this->assertEquals($textSize, $cachedData['size']);
@@ -107,7 +111,7 @@ class View extends \PHPUnit_Framework_TestCase {
                $this->assertEquals('foo.png', $folderData[1]['name']);
                $this->assertEquals('foo.txt', $folderData[2]['name']);
 
-               $folderView = new \OC\Files\View('/folder');
+               $folderView = new \OC\Files\View($root . '/folder');
                $this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/'));
 
                $cachedData = $rootView->getFileInfo('/foo.txt');