Further unit test suite tweats

diff --git a/tests/lib/files/storage/homestoragequota.php b/tests/lib/files/storage/homestoragequota.php
new file mode 100644 (file)
index 0000000..49e8f49
--- /dev/null
+++ b/tests/lib/files/storage/homestoragequota.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Files\Storage;
+
+/**
+ * Class HomeStorageQuota
+ *
+ * @group DB
+ */
+class HomeStorageQuota extends \Test\TestCase {
+       /**
+        * Tests that the home storage is not wrapped when no quota exists.
+        */
+       function testHomeStorageWrapperWithoutQuota() {
+               $user1 = $this->getUniqueID();
+               \OC_User::createUser($user1, 'test');
+               \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', 'none');
+               \OC_User::setUserId($user1);
+
+               \OC_Util::setupFS($user1);
+
+               $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
+               $this->assertNotNull($userMount);
+               $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage());
+
+               // clean up
+               \OC_User::setUserId('');
+               \OC_User::deleteUser($user1);
+               \OC::$server->getConfig()->deleteAllUserValues($user1);
+               \OC_Util::tearDownFS();
+       }
+
+       /**
+        * Tests that the home storage is not wrapped when no quota exists.
+        */
+       function testHomeStorageWrapperWithQuota() {
+               $user1 = $this->getUniqueID();
+               \OC_User::createUser($user1, 'test');
+               \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', '1024');
+               \OC_User::setUserId($user1);
+
+               \OC_Util::setupFS($user1);
+
+               $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
+               $this->assertNotNull($userMount);
+               $this->assertTrue($userMount->getStorage()->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota'));
+
+               // ensure that root wasn't wrapped
+               $rootMount = \OC\Files\Filesystem::getMountManager()->find('/');
+               $this->assertNotNull($rootMount);
+               $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $rootMount->getStorage());
+
+               // clean up
+               \OC_User::setUserId('');
+               \OC_User::deleteUser($user1);
+               \OC::$server->getConfig()->deleteAllUserValues($user1);
+               \OC_Util::tearDownFS();
+       }
+
+}

diff --git a/tests/lib/user.php b/tests/lib/user.php
index 3c068be28269716e53fbd95b59aaeca753cd919a..bc1ba063c8febd1f7751e4ddf66c4b7881c4311b 100644 (file)
--- a/tests/lib/user.php
+++ b/tests/lib/user.php
@@ -9,6 +9,13 @@
 
 namespace Test;
 
+/**
+ * Class User
+ *
+ * @group DB
+ *
+ * @package Test
+ */
 class User extends TestCase {
        /**
         * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
@@ -70,4 +77,4 @@ class User extends TestCase {
                $this->assertEquals('newuser', $user->getUid());
        }
 
-}
\ No newline at end of file
+}

diff --git a/tests/lib/util.php b/tests/lib/util.php
index a328b1923e961566430ac9d79740d4e30ec0feb9..608c5f0c5016288020b597fdce3d8602ecb77190 100644 (file)
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -166,55 +166,6 @@ class Test_Util extends \Test\TestCase {
                $this->assertSame(1, $matchesRegex);
        }
 
-       /**
-        * Tests that the home storage is not wrapped when no quota exists.
-        */
-       function testHomeStorageWrapperWithoutQuota() {
-               $user1 = $this->getUniqueID();
-               \OC_User::createUser($user1, 'test');
-               \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', 'none');
-               \OC_User::setUserId($user1);
-
-               \OC_Util::setupFS($user1);
-
-               $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
-               $this->assertNotNull($userMount);
-               $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $userMount->getStorage());
-
-               // clean up
-               \OC_User::setUserId('');
-               \OC_User::deleteUser($user1);
-               \OC::$server->getConfig()->deleteAllUserValues($user1);
-               \OC_Util::tearDownFS();
-       }
-
-       /**
-        * Tests that the home storage is not wrapped when no quota exists.
-        */
-       function testHomeStorageWrapperWithQuota() {
-               $user1 = $this->getUniqueID();
-               \OC_User::createUser($user1, 'test');
-               \OC::$server->getConfig()->setUserValue($user1, 'files', 'quota', '1024');
-               \OC_User::setUserId($user1);
-
-               \OC_Util::setupFS($user1);
-
-               $userMount = \OC\Files\Filesystem::getMountManager()->find('/' . $user1 . '/');
-               $this->assertNotNull($userMount);
-               $this->assertTrue($userMount->getStorage()->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota'));
-
-               // ensure that root wasn't wrapped
-               $rootMount = \OC\Files\Filesystem::getMountManager()->find('/');
-               $this->assertNotNull($rootMount);
-               $this->assertNotInstanceOf('\OC\Files\Storage\Wrapper\Quota', $rootMount->getStorage());
-
-               // clean up
-               \OC_User::setUserId('');
-               \OC_User::deleteUser($user1);
-               \OC::$server->getConfig()->deleteAllUserValues($user1);
-               \OC_Util::tearDownFS();
-       }
-
        /**
         * @dataProvider baseNameProvider
         */