Make apps/ extend the \Test\TestCase and fix overwritten methods

apps/files/tests/ajax_rename.php

@@ -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() {

apps/files_encryption/tests/migration.php

@@ -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');
 		}

apps/files_external/tests/amazons3.php

@@ -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() {

apps/files_external/tests/amazons3migration.php

@@ -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 () {

apps/files_external/tests/dropbox.php

@@ -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('/');
-		}
-	}
 }

apps/files_external/tests/dynamicmountconfig.php

@@ -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();
 	}
 }

apps/files_external/tests/etagpropagator.php

@@ -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);
 	}
 
 	/**

apps/files_external/tests/ftp.php

@@ -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(){

apps/files_external/tests/google.php

@@ -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();
 	}
 }

apps/files_external/tests/mountconfig.php

@@ -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();
 	}
 
 	/**

apps/files_external/tests/owncloud.php

@@ -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();
 	}
 }

apps/files_external/tests/owncloudfunctions.php

@@ -8,7 +8,7 @@
 
 namespace Test\Files\Storage;
 
-class OwnCloudFunctions extends \PHPUnit_Framework_TestCase {
+class OwnCloudFunctions extends \Test\TestCase {
 
 	function configUrlProvider() {
 		return array(

apps/files_external/tests/sftp.php

@@ -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();
 	}
 }

apps/files_external/tests/smb.php

@@ -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() {

apps/files_external/tests/smbfunctions.php

@@ -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());
 	}

apps/files_external/tests/swift.php

@@ -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();
 	}
 }

apps/files_external/tests/webdav.php

@@ -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();
 	}
 }

apps/files_sharing/tests/api.php

@@ -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);

apps/files_sharing/tests/backend.php

@@ -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);
 

apps/files_sharing/tests/cache.php

@@ -42,7 +42,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 	/** @var \OC\Files\Storage\Storage */
 	protected $sharedStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		\OC_User::setDisplayName(self::TEST_FILES_SHARING_API_USER1, 'User One');
@@ -88,7 +88,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 		$this->sharedCache = $this->sharedStorage->getCache();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->sharedCache->clear();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);

apps/files_sharing/tests/externalstorage.php

@@ -23,7 +23,7 @@
 /**
  * Tests for the external Storage class for remote shares.
  */
-class Test_Files_Sharing_External_Storage extends \PHPUnit_Framework_TestCase {
+class Test_Files_Sharing_External_Storage extends \Test\TestCase {
 
 	function optionsProvider() {
 		return array(

apps/files_sharing/tests/permissions.php

@@ -61,7 +61,7 @@ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
 	 */
 	private $ownerCache;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
@@ -99,7 +99,7 @@ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
 		$this->sharedCacheRestrictedShare = $this->sharedStorageRestrictedShare->getCache();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->sharedCache->clear();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);

apps/files_sharing/tests/proxy.php

@@ -32,7 +32,7 @@ class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
 
 	private static $tempStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		// load proxies
@@ -53,7 +53,7 @@ class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->deleteAll($this->folder);
 
 		self::$tempStorage = null;

apps/files_sharing/tests/share.php

@@ -31,7 +31,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 
 	private static $tempStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = self::TEST_FOLDER_NAME;
@@ -49,7 +49,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->filename);
 		$this->view->deleteAll($this->folder);
 

apps/files_sharing/tests/sharedmount.php

@@ -25,7 +25,7 @@
  */
 class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = '/folder_share_storage_test';
@@ -40,7 +40,7 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->filename, "file in subfolder");
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->folder);
 		$this->view->unlink($this->filename);
 

apps/files_sharing/tests/sharedstorage.php

@@ -27,7 +27,7 @@ use OCA\Files\Share;
  */
 class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = '/folder_share_storage_test';
@@ -42,7 +42,7 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->filename, "file in subfolder");
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->folder);
 		$this->view->unlink($this->filename);
 

apps/files_sharing/tests/testcase.php

@@ -30,7 +30,7 @@ use OCA\Files\Share;
  *
  * Base class for sharing tests.
  */
-abstract class TestCase extends \PHPUnit_Framework_TestCase {
+abstract class TestCase extends \Test\TestCase {
 
 	const TEST_FILES_SHARING_API_USER1 = "test-share-user1";
 	const TEST_FILES_SHARING_API_USER2 = "test-share-user2";
@@ -49,6 +49,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	public $subfolder;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
 
 		// remember files_encryption state
 		self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption');
@@ -84,7 +85,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
 
 		$this->assertFalse(\OC_App::isEnabled('files_encryption'));
 
@@ -95,13 +97,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
 		$query->execute();
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
-
 		// cleanup users
 		\OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER1);
 		\OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER2);
@@ -120,6 +123,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
 		Filesystem::tearDown();
+
+		parent::tearDownAfterClass();
 	}
 
 	/**

apps/files_sharing/tests/updater.php

@@ -33,7 +33,7 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
 		\OCA\Files_Sharing\Helper::registerHooks();
 	}
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = self::TEST_FOLDER_NAME;
@@ -46,7 +46,7 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . '/' . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->filename);
 		$this->view->deleteAll($this->folder);
 

apps/files_sharing/tests/watcher.php

@@ -42,7 +42,7 @@ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
 	 */
 	private $sharedCache;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
