[Pkg-owncloud-commits] [owncloud] 12/67: code style
David Prévot
taffit at alioth.debian.org
Fri Nov 8 23:10:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v4.5.1
in repository owncloud.
commit 5398dea0df7218b2d738c18c56fc0a2a1a10d26f
Author: Robin Appelman <icewind at owncloud.com>
Date: Thu Oct 11 19:30:27 2012 +0200
code style
---
tests/lib/filestorage.php | 298 ++++++++++++++++++++++-----------------------
1 file changed, 149 insertions(+), 149 deletions(-)
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 101da0d..4191b0c 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -1,24 +1,24 @@
<?php
/**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2012 Robin Appelman icewind at owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* 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/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Robin Appelman icewind at owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * 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/>.
+ *
+ */
abstract class Test_FileStorage extends UnitTestCase {
/**
@@ -30,195 +30,195 @@ abstract class Test_FileStorage extends UnitTestCase {
* the root folder of the storage should always exist, be readable and be recognized as a directory
*/
public function testRoot() {
- $this->assertTrue($this->instance->file_exists('/'),'Root folder does not exist');
- $this->assertTrue($this->instance->isReadable('/'),'Root folder is not readable');
- $this->assertTrue($this->instance->is_dir('/'),'Root folder is not a directory');
- $this->assertFalse($this->instance->is_file('/'),'Root folder is a file');
- $this->assertEqual('dir',$this->instance->filetype('/'));
-
+ $this->assertTrue($this->instance->file_exists('/'), 'Root folder does not exist');
+ $this->assertTrue($this->instance->isReadable('/'), 'Root folder is not readable');
+ $this->assertTrue($this->instance->is_dir('/'), 'Root folder is not a directory');
+ $this->assertFalse($this->instance->is_file('/'), 'Root folder is a file');
+ $this->assertEqual('dir', $this->instance->filetype('/'));
+
//without this, any further testing would be useless, not an acutal requirement for filestorage though
- $this->assertTrue($this->instance->isUpdatable('/'),'Root folder is not writable');
+ $this->assertTrue($this->instance->isUpdatable('/'), 'Root folder is not writable');
}
-
+
public function testDirectories() {
$this->assertFalse($this->instance->file_exists('/folder'));
-
+
$this->assertTrue($this->instance->mkdir('/folder'));
-
+
$this->assertTrue($this->instance->file_exists('/folder'));
$this->assertTrue($this->instance->is_dir('/folder'));
$this->assertFalse($this->instance->is_file('/folder'));
- $this->assertEqual('dir',$this->instance->filetype('/folder'));
- $this->assertEqual(0,$this->instance->filesize('/folder'));
+ $this->assertEqual('dir', $this->instance->filetype('/folder'));
+ $this->assertEqual(0, $this->instance->filesize('/folder'));
$this->assertTrue($this->instance->isReadable('/folder'));
$this->assertTrue($this->instance->isUpdatable('/folder'));
-
- $dh=$this->instance->opendir('/');
- $content=array();
- while($file=readdir($dh)) {
- if($file!='.' and $file!='..') {
- $content[]=$file;
+
+ $dh = $this->instance->opendir('/');
+ $content = array();
+ while ($file = readdir($dh)) {
+ if ($file != '.' and $file != '..') {
+ $content[] = $file;
}
}
- $this->assertEqual(array('folder'),$content);
-
- $this->assertFalse($this->instance->mkdir('/folder'));//cant create existing folders
+ $this->assertEqual(array('folder'), $content);
+
+ $this->assertFalse($this->instance->mkdir('/folder')); //cant create existing folders
$this->assertTrue($this->instance->rmdir('/folder'));
-
+
$this->assertFalse($this->instance->file_exists('/folder'));
-
- $this->assertFalse($this->instance->rmdir('/folder'));//cant remove non existing folders
-
- $dh=$this->instance->opendir('/');
- $content=array();
- while($file=readdir($dh)) {
- if($file!='.' and $file!='..') {
- $content[]=$file;
+
+ $this->assertFalse($this->instance->rmdir('/folder')); //cant remove non existing folders
+
+ $dh = $this->instance->opendir('/');
+ $content = array();
+ while ($file = readdir($dh)) {
+ if ($file != '.' and $file != '..') {
+ $content[] = $file;
}
}
- $this->assertEqual(array(),$content);
+ $this->assertEqual(array(), $content);
}
/**
* test the various uses of file_get_contents and file_put_contents
*/
public function testGetPutContents() {
- $sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
- $sourceText=file_get_contents($sourceFile);
-
+ $sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $sourceText = file_get_contents($sourceFile);
+
//fill a file with string data
- $this->instance->file_put_contents('/lorem.txt',$sourceText);
+ $this->instance->file_put_contents('/lorem.txt', $sourceText);
$this->assertFalse($this->instance->is_dir('/lorem.txt'));
- $this->assertEqual($sourceText,$this->instance->file_get_contents('/lorem.txt'),'data returned from file_get_contents is not equal to the source data');
+ $this->assertEqual($sourceText, $this->instance->file_get_contents('/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
//empty the file
- $this->instance->file_put_contents('/lorem.txt','');
- $this->assertEqual('',$this->instance->file_get_contents('/lorem.txt'),'file not emptied');
+ $this->instance->file_put_contents('/lorem.txt', '');
+ $this->assertEqual('', $this->instance->file_get_contents('/lorem.txt'), 'file not emptied');
}
-
+
/**
* test various known mimetypes
*/
public function testMimeType() {
- $this->assertEqual('httpd/unix-directory',$this->instance->getMimeType('/'));
- $this->assertEqual(false,$this->instance->getMimeType('/non/existing/file'));
-
- $textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
- $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
- $this->assertEqual('text/plain',$this->instance->getMimeType('/lorem.txt'));
-
- $pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
- $this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r'));
- $this->assertEqual('image/png',$this->instance->getMimeType('/logo-wide.png'));
-
- $svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg';
- $this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
- $this->assertEqual('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
+ $this->assertEqual('httpd/unix-directory', $this->instance->getMimeType('/'));
+ $this->assertEqual(false, $this->instance->getMimeType('/non/existing/file'));
+
+ $textFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
+ $this->assertEqual('text/plain', $this->instance->getMimeType('/lorem.txt'));
+
+ $pngFile = OC::$SERVERROOT . '/tests/data/logo-wide.png';
+ $this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r'));
+ $this->assertEqual('image/png', $this->instance->getMimeType('/logo-wide.png'));
+
+ $svgFile = OC::$SERVERROOT . '/tests/data/logo-wide.svg';
+ $this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
+ $this->assertEqual('image/svg+xml', $this->instance->getMimeType('/logo-wide.svg'));
}
-
+
public function testCopyAndMove() {
- $textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
- $this->instance->file_put_contents('/source.txt',file_get_contents($textFile));
- $this->instance->copy('/source.txt','/target.txt');
+ $textFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $this->instance->file_put_contents('/source.txt', file_get_contents($textFile));
+ $this->instance->copy('/source.txt', '/target.txt');
$this->assertTrue($this->instance->file_exists('/target.txt'));
- $this->assertEqual($this->instance->file_get_contents('/source.txt'),$this->instance->file_get_contents('/target.txt'));
-
- $this->instance->rename('/source.txt','/target2.txt');
+ $this->assertEqual($this->instance->file_get_contents('/source.txt'), $this->instance->file_get_contents('/target.txt'));
+
+ $this->instance->rename('/source.txt', '/target2.txt');
$this->assertTrue($this->instance->file_exists('/target2.txt'));
$this->assertFalse($this->instance->file_exists('/source.txt'));
- $this->assertEqual(file_get_contents($textFile),$this->instance->file_get_contents('/target.txt'));
+ $this->assertEqual(file_get_contents($textFile), $this->instance->file_get_contents('/target.txt'));
}
-
+
public function testLocal() {
- $textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
- $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
- $localFile=$this->instance->getLocalFile('/lorem.txt');
+ $textFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+ $localFile = $this->instance->getLocalFile('/lorem.txt');
$this->assertTrue(file_exists($localFile));
- $this->assertEqual(file_get_contents($localFile),file_get_contents($textFile));
-
+ $this->assertEqual(file_get_contents($localFile), file_get_contents($textFile));
+
$this->instance->mkdir('/folder');
- $this->instance->file_put_contents('/folder/lorem.txt',file_get_contents($textFile));
- $this->instance->file_put_contents('/folder/bar.txt','asd');
+ $this->instance->file_put_contents('/folder/lorem.txt', file_get_contents($textFile));
+ $this->instance->file_put_contents('/folder/bar.txt', 'asd');
$this->instance->mkdir('/folder/recursive');
- $this->instance->file_put_contents('/folder/recursive/file.txt','foo');
- $localFolder=$this->instance->getLocalFolder('/folder');
+ $this->instance->file_put_contents('/folder/recursive/file.txt', 'foo');
+ $localFolder = $this->instance->getLocalFolder('/folder');
$this->assertTrue(is_dir($localFolder));
- $this->assertTrue(file_exists($localFolder.'/lorem.txt'));
- $this->assertEqual(file_get_contents($localFolder.'/lorem.txt'),file_get_contents($textFile));
- $this->assertEqual(file_get_contents($localFolder.'/bar.txt'),'asd');
- $this->assertEqual(file_get_contents($localFolder.'/recursive/file.txt'),'foo');
+ $this->assertTrue(file_exists($localFolder . '/lorem.txt'));
+ $this->assertEqual(file_get_contents($localFolder . '/lorem.txt'), file_get_contents($textFile));
+ $this->assertEqual(file_get_contents($localFolder . '/bar.txt'), 'asd');
+ $this->assertEqual(file_get_contents($localFolder . '/recursive/file.txt'), 'foo');
}
public function testStat() {
- $textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
- $ctimeStart=time();
- $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
+ $textFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $ctimeStart = time();
+ $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
$this->assertTrue($this->instance->isReadable('/lorem.txt'));
- $ctimeEnd=time();
- $cTime=$this->instance->filectime('/lorem.txt');
- $mTime=$this->instance->filemtime('/lorem.txt');
- if($cTime!=-1) {//not everything can support ctime
- $this->assertTrue(($ctimeStart-1)<=$cTime);
- $this->assertTrue($cTime<=($ctimeEnd+1));
+ $ctimeEnd = time();
+ $cTime = $this->instance->filectime('/lorem.txt');
+ $mTime = $this->instance->filemtime('/lorem.txt');
+ if ($cTime != -1) { //not everything can support ctime
+ $this->assertTrue(($ctimeStart - 1) <= $cTime);
+ $this->assertTrue($cTime <= ($ctimeEnd + 1));
}
- $this->assertTrue($this->instance->hasUpdated('/lorem.txt',$ctimeStart-1));
- $this->assertTrue($this->instance->hasUpdated('/',$ctimeStart-1));
-
- $this->assertTrue(($ctimeStart-1)<=$mTime);
- $this->assertTrue($mTime<=($ctimeEnd+1));
- $this->assertEqual(filesize($textFile),$this->instance->filesize('/lorem.txt'));
-
- $stat=$this->instance->stat('/lorem.txt');
+ $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 1));
+ $this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 1));
+
+ $this->assertTrue(($ctimeStart - 1) <= $mTime);
+ $this->assertTrue($mTime <= ($ctimeEnd + 1));
+ $this->assertEqual(filesize($textFile), $this->instance->filesize('/lorem.txt'));
+
+ $stat = $this->instance->stat('/lorem.txt');
//only size, mtime and ctime are requered in the result
- $this->assertEqual($stat['size'],$this->instance->filesize('/lorem.txt'));
- $this->assertEqual($stat['mtime'],$mTime);
- $this->assertEqual($stat['ctime'],$cTime);
-
- $mtimeStart=time();
+ $this->assertEqual($stat['size'], $this->instance->filesize('/lorem.txt'));
+ $this->assertEqual($stat['mtime'], $mTime);
+ $this->assertEqual($stat['ctime'], $cTime);
+
+ $mtimeStart = time();
$supportsTouch = $this->instance->touch('/lorem.txt');
- $mtimeEnd=time();
- if($supportsTouch !== false){
- $originalCTime=$cTime;
- $cTime=$this->instance->filectime('/lorem.txt');
- $mTime=$this->instance->filemtime('/lorem.txt');
- $this->assertTrue(($mtimeStart-1)<=$mTime);
- $this->assertTrue($mTime<=($mtimeEnd+1));
- $this->assertEqual($cTime,$originalCTime);
-
- $this->assertTrue($this->instance->hasUpdated('/lorem.txt',$mtimeStart-1));
-
- if($this->instance->touch('/lorem.txt',100)!==false) {
- $mTime=$this->instance->filemtime('/lorem.txt');
- $this->assertEqual($mTime,100);
+ $mtimeEnd = time();
+ if ($supportsTouch !== false) {
+ $originalCTime = $cTime;
+ $cTime = $this->instance->filectime('/lorem.txt');
+ $mTime = $this->instance->filemtime('/lorem.txt');
+ $this->assertTrue(($mtimeStart - 1) <= $mTime);
+ $this->assertTrue($mTime <= ($mtimeEnd + 1));
+ $this->assertEqual($cTime, $originalCTime);
+
+ $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $mtimeStart - 1));
+
+ if ($this->instance->touch('/lorem.txt', 100) !== false) {
+ $mTime = $this->instance->filemtime('/lorem.txt');
+ $this->assertEqual($mTime, 100);
}
}
- $mtimeStart=time();
- $fh=$this->instance->fopen('/lorem.txt','a');
- fwrite($fh,' ');
+ $mtimeStart = time();
+ $fh = $this->instance->fopen('/lorem.txt', 'a');
+ fwrite($fh, ' ');
fclose($fh);
clearstatcache();
- $mtimeEnd=time();
- $originalCTime=$cTime;
- $mTime=$this->instance->filemtime('/lorem.txt');
- $this->assertTrue(($mtimeStart-1)<=$mTime);
- $this->assertTrue($mTime<=($mtimeEnd+1));
+ $mtimeEnd = time();
+ $originalCTime = $cTime;
+ $mTime = $this->instance->filemtime('/lorem.txt');
+ $this->assertTrue(($mtimeStart - 1) <= $mTime);
+ $this->assertTrue($mTime <= ($mtimeEnd + 1));
$this->instance->unlink('/lorem.txt');
- $this->assertTrue($this->instance->hasUpdated('/',$mtimeStart-1));
+ $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 1));
}
public function testSearch() {
- $textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
- $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
- $pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
- $this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r'));
- $svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg';
- $this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
- $result=$this->instance->search('logo');
- $this->assertEqual(2,count($result));
- $this->assertNotIdentical(false,array_search('/logo-wide.svg',$result));
- $this->assertNotIdentical(false,array_search('/logo-wide.png',$result));
+ $textFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+ $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
+ $pngFile = OC::$SERVERROOT . '/tests/data/logo-wide.png';
+ $this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r'));
+ $svgFile = OC::$SERVERROOT . '/tests/data/logo-wide.svg';
+ $this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
+ $result = $this->instance->search('logo');
+ $this->assertEqual(2, count($result));
+ $this->assertNotIdentical(false, array_search('/logo-wide.svg', $result));
+ $this->assertNotIdentical(false, array_search('/logo-wide.png', $result));
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list