From 542ce7dd0d5df6431c86e8e46aacad6514c027cd Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 3 Dec 2015 13:48:19 +0100 Subject: [PATCH 1/2] Reduce OC_Config usage in tests/ --- tests/lib/files/filesystem.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index 7829eb9d70..6d48a4a47f 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); } /** From cbe6eeffa17415aec46852e7ff5442618ffb116b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 3 Dec 2015 14:03:05 +0100 Subject: [PATCH 2/2] last change of OC_Config to the proper interface in tests/ --- tests/lib/files/filesystem.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index 6d48a4a47f..c5ebbdd1a2 100644 --- a/tests/lib/files/filesystem.php +++ b/tests/lib/files/filesystem.php @@ -410,10 +410,11 @@ class Filesystem extends \Test\TestCase { public function testMountExternalCacheDir() { $userId = $this->getUniqueID('user_'); - $oldCachePath = \OC_Config::getValue('cache_path', ''); + $config = \OC::$server->getConfig(); + $oldCachePath = $config->getSystemValue('cache_path', ''); // set cache path to temp dir $cachePath = \OC_Helper::tmpFolder() . '/extcache'; - \OC_Config::setValue('cache_path', $cachePath); + $config->setSystemValue('cache_path', $cachePath); \OC_User::createUser($userId, $userId); \OC\Files\Filesystem::initMountPoints($userId); @@ -427,7 +428,7 @@ class Filesystem extends \Test\TestCase { $this->assertEquals('', $internalPath); \OC_User::deleteUser($userId); - \OC_Config::setValue('cache_path', $oldCachePath); + $config->setSystemValue('cache_path', $oldCachePath); } public function testRegisterMountProviderAfterSetup() {