code style

This commit is contained in:
Robin Appelman 2012-10-01 12:57:13 +02:00
parent 377fb19818
commit a61c820369
1 changed files with 44 additions and 46 deletions

View File

@ -1,26 +1,26 @@
<?php <?php
/** /**
* ownCloud * ownCloud
* *
* @author Robin Appelman * @author Robin Appelman
* @copyright 2012 Robin Appelman icewind@owncloud.com * @copyright 2012 Robin Appelman icewind@owncloud.com
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 3 of the License, or any later version. * version 3 of the License, or any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details. * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
* *
* You should have received a copy of the GNU Affero General Public * You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
class Test_Filesystem extends UnitTestCase{ class Test_Filesystem extends UnitTestCase {
/** /**
* @var array tmpDirs * @var array tmpDirs
*/ */
@ -30,47 +30,45 @@ class Test_Filesystem extends UnitTestCase{
* @return array * @return array
*/ */
private function getStorageData() { private function getStorageData() {
$dir=OC_Helper::tmpFolder(); $dir = OC_Helper::tmpFolder();
$this->tmpDirs[]=$dir; $this->tmpDirs[] = $dir;
return array('datadir'=>$dir); return array('datadir' => $dir);
} }
public function tearDown() { public function tearDown() {
foreach($this->tmpDirs as $dir) { foreach ($this->tmpDirs as $dir) {
OC_Helper::rmdirr($dir); OC_Helper::rmdirr($dir);
} }
} }
public function setUp() { public function setUp() {
OC_Filesystem::clearMounts(); OC_Filesystem::clearMounts();
} }
public function testMount() { public function testMount() {
OC_Filesystem::mount('OC_Filestorage_Local',self::getStorageData(),'/'); OC_Filesystem::mount('OC_Filestorage_Local', self::getStorageData(), '/');
$this->assertEqual('/',OC_Filesystem::getMountPoint('/')); $this->assertEqual('/', OC_Filesystem::getMountPoint('/'));
$this->assertEqual('/',OC_Filesystem::getMountPoint('/some/folder')); $this->assertEqual('/', OC_Filesystem::getMountPoint('/some/folder'));
$this->assertEqual('',OC_Filesystem::getInternalPath('/')); $this->assertEqual('', OC_Filesystem::getInternalPath('/'));
$this->assertEqual('some/folder',OC_Filesystem::getInternalPath('/some/folder')); $this->assertEqual('some/folder', OC_Filesystem::getInternalPath('/some/folder'));
OC_Filesystem::mount('OC_Filestorage_Local',self::getStorageData(),'/some'); OC_Filesystem::mount('OC_Filestorage_Local', self::getStorageData(), '/some');
$this->assertEqual('/',OC_Filesystem::getMountPoint('/')); $this->assertEqual('/', OC_Filesystem::getMountPoint('/'));
$this->assertEqual('/some/',OC_Filesystem::getMountPoint('/some/folder')); $this->assertEqual('/some/', OC_Filesystem::getMountPoint('/some/folder'));
$this->assertEqual('/some/',OC_Filesystem::getMountPoint('/some/')); $this->assertEqual('/some/', OC_Filesystem::getMountPoint('/some/'));
$this->assertEqual('/',OC_Filesystem::getMountPoint('/some')); $this->assertEqual('/', OC_Filesystem::getMountPoint('/some'));
$this->assertEqual('folder',OC_Filesystem::getInternalPath('/some/folder')); $this->assertEqual('folder', OC_Filesystem::getInternalPath('/some/folder'));
} }
public function testNormalize() { public function testNormalize() {
$this->assertEqual('/path',OC_Filesystem::normalizePath('/path/')); $this->assertEqual('/path', OC_Filesystem::normalizePath('/path/'));
$this->assertEqual('/path/',OC_Filesystem::normalizePath('/path/',false)); $this->assertEqual('/path/', OC_Filesystem::normalizePath('/path/', false));
$this->assertEqual('/path',OC_Filesystem::normalizePath('path')); $this->assertEqual('/path', OC_Filesystem::normalizePath('path'));
$this->assertEqual('/path',OC_Filesystem::normalizePath('\path')); $this->assertEqual('/path', OC_Filesystem::normalizePath('\path'));
$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo//bar/')); $this->assertEqual('/foo/bar', OC_Filesystem::normalizePath('/foo//bar/'));
$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo////bar')); $this->assertEqual('/foo/bar', OC_Filesystem::normalizePath('/foo////bar'));
if(class_exists('Normalizer')) { if (class_exists('Normalizer')) {
$this->assertEqual("/foo/bar\xC3\xBC",OC_Filesystem::normalizePath("/foo/baru\xCC\x88")); $this->assertEqual("/foo/bar\xC3\xBC", OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
} }
} }
} }
?>