diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-12-03 13:48:19 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-12-03 13:48:19 +0100 |
| commit | 542ce7dd0d5df6431c86e8e46aacad6514c027cd (patch) | |
| tree | b610c0f87230075be94f24025d9422eec56c756c /tests | |
| parent | e62b6c1617886b2cdd7553ea9b119c431e4eb363 (diff) | |
| download | nextcloud-server-542ce7dd0d5df6431c86e8e46aacad6514c027cd.tar.gz nextcloud-server-542ce7dd0d5df6431c86e8e46aacad6514c027cd.zip | |
Reduce OC_Config usage in tests/
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/files/filesystem.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index 7829eb9d706..6d48a4a47fc 100644 --- a/tests/lib/files/filesystem.php +++ b/tests/lib/files/filesystem.php @@ -314,7 +314,6 @@ class Filesystem extends \Test\TestCase { * @expectedException \OC\User\NoUserException */ public function testLocalMountWhenUserDoesNotExist() { - $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); $userId = $this->getUniqueID('user_'); \OC\Files\Filesystem::initMountPoints($userId); @@ -352,7 +351,7 @@ class Filesystem extends \Test\TestCase { if (getenv('RUN_OBJECTSTORE_TESTS')) { $this->markTestSkipped('legacy storage unrelated to objectstore environments'); } - $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + $datadir = \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data"); $userId = $this->getUniqueID('user_'); // insert storage into DB by constructing it @@ -384,9 +383,10 @@ class Filesystem extends \Test\TestCase { */ public function testMountDefaultCacheDir() { $userId = $this->getUniqueID('user_'); - $oldCachePath = \OC_Config::getValue('cache_path', ''); + $config = \OC::$server->getConfig(); + $oldCachePath = $config->getSystemValue('cache_path', ''); // no cache path configured - \OC_Config::setValue('cache_path', ''); + $config->setSystemValue('cache_path', ''); \OC_User::createUser($userId, $userId); \OC\Files\Filesystem::initMountPoints($userId); @@ -400,7 +400,7 @@ class Filesystem extends \Test\TestCase { $this->assertEquals('cache', $internalPath); \OC_User::deleteUser($userId); - \OC_Config::setValue('cache_path', $oldCachePath); + $config->setSystemValue('cache_path', $oldCachePath); } /** |