mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20914 from owncloud/drop-more-OC_Config-from-tests 

Replace more of OC_Config in tests with IConfig calls
This commit is contained in:
Lukas Reschke 2015-12-03 10:49:12 +01:00
parent c6bda8d6ca e9c8f82fc5
commit 0d6f02bac9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/lib/cache/file.php vendored
View File

@ -63,8 +63,9 @@ class FileCache extends \Test_Cache {
$storage = new \OC\Files\Storage\Temporary(array());
\OC\Files\Filesystem::mount($storage,array(),'/');
$datadir = str_replace('local::', '', $storage->getId());
$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
\OC_Config::setValue('cachedirectory', $datadir);
$config = \OC::$server->getConfig();
$this->datadir = $config->getSystemValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
$config->setSystemValue('cachedirectory', $datadir);
\OC_User::clearBackends();
\OC_User::useBackend(new \Test\Util\User\Dummy());
@ -89,7 +90,7 @@ class FileCache extends \Test_Cache {
$this->instance->remove('hack', 'hack');
\OC_User::setUserId($this->user);
\OC_Config::setValue('cachedirectory', $this->datadir);
\OC::$server->getConfig()->setSystemValue('cachedirectory', $this->datadir);
// Restore the original mount point
\OC\Files\Filesystem::clearMounts();

7
tests/lib/files/etagtest.php
View File

@ -37,16 +37,17 @@ class EtagTest extends \Test\TestCase {
\OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
\OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
$this->datadir = \OC_Config::getValue('datadirectory');
$config = \OC::$server->getConfig();
$this->datadir = $config->getSystemValue('datadirectory');
$this->tmpDir = \OC_Helper::tmpFolder();
\OC_Config::setValue('datadirectory', $this->tmpDir);
$config->setSystemValue('datadirectory', $this->tmpDir);
$this->userBackend = new \Test\Util\User\Dummy();
\OC_User::useBackend($this->userBackend);
}
protected function tearDown() {
\OC_Config::setValue('datadirectory', $this->datadir);
\OC::$server->getConfig()->setSystemValue('datadirectory', $this->datadir);
$this->logout();
parent::tearDown();