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

move storage backend test cases to their own namespace

This commit is contained in:
Robin Appelman 2012-09-22 14:51:15 +02:00
parent 153cd802a9
commit 96b798a59f
9 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_external/tests/amazons3.php
View File

@ -20,12 +20,14 @@
* 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/>.
*/ */
namespace Test\Files\Storage;
$config = include('apps/files_external/tests/config.php'); $config = include('apps/files_external/tests/config.php');
if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['run']) { if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['run']) {
abstract class Test_Filestorage_AmazonS3 extends Test_FileStorage{} abstract class AmazonS3 extends Storage{}
return; return;
} else { } else {
class Test_Filestorage_AmazonS3 extends Test_FileStorage { class AmazonS3 extends Storage {
private $config; private $config;
private $id; private $id;
@ -38,7 +40,7 @@ if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['r
} }
public function tearDown() { public function tearDown() {
$s3 = new AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret'])); $s3 = new \AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret']));
if ($s3->delete_all_objects($this->id)) { if ($s3->delete_all_objects($this->id)) {
$s3->delete_bucket($this->id); $s3->delete_bucket($this->id);
} }

8
apps/files_external/tests/ftp.php
View File

@ -6,12 +6,14 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
namespace Test\Files\Storage;
$config=include('apps/files_external/tests/config.php'); $config=include('apps/files_external/tests/config.php');
if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']) { if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']) {
abstract class Test_Filestorage_FTP extends Test_FileStorage{} abstract class FTP extends Storage{}
return; return;
}else{ }else{
class Test_Filestorage_FTP extends Test_FileStorage { class FTP extends Storage {
private $config; private $config;
public function setUp() { public function setUp() {
@ -22,7 +24,7 @@ if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']) {
} }
public function tearDown() { public function tearDown() {
OCP\Files::rmdirr($this->instance->constructUrl('')); \OCP\Files::rmdirr($this->instance->constructUrl(''));
} }
} }
} }

6
apps/files_external/tests/google.php
View File

