Commit 46e61047 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #12297 from owncloud/issue/10991-all-testcase

Issue/10991 all testcase
parents 288acb55 6202ca33
......@@ -21,7 +21,7 @@
*
*/
class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
class Test_OC_Files_App_Rename extends \Test\TestCase {
private static $user;
/**
......@@ -34,7 +34,6 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
*/
private $files;
/** @var \OC\Files\Storage\Storage */
private $originalStorage;
protected function setUp() {
......
......@@ -11,7 +11,7 @@ use OCA\Files;
/**
* Class Test_Files_Helper
*/
class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
class Test_Files_Helper extends \Test\TestCase {
private function makeFileInfo($name, $size, $mtime, $isDir = false) {
return new \OC\Files\FileInfo(
......@@ -90,7 +90,7 @@ class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
$this->assertEquals(
$expectedOrder,
$fileNames
);
);
}
}
......@@ -23,16 +23,20 @@
use OCA\Encryption;
use OCA\Files_Encryption\Migration;
class Test_Migration extends PHPUnit_Framework_TestCase {
class Test_Migration extends \Test\TestCase {
public function tearDown() {
protected function tearDown() {
if (OC_DB::tableExists('encryption_test')) {
OC_DB::dropTable('encryption_test');
}
$this->assertTableNotExist('encryption_test');
parent::tearDown();
}
public function setUp() {
protected function setUp() {
parent::setUp();
if (OC_DB::tableExists('encryption_test')) {
OC_DB::dropTable('encryption_test');
}
......
......@@ -28,7 +28,9 @@ class AmazonS3 extends Storage {
private $config;
public function setUp() {
protected function setUp() {
parent::setUp();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['amazons3']) or ! $this->config['amazons3']['run']) {
$this->markTestSkipped('AmazonS3 backend not configured');
......@@ -36,10 +38,12 @@ class AmazonS3 extends Storage {
$this->instance = new \OC\Files\Storage\AmazonS3($this->config['amazons3']);
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
$this->instance->rmdir('');
}
parent::tearDown();
}
public function testStat() {
......
......@@ -23,15 +23,26 @@
namespace Test\Files\Storage;
class AmazonS3Migration extends \PHPUnit_Framework_TestCase {
class AmazonS3Migration extends \Test\TestCase {
/**
* @var \OC\Files\Storage\Storage instance
*/
protected $instance;
public function setUp () {
$uuid = uniqid();
/** @var array */
protected $params;
/** @var string */
protected $oldId;
/** @var string */
protected $newId;
protected function setUp() {
parent::setUp();
$uuid = $this->getUniqueID();
$this->params['key'] = 'key'.$uuid;
$this->params['secret'] = 'secret'.$uuid;
......@@ -41,9 +52,11 @@ class AmazonS3Migration extends \PHPUnit_Framework_TestCase {
$this->newId = 'amazon::' . $this->params['bucket'];
}
public function tearDown () {
protected function tearDown() {
$this->deleteStorage($this->oldId);
$this->deleteStorage($this->newId);
parent::tearDown();
}
public function testUpdateLegacyOnlyId () {
......
......@@ -11,8 +11,10 @@ namespace Test\Files\Storage;
class Dropbox extends Storage {
private $config;
public function setUp() {
$id = uniqid();
protected function setUp() {
parent::setUp();
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['dropbox']) or ! $this->config['dropbox']['run']) {
$this->markTestSkipped('Dropbox backend not configured');
......@@ -21,6 +23,14 @@ class Dropbox extends Storage {
$this->instance = new \OC\Files\Storage\Dropbox($this->config['dropbox']);
}
protected function tearDown() {
if ($this->instance) {
$this->instance->unlink('/');
}
parent::tearDown();
}
public function directoryProvider() {
// doesn't support leading/trailing spaces
return array(array('folder'));
......@@ -36,10 +46,4 @@ class Dropbox extends Storage {
// false because not supported
$this->assertFalse($this->instance->touch('foo'));
}
public function tearDown() {
if ($this->instance) {
$this->instance->unlink('/');
}
}
}
......@@ -36,7 +36,7 @@ class Test_Mount_Config_Dummy_Backend {
/**
* Class Test_Dynamic_Mount_Config
*/
class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
class Test_Dynamic_Mount_Config extends \Test\TestCase {
private $backup;
......@@ -82,6 +82,7 @@ class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
}
protected function setUp() {
parent::setUp();
$this->backup = OC_Mount_Config::setUp();
......@@ -97,5 +98,6 @@ class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
protected function tearDown()
{
OC_Mount_Config::setUp($this->backup);
parent::tearDown();
}
}
......@@ -11,9 +11,9 @@ namespace Tests\Files_External;
use OC\Files\Filesystem;
use OC\User\User;
class EtagPropagator extends \PHPUnit_Framework_TestCase {
class EtagPropagator extends \Test\TestCase {
protected function getUser() {
return new User(uniqid(), null);
return new User($this->getUniqueID(), null);
}
/**
......
......@@ -11,8 +11,10 @@ namespace Test\Files\Storage;
class FTP extends Storage {
private $config;
public function setUp() {
$id = uniqid();
protected function setUp() {
parent::setUp();
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['ftp']) or ! $this->config['ftp']['run']) {
$this->markTestSkipped('FTP backend not configured');
......@@ -22,10 +24,12 @@ class FTP extends Storage {
$this->instance->mkdir('/');
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
\OCP\Files::rmdirr($this->instance->constructUrl(''));
}
parent::tearDown();
}
public function testConstructUrl(){
......
......@@ -28,6 +28,8 @@ class Google extends Storage {
private $config;
protected function setUp() {
parent::setUp();
$this->config = include('files_external/tests/config.php');
if (!is_array($this->config) || !isset($this->config['google'])
|| !$this->config['google']['run']
......@@ -41,5 +43,7 @@ class Google extends Storage {
if ($this->instance) {
$this->instance->rmdir('/');
}
parent::tearDown();
}
}
......@@ -65,7 +65,7 @@ class Test_Mount_Config_Hook_Test {
/**
* Class Test_Mount_Config
*/
class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
class Test_Mount_Config extends \Test\TestCase {
private $dataDir;
private $userHome;
......@@ -79,7 +79,9 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
const TEST_GROUP2 = 'group2';
const TEST_GROUP2B = 'group2b';
public function setUp() {
protected function setUp() {
parent::setUp();
\OC_User::createUser(self::TEST_USER1, self::TEST_USER1);
\OC_User::createUser(self::TEST_USER2, self::TEST_USER2);
......@@ -116,7 +118,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
Test_Mount_Config_Hook_Test::setupHooks();
}
public function tearDown() {
protected function tearDown() {
Test_Mount_Config_Hook_Test::clear();
OC_Mount_Config::$skipTest = false;
......@@ -134,6 +136,8 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
'user_mounting_backends',
$this->oldAllowedBackends
);
parent::tearDown();
}
/**
......
......@@ -12,8 +12,10 @@ class OwnCloud extends Storage {
private $config;
public function setUp() {
$id = uniqid();
protected function setUp() {
parent::setUp();
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
$this->markTestSkipped('ownCloud backend not configured');
......@@ -23,9 +25,11 @@ class OwnCloud extends Storage {
$this->instance->mkdir('/');
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
$this->instance->rmdir('/');
}
parent::tearDown();
}
}
......@@ -8,7 +8,7 @@
namespace Test\Files\Storage;
class OwnCloudFunctions extends \PHPUnit_Framework_TestCase {
class OwnCloudFunctions extends \Test\TestCase {
function configUrlProvider() {
return array(
......
......@@ -25,8 +25,10 @@ namespace Test\Files\Storage;
class SFTP extends Storage {
private $config;
public function setUp() {
$id = uniqid();
protected function setUp() {
parent::setUp();
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['sftp']) or ! $this->config['sftp']['run']) {
$this->markTestSkipped('SFTP backend not configured');
......@@ -36,9 +38,11 @@ class SFTP extends Storage {
$this->instance->mkdir('/');
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
$this->instance->rmdir('/');
}
parent::tearDown();
}
}
......@@ -12,8 +12,10 @@ class SMB extends Storage {
private $config;
public function setUp() {
$id = uniqid();
protected function setUp() {
parent::setUp();
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
$this->markTestSkipped('Samba backend not configured');
......@@ -23,10 +25,12 @@ class SMB extends Storage {
$this->instance->mkdir('/');
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
\OCP\Files::rmdirr($this->instance->constructUrl(''));
}
parent::tearDown();
}
public function directoryProvider() {
......
......@@ -8,10 +8,11 @@
namespace Test\Files\Storage;
class SMBFunctions extends \PHPUnit_Framework_TestCase {
class SMBFunctions extends \Test\TestCase {
protected function setUp() {
parent::setUp();
public function setUp() {
$id = uniqid();
// dummy config
$this->config = array(
'run'=>false,
......@@ -25,9 +26,6 @@ class SMBFunctions extends \PHPUnit_Framework_TestCase {
$this->instance = new \OC\Files\Storage\SMB($this->config);
}
public function tearDown() {
}
public function testGetId() {
$this->assertEquals('smb::test@smbhost//sharename//rootdir/', $this->instance->getId());
}
......
......@@ -26,7 +26,9 @@ class Swift extends Storage {
private $config;
public function setUp() {
protected function setUp() {
parent::setUp();
$this->config = include('files_external/tests/config.php');
if (!is_array($this->config) or !isset($this->config['swift'])
or !$this->config['swift']['run']) {
......@@ -35,7 +37,7 @@ class Swift extends Storage {
$this->instance = new \OC\Files\Storage\Swift($this->config['swift']);
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
$connection = $this->instance->getConnection();
$container = $connection->getContainer($this->config['swift']['bucket']);
......@@ -48,5 +50,7 @@ class Swift extends Storage {
$container->delete();
}
parent::tearDown();
}
}
......@@ -12,8 +12,10 @@ class DAV extends Storage {
private $config;
public function setUp() {
$id = uniqid();
protected function setUp() {
parent::setUp();
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['webdav']) or ! $this->config['webdav']['run']) {
$this->markTestSkipped('WebDAV backend not configured');
......@@ -26,9 +28,11 @@ class DAV extends Storage {
$this->instance->mkdir('/');
}
public function tearDown() {
protected function tearDown() {
if ($this->instance) {
$this->instance->rmdir('/');
}
parent::tearDown();
}
}
......@@ -32,7 +32,7 @@ class Test_Files_Sharing_Api extends TestCase {
private static $tempStorage;
function setUp() {
protected function setUp() {
parent::setUp();
\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
......@@ -53,7 +53,7 @@ class Test_Files_Sharing_Api extends TestCase {
$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
}
function tearDown() {
protected function tearDown() {
if($this->view instanceof \OC\Files\View) {
$this->view->unlink($this->filename);
$this->view->deleteAll($this->folder);
......
......@@ -34,7 +34,7 @@ class Test_Files_Sharing_Backend extends TestCase {
public $subfolder;
public $subsubfolder;
function setUp() {
protected function setUp() {
parent::setUp();
$this->folder = self::TEST_FOLDER_NAME;
......@@ -53,7 +53,7 @@ class Test_Files_Sharing_Backend extends TestCase {
$this->view->file_put_contents($this->folder . $this->subfolder . $this->subsubfolder . $this->filename, $this->data);
}
function tearDown() {
protected function tearDown() {
$this->view->unlink($this->filename);
$this->view->deleteAll($this->folder);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment