summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-12-06 18:26:38 +0100
committerVincent Petry <pvince81@owncloud.com>2013-12-08 00:17:17 +0100
commit8fe4698d44c82a27ee5b9e6dcf28c08303d12a42 (patch)
tree92d975ec5dae3f6ae5e2f507ec2b2d53fcfc5a38
parent5d600e9d68bf986674e53d6ffe01e292d3208a89 (diff)
downloadnextcloud-server-8fe4698d44c82a27ee5b9e6dcf28c08303d12a42.tar.gz
nextcloud-server-8fe4698d44c82a27ee5b9e6dcf28c08303d12a42.zip
get rid of failing test that don't cause additional downloads
-rwxr-xr-x[-rw-r--r--]config/config.sample.php0
-rw-r--r--tests/lib/files/etagtest.php2
-rw-r--r--tests/lib/files/filesystem.php46
3 files changed, 24 insertions, 24 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 092480d4f5d..092480d4f5d 100644..100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
index 04f79594a29..6c41413c4df 100644
--- a/tests/lib/files/etagtest.php
+++ b/tests/lib/files/etagtest.php
@@ -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);
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 16b9237150a..eb13b5a77b4 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -26,7 +26,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
/**
* @var array tmpDirs
*/
- private $tmpDirs=array();
+ private $tmpDirs = array();
/**
* @return array
@@ -48,21 +48,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() {
@@ -133,20 +133,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');