@ -20,12 +20,14 @@
* 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/>.
*/ */
namespace Test\Files\Storage;
$config=include('apps/files_external/tests/config.php'); $config=include('apps/files_external/tests/config.php');
if(!is_array($config) or !isset($config['google']) or !$config['google']['run']) { if(!is_array($config) or !isset($config['google']) or !$config['google']['run']) {
abstract class Test_Filestorage_Google extends Test_FileStorage{} abstract class Google extends Storage{}
return; return;
}else{ }else{
class Test_Filestorage_Google extends Test_FileStorage { class Google extends Storage {
private $config; private $config;

8
apps/files_external/tests/smb.php
View File

@ -8,11 +8,13 @@
$config=include('apps/files_external/tests/config.php'); $config=include('apps/files_external/tests/config.php');
namespace Test\Files\Storage;
if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']) { if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']) {
abstract class Test_Filestorage_SMB extends Test_FileStorage{} abstract class SMB extends Storage{}
return; return;
}else{ }else{
class Test_Filestorage_SMB extends Test_FileStorage { class SMB extends Storage {
private $config; private $config;
public function setUp() { public function setUp() {
@ -23,7 +25,7 @@ if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']) {
} }
public function tearDown() { public function tearDown() {
OCP\Files::rmdirr($this->instance->constructUrl('')); \OCP\Files::rmdirr($this->instance->constructUrl(''));
} }
} }
} }

6
apps/files_external/tests/swift.php
View File

@ -6,12 +6,14 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
namespace Test\Files\Storage;
$config=include('apps/files_external/tests/config.php'); $config=include('apps/files_external/tests/config.php');
if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']) { if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']) {
abstract class Test_Filestorage_SWIFT extends Test_FileStorage{} abstract class SWIFT extends Storage{}
return; return;
}else{ }else{
class Test_Filestorage_SWIFT extends Test_FileStorage { class SWIFT extends Storage {
private $config; private $config;
public function setUp() { public function setUp() {

6
apps/files_external/tests/webdav.php
View File

@ -6,12 +6,14 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
namespace Test\Files\Storage;
$config=include('apps/files_external/tests/config.php'); $config=include('apps/files_external/tests/config.php');
if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run']) { if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run']) {
abstract class Test_Filestorage_DAV extends Test_FileStorage{} abstract class DAV extends Storage{}
return; return;
}else{ }else{
class Test_Filestorage_DAV extends Test_FileStorage { class DAV extends Storage {
private $config; private $config;
public function setUp() { public function setUp() {

6
tests/lib/filestorage/commontest.php → tests/lib/files/storage/commontest.php
View File

@ -20,7 +20,9 @@
* *
*/ */
class Test_Filestorage_CommonTest extends Test_FileStorage { namespace Test\Files\Storage;
class CommonTest extends Storage {
/** /**
* @var string tmpDir * @var string tmpDir
*/ */
@ -34,7 +36,7 @@ class Test_Filestorage_CommonTest extends Test_FileStorage {
} }
public function tearDown() { public function tearDown() {
OC_Helper::rmdirr($this->tmpDir); \OC_Helper::rmdirr($this->tmpDir);
} }
} }

10
tests/lib/filestorage/local.php → tests/lib/files/storage/local.php
View File

@ -20,19 +20,19 @@
* *
*/ */
class Test_Filestorage_Local extends Test_FileStorage { namespace Test\Files\Storage;
class Local extends Storage {
/** /**
* @var string tmpDir * @var string tmpDir
*/ */
private $tmpDir; private $tmpDir;
public function setUp() { public function setUp() {
$this->tmpDir=OC_Helper::tmpFolder(); $this->tmpDir=\OC_Helper::tmpFolder();
$this->instance=new \OC\Files\Storage\Local(array('datadir'=>$this->tmpDir)); $this->instance=new \OC\Files\Storage\Local(array('datadir'=>$this->tmpDir));
} }
public function tearDown() { public function tearDown() {
OC_Helper::rmdirr($this->tmpDir); \OC_Helper::rmdirr($this->tmpDir);
} }
} }
?>

25
tests/lib/filestorage.php → tests/lib/files/storage/storage.php
View File

@ -20,7 +20,9 @@
* *
*/ */
abstract class Test_FileStorage extends UnitTestCase { namespace Test\Files\Storage;
abstract class Storage extends \UnitTestCase {
/** /**
* @var \OC\Files\Storage\Storage instance * @var \OC\Files\Storage\Storage instance
*/ */
@ -83,7 +85,7 @@ abstract class Test_FileStorage extends UnitTestCase {
* test the various uses of file_get_contents and file_put_contents * test the various uses of file_get_contents and file_put_contents
*/ */
public function testGetPutContents() { public function testGetPutContents() {
$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $sourceFile=\OC::$SERVERROOT.'/tests/data/lorem.txt';
$sourceText=file_get_contents($sourceFile); $sourceText=file_get_contents($sourceFile);
//fill a file with string data //fill a file with string data
@ -103,21 +105,21 @@ abstract class Test_FileStorage extends UnitTestCase {
$this->assertEqual('httpd/unix-directory',$this->instance->getMimeType('/')); $this->assertEqual('httpd/unix-directory',$this->instance->getMimeType('/'));
$this->assertEqual(false,$this->instance->getMimeType('/non/existing/file')); $this->assertEqual(false,$this->instance->getMimeType('/non/existing/file'));
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $textFile=\OC::$SERVERROOT.'/tests/data/lorem.txt';
$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r')); $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
$this->assertEqual('text/plain',$this->instance->getMimeType('/lorem.txt')); $this->assertEqual('text/plain',$this->instance->getMimeType('/lorem.txt'));
$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png'; $pngFile=\OC::$SERVERROOT.'/tests/data/logo-wide.png';
$this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r')); $this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r'));
$this->assertEqual('image/png',$this->instance->getMimeType('/logo-wide.png')); $this->assertEqual('image/png',$this->instance->getMimeType('/logo-wide.png'));
$svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg'; $svgFile=\OC::$SERVERROOT.'/tests/data/logo-wide.svg';
$this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r')); $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('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
} }
public function testCopyAndMove() { public function testCopyAndMove() {
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $textFile=\OC::$SERVERROOT.'/tests/data/lorem.txt';
$this->instance->file_put_contents('/source.txt',file_get_contents($textFile)); $this->instance->file_put_contents('/source.txt',file_get_contents($textFile));
$this->instance->copy('/source.txt','/target.txt'); $this->instance->copy('/source.txt','/target.txt');
$this->assertTrue($this->instance->file_exists('/target.txt')); $this->assertTrue($this->instance->file_exists('/target.txt'));
@ -130,7 +132,7 @@ abstract class Test_FileStorage extends UnitTestCase {
} }
public function testLocal() { public function testLocal() {
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $textFile=\OC::$SERVERROOT.'/tests/data/lorem.txt';
$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile)); $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
$localFile=$this->instance->getLocalFile('/lorem.txt'); $localFile=$this->instance->getLocalFile('/lorem.txt');
$this->assertTrue(file_exists($localFile)); $this->assertTrue(file_exists($localFile));
@ -151,7 +153,7 @@ abstract class Test_FileStorage extends UnitTestCase {
} }
public function testStat() { public function testStat() {
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $textFile=\OC::$SERVERROOT.'/tests/data/lorem.txt';
$ctimeStart=time(); $ctimeStart=time();
$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile)); $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
$this->assertTrue($this->instance->isReadable('/lorem.txt')); $this->assertTrue($this->instance->isReadable('/lorem.txt'));
@ -198,7 +200,6 @@ abstract class Test_FileStorage extends UnitTestCase {
fclose($fh); fclose($fh);
clearstatcache(); clearstatcache();
$mtimeEnd=time(); $mtimeEnd=time();
$originalCTime=$cTime;
$mTime=$this->instance->filemtime('/lorem.txt'); $mTime=$this->instance->filemtime('/lorem.txt');
$this->assertTrue(($mtimeStart-1)<=$mTime); $this->assertTrue(($mtimeStart-1)<=$mTime);
$this->assertTrue($mTime<=($mtimeEnd+1)); $this->assertTrue($mTime<=($mtimeEnd+1));
@ -208,11 +209,11 @@ abstract class Test_FileStorage extends UnitTestCase {
} }
public function testSearch() { public function testSearch() {
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt'; $textFile=\OC::$SERVERROOT.'/tests/data/lorem.txt';
$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r')); $this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png'; $pngFile=\OC::$SERVERROOT.'/tests/data/logo-wide.png';
$this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r')); $this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r'));
$svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg'; $svgFile=\OC::$SERVERROOT.'/tests/data/logo-wide.svg';
$this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r')); $this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
$result=$this->instance->search('logo'); $result=$this->instance->search('logo');
$this->assertEqual(2,count($result)); $this->assertEqual(2,count($result));