open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
remotes/origin/ldap_group_count
Robin Appelman 13 years ago
parent cf9b7e343a
commit e888bdda30
3 changed files with 25 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 0
      config/config.sample.php
  2. 2
      tests/lib/files/etagtest.php
  3. 48
      tests/lib/files/filesystem.php

0
config/config.sample.php
Unescape View File

2
tests/lib/files/etagtest.php
Unescape 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/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);
$scanner = new \OC\Files\Utils\Scanner($user1);

48
tests/lib/files/filesystem.php
Unescape View File

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

Write Preview
Loading…
Cancel
Save