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

get rid of failing test that don't cause additional downloads

This commit is contained in:
Robin Appelman 2013-12-06 18:26:38 +01:00
parent cf9b7e343a
commit e888bdda30
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
config/config.sample.php Normal file → Executable file
View File

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

@ -59,7 +59,7 @@ class EtagTest extends \PHPUnit_Framework_TestCase {
Filesystem::file_put_contents('/folder/bar.txt', 'fgh'); Filesystem::file_put_contents('/folder/bar.txt', 'fgh');
Filesystem::file_put_contents('/folder/subfolder/qwerty.txt', 'jkl'); Filesystem::file_put_contents('/folder/subfolder/qwerty.txt', 'jkl');
$files = array('/', '/folder', '/foo.txt', '/folder/bar.txt', '/folder/subfolder', '/folder/subfolder/qwerty.txt'); $files = array('/foo.txt', '/folder/bar.txt', '/folder/subfolder', '/folder/subfolder/qwerty.txt');
$originalEtags = $this->getEtags($files); $originalEtags = $this->getEtags($files);
$scanner = new \OC\Files\Utils\Scanner($user1); $scanner = new \OC\Files\Utils\Scanner($user1);

46
tests/lib/files/filesystem.php
View File

@ -26,7 +26,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
/** /**
* @var array tmpDirs * @var array tmpDirs
*/ */
private $tmpDirs=array(); private $tmpDirs = array();
/** /**
* @return array * @return array
@ -51,21 +51,21 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
} }
public function testMount() { public function testMount() {
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/'); \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/');
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/')); $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/some/folder')); $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/'); list(, $internalPath) = \OC\Files\Filesystem::resolvePath('/');
$this->assertEquals('',$internalPath); $this->assertEquals('', $internalPath);
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/some/folder'); list(, $internalPath) = \OC\Files\Filesystem::resolvePath('/some/folder');
$this->assertEquals('some/folder',$internalPath); $this->assertEquals('some/folder', $internalPath);
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/some'); \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/some');
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/')); $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/folder')); $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/')); $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some')); $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some'));
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/some/folder'); list(, $internalPath) = \OC\Files\Filesystem::resolvePath('/some/folder');
$this->assertEquals('folder',$internalPath); $this->assertEquals('folder', $internalPath);
} }
public function testNormalize() { public function testNormalize() {
@ -136,20 +136,20 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
} }
public function testHooks() { public function testHooks() {
if(\OC\Files\Filesystem::getView()){ if (\OC\Files\Filesystem::getView()) {
$user = \OC_User::getUser(); $user = \OC_User::getUser();
}else{ } else {
$user=uniqid(); $user = uniqid();
\OC\Files\Filesystem::init($user, '/'.$user.'/files'); \OC\Files\Filesystem::init($user, '/' . $user . '/files');
} }
\OC_Hook::clear('OC_Filesystem'); \OC_Hook::clear('OC_Filesystem');
\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook'); \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/'); \OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
$rootView=new \OC\Files\View(''); $rootView = new \OC\Files\View('');
$rootView->mkdir('/'.$user); $rootView->mkdir('/' . $user);
$rootView->mkdir('/'.$user.'/files'); $rootView->mkdir('/' . $user . '/files');
// \OC\Files\Filesystem::file_put_contents('/foo', 'foo'); // \OC\Files\Filesystem::file_put_contents('/foo', 'foo');
\OC\Files\Filesystem::mkdir('/bar'); \OC\Files\Filesystem::mkdir('/bar');
@ -215,7 +215,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
$homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/'); $homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
$this->assertInstanceOf('\OC\Files\Storage\Home', $homeMount); $this->assertInstanceOf('\OC\Files\Storage\Home', $homeMount);
$this->assertEquals('local::' . $datadir. '/' . $userId . '/', $homeMount->getId()); $this->assertEquals('local::' . $datadir . '/' . $userId . '/', $homeMount->getId());
\OC_User::deleteUser($userId); \OC_User::deleteUser($userId);
// delete storage entry // delete storage entry