@@ -71,7 +71,7 @@ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
 		$this->sharedCache = $this->sharedStorage->getCache();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->sharedCache->clear();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);

apps/files_trashbin/tests/trashbin.php

@@ -25,7 +25,7 @@ use OCA\Files_Trashbin;
 /**
  * Class Test_Encryption_Crypt
  */
-class Test_Trashbin extends \PHPUnit_Framework_TestCase {
+class Test_Trashbin extends \Test\TestCase {
 
 	const TEST_TRASHBIN_USER1 = "test-trashbin-user1";
 	const TEST_TRASHBIN_USER2 = "test-trashbin-user2";
@@ -43,6 +43,8 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase {
 	private $rootView;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -85,18 +87,24 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase {
 		\OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire);
 
 		\OC_Hook::clear();
+
+		parent::tearDownAfterClass();
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin';
 		$this->trashRoot2 = '/' . self::TEST_TRASHBIN_USER2 . '/files_trashbin';
 		$this->rootView = new \OC\Files\View();
 		self::loginHelper(self::TEST_TRASHBIN_USER1);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->rootView->deleteAll($this->trashRoot1);
 		$this->rootView->deleteAll($this->trashRoot2);
+
+		parent::tearDown();
 	}
 
 	/**

apps/files_versions/tests/versions.php

@@ -27,7 +27,7 @@ require_once __DIR__ . '/../lib/versions.php';
  * Class Test_Files_versions
  * this class provide basic files versions test
  */
-class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
+class Test_Files_Versioning extends \Test\TestCase {
 
 	const TEST_VERSIONS_USER = 'test-versions-user';
 	const TEST_VERSIONS_USER2 = 'test-versions-user2';

apps/user_ldap/tests/access.php

@@ -26,7 +26,7 @@ use \OCA\user_ldap\lib\Access;
 use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_Access extends \PHPUnit_Framework_TestCase {
+class Test_Access extends \Test\TestCase {
 	private function getConnecterAndLdapMock() {
 		static $conMethods;
 		static $accMethods;

apps/user_ldap/tests/connection.php

@@ -22,7 +22,7 @@
 
 namespace OCA\user_ldap\tests;
 
-class Test_Connection extends \PHPUnit_Framework_TestCase {
+class Test_Connection extends \Test\TestCase {
 
 	public function testOriginalAgentUnchangedOnClone() {
 		//background: upon login a bind is done with the user credentials

apps/user_ldap/tests/group_ldap.php

@@ -22,14 +22,12 @@
 
 namespace OCA\user_ldap\tests;
 
-namespace OCA\user_ldap\tests;
-
 use \OCA\user_ldap\GROUP_LDAP as GroupLDAP;
 use \OCA\user_ldap\lib\Access;
 use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_Group_Ldap extends \PHPUnit_Framework_TestCase {
+class Test_Group_Ldap extends \Test\TestCase {
 	private function getAccessMock() {
 		static $conMethods;
 		static $accMethods;

apps/user_ldap/tests/helper.php

@@ -11,7 +11,7 @@ namespace OCA\user_ldap\tests;
 
 use OCA\user_ldap\lib\Helper;
 
-class Test_Helper extends \PHPUnit_Framework_TestCase {
+class Test_Helper extends \Test\TestCase {
 
 	public function testTableTruncate() {
 

apps/user_ldap/tests/user/manager.php

@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests;
 
 use OCA\user_ldap\lib\user\Manager;
 
-class Test_User_Manager extends \PHPUnit_Framework_TestCase {
+class Test_User_Manager extends \Test\TestCase {
 
     private function getTestInstances() {
         $access  = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');

apps/user_ldap/tests/user/user.php

@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests;
 
 use OCA\user_ldap\lib\user\User;
 
-class Test_User_User extends \PHPUnit_Framework_TestCase {
+class Test_User_User extends \Test\TestCase {
 
 	private function getTestInstances() {
 		$access  = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');

apps/user_ldap/tests/user_ldap.php

@@ -27,11 +27,13 @@ use \OCA\user_ldap\lib\Access;
 use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
+class Test_User_Ldap_Direct extends \Test\TestCase {
 	protected $backend;
 	protected $access;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		\OC_User::clearBackends();
 		\OC_Group::clearBackends();
 	}

apps/user_ldap/tests/wizard.php

@@ -29,8 +29,9 @@ use \OCA\user_ldap\lib\Wizard;
 // use \OCA\user_ldap\lib\Configuration;
 // use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_Wizard extends \PHPUnit_Framework_TestCase {
-	public function setUp() {
+class Test_Wizard extends \Test\TestCase {
+	protected function setUp() {
+		parent::setUp();
 		//we need to make sure the consts are defined, otherwise tests will fail
 		//on systems without php5_ldap
 		$ldapConsts = array('LDAP_OPT_PROTOCOL_VERSION',

tests/lib/files/storage/storage.php

@@ -22,7 +22,7 @@
 
 namespace Test\Files\Storage;
 
-abstract class Storage extends \PHPUnit_Framework_TestCase {
+abstract class Storage extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage instance
 	 */