diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
index f269cc70ed55e7dc57df10e61197a3abb49d31f4..17be1770c338aa77319940ba61b59a6980d623cc 100644
--- a/apps/files/tests/helper.php
+++ b/apps/files/tests/helper.php
@@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
-require_once __DIR__ . '/../lib/helper.php';
-
use OCA\Files;
/**
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index a89754d4a1410404f2f80c131cbe09c8d2bd970c..1b8291fea289e92118a209f26fd085660b53fbe1 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,16 +7,6 @@
* See the COPYING-README file.
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../lib/helper.php';
-require_once __DIR__ . '/../appinfo/app.php';
-require_once __DIR__ . '/util.php';
-
use OCA\Encryption;
/**
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index df7ff8cdb113050f7fe3b19645760da5b7e1d9c8..ed543bf89f66327ffd64beb847c1989f4aaa910d 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
-
-require_once __DIR__ . '/../lib/helper.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index c7353deee22fb72132d54f7f4e892ee849dae838..c2434c0f5f6053adcc73ce7190e1f36828338029 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -20,12 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index ad7d2cfcd45f2e6b1a541829ced12f63888f89cc..e2486ee93eb9c16c424795f233f014bed9c0bdca 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -6,14 +6,6 @@
* See the COPYING-README file.
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../lib/helper.php';
-require_once __DIR__ . '/../appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 56d6cd2f7367d96ce2f17c661cc08ef45162bbe0..d3e568f8914d60abd97375227ed33db49cba5189 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -20,13 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index e640b8c1a6a3626b85481c46b9926366cd6658a4..d7efe21a8fd6c1fd7a7271d88a5838e0f0292b0e 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,14 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../lib/helper.php';
-require_once __DIR__ . '/../appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index b8c18fbe0490ff9263c8acb287d03734b1f4097f..2b57f11c680c825b716f90b3ff990fe037c179c5 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -20,13 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 5890292cd7bc26ae69365e99ee06a543748aed2b..d795240399cb0274727d5d4409295a01ba9624ec 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -20,14 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
-require_once __DIR__ . '/../../files_trashbin/appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index d5bfb86a2e4f5445b94c8c6dd32b21120093cc11..210ffcc541013dabdec180f1e36b2d6ef10c8b78 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -6,14 +6,6 @@
* See the COPYING-README file.
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
-
use OCA\Encryption;
/**
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index cc0cff9aa5ca5f142189975db915794b14d301b5..c838ddd29d1d90665e250824a8ba14b3cc930aa4 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -20,13 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 035aa1b6a5bede5a074482b6b4c2ca26bfbd33e2..88acbd8e775dad99da8e8cd71bf0877c0cfe5521 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -20,14 +20,13 @@
*
*/
-require_once __DIR__ . '/base.php';
-
use OCA\Files\Share;
+use OCA\Files_sharing\Tests\TestCase;
/**
* Class Test_Files_Sharing_Api
*/
-class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Api extends TestCase {
const TEST_FOLDER_NAME = '/folder_share_api_test';
diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php
index 9653713a9f99045ce69675ffe97e6821f561f97b..e113c9406782ae77b57a15fec63fe4a6ed2e69b1 100644
--- a/apps/files_sharing/tests/backend.php
+++ b/apps/files_sharing/tests/backend.php
@@ -20,14 +20,13 @@
*
*/
-require_once __DIR__ . '/base.php';
-
use OCA\Files\Share;
+use OCA\Files_sharing\Tests\TestCase;
/**
* Class Test_Files_Sharing
*/
-class Test_Files_Sharing_Backend extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Backend extends TestCase {
const TEST_FOLDER_NAME = '/folder_share_api_test';
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1b0fe6fdc6d3c45ae8eee344ee11aa90761c51f2..2c9790ce66deed2cba9e2fa035d05c5a9f7c01c2 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -1,4 +1,6 @@
<?php
+use OCA\Files_sharing\Tests\TestCase;
+
/**
* ownCloud
*
@@ -20,9 +22,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-require_once __DIR__ . '/base.php';
-class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Cache extends TestCase {
/**
* @var OC\Files\View
diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php
index 2e93afa1987437a189485f4ae5bc4b35790dfe1a..0c741bb8199c85c630aab5544a895c01cdcebd00 100644
--- a/apps/files_sharing/tests/externalstorage.php
+++ b/apps/files_sharing/tests/externalstorage.php
@@ -20,8 +20,6 @@
*
*/
-require_once __DIR__ . '/base.php';
-
/**
* Tests for the external Storage class for remote shares.
*/
diff --git a/apps/files_sharing/tests/helper.php b/apps/files_sharing/tests/helper.php
index 6169a9f50942d04cef3433e9b5fc1cc388945776..1a27739ec34e3f7eb4659f8e8a5db1c2c4c62518 100644
--- a/apps/files_sharing/tests/helper.php
+++ b/apps/files_sharing/tests/helper.php
@@ -1,4 +1,6 @@
<?php
+use OCA\Files_sharing\Tests\TestCase;
+
/**
* ownCloud
*
@@ -19,9 +21,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-require_once __DIR__ . '/base.php';
-class Test_Files_Sharing_Helper extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Helper extends TestCase {
/**
* test set and get share folder
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 299e471a3fd3ca6fd86eaabfb3e80a7ffa4c2525..639ebfb593667ab49bfdf31059def2a6e840746f 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -23,9 +23,8 @@ use OC\Files\Cache\Cache;
use OC\Files\Storage\Storage;
use OC\Files\View;
-require_once __DIR__ . '/base.php';
-class Test_Files_Sharing_Permissions extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
/**
* @var Storage
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
index b6599a1b6466b8f6e585d778ce0054bd465e7559..68cd81f963a7b179f3b679eabc4dff7928140575 100644
--- a/apps/files_sharing/tests/proxy.php
+++ b/apps/files_sharing/tests/proxy.php
@@ -20,14 +20,13 @@
*
*/
-require_once __DIR__ . '/base.php';
use OCA\Files\Share;
/**
* Class Test_Files_Sharing_Proxy
*/
-class Test_Files_Sharing_Proxy extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
const TEST_FOLDER_NAME = '/folder_share_api_test';
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index fe80cfca781db28a32a6665614342e4b8c5ae409..2b5978f8e5752f846c4c758c166f7045303ddd0a 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -20,14 +20,12 @@
*
*/
-require_once __DIR__ . '/base.php';
-
use OCA\Files\Share;
/**
* Class Test_Files_Sharing
*/
-class Test_Files_Sharing extends Test_Files_Sharing_Base {
+class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
const TEST_FOLDER_NAME = '/folder_share_api_test';
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index ac910944f9f6511cccf7a051c25a315a4e55c5f9..e991d381e140aab7b06635c4bfa20608fb5d62b5 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -20,12 +20,10 @@
*
*/
-require_once __DIR__ . '/base.php';
-
/**
* Class Test_Files_Sharing_Api
*/
-class Test_Files_Sharing_Mount extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
function setUp() {
parent::setUp();
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 972f9257e2597a937acd357b45eeb1a5da8e699e..b106add13000e52824f8d05ae9796ebfbbc931ae 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -20,14 +20,12 @@
*
*/
-require_once __DIR__ . '/base.php';
-
use OCA\Files\Share;
/**
* Class Test_Files_Sharing_Api
*/
-class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
function setUp() {
parent::setUp();
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/testcase.php
similarity index 96%
rename from apps/files_sharing/tests/base.php
rename to apps/files_sharing/tests/testcase.php
index 6bc02ec2008b309f5c7d8c65381aa188a37e0cb7..a098feb550d644a46ab7e6d5857c7ef20aaf7b94 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -20,7 +20,7 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
+namespace OCA\Files_Sharing\Tests;
use OCA\Files\Share;
@@ -29,7 +29,7 @@ use OCA\Files\Share;
*
* Base class for sharing tests.
*/
-abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
+abstract class TestCase extends \PHPUnit_Framework_TestCase {
const TEST_FILES_SHARING_API_USER1 = "test-share-user1";
const TEST_FILES_SHARING_API_USER2 = "test-share-user2";
@@ -41,7 +41,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
public $filename;
public $data;
/**
- * @var OC\Files\View
+ * @var \OC\Files\View
*/
public $view;
public $folder;
diff --git a/apps/files_sharing/tests/update.php b/apps/files_sharing/tests/update.php
index be29c38acc398e7dfd73887bddbcb0c8f361b6d3..583f607d9cb1a294bad6503c9ed5f807de19fd0e 100644
--- a/apps/files_sharing/tests/update.php
+++ b/apps/files_sharing/tests/update.php
@@ -22,12 +22,11 @@
*/
require_once __DIR__ . '/../appinfo/update.php';
-require_once __DIR__ . '/base.php';
/**
* Class Test_Files_Sharing_Update
*/
-class Test_Files_Sharing_Update_Routine extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Update_Routine extends OCA\Files_Sharing\Tests\TestCase {
const TEST_FOLDER_NAME = '/folder_share_api_test';
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 1f51b9a315c6a7552794f29959726744a8f1ecf8..07349c1334dbe6ab4d52d425828b255b3e268333 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -21,12 +21,11 @@
*/
require_once __DIR__ . '/../appinfo/update.php';
-require_once __DIR__ . '/base.php';
/**
* Class Test_Files_Sharing_Updater
*/
-class Test_Files_Sharing_Updater extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
const TEST_FOLDER_NAME = '/folder_share_updater_test';
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index bce93c80a6c3076dda38156a99e351102bd84f34..67f55394ae842af432b4dd349aa08f2769c65bb7 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -19,9 +19,28 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-require_once __DIR__ . '/base.php';
-class Test_Files_Sharing_Watcher extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
+
+ /**
+ * @var \OC\Files\Storage\Storage
+ */
+ private $ownerStorage;
+
+ /**
+ * @var \OC\Files\Cache\Cache
+ */
+ private $ownerCache;
+
+ /**
+ * @var \OC\Files\Storage\Storage
+ */
+ private $sharedStorage;
+
+ /**
+ * @var \OC\Files\Cache\Cache
+ */
+ private $sharedCache;
function setUp() {
parent::setUp();
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 6a8955f5d1d856a10af335b11bad3ef174dbd36e..6fdb53f72710205dc7fd2336be6aa2d5da6dc4ae 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -20,8 +20,6 @@
*
*/
-require_once __DIR__ . '/../../../lib/base.php';
-
use OCA\Files_Trashbin;
/**
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 558c8dfcb8abc9c61b82792c13c898310526851b..4909d0606b193b67c63257c349f37a2cbd0784db 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -32,6 +32,9 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
const TEST_VERSIONS_USER = 'test-versions-user';
const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
+ /**
+ * @var \OC\Files\View
+ */
private $rootView;
public static function setUpBeforeClass() {
@@ -63,7 +66,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
*/
function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
- // last interval enda at 2592000
+ // last interval end at 2592000
$startTime = 5000000;
$testClass = new VersionStorageToTest();
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
index 5be16ce3c497716464e1402896d2b116ca550a1d..ab381e5c29807299149a9b903afa868b22fcda5d 100644
--- a/tests/lib/appframework/http/DownloadResponseTest.php
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -25,14 +25,16 @@
namespace OCP\AppFramework\Http;
-//require_once(__DIR__ . "/../classloader.php");
+class ChildDownloadResponse extends DownloadResponse {
-
-class ChildDownloadResponse extends DownloadResponse {};
+};
class DownloadResponseTest extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var ChildDownloadResponse
+ */
protected $response;
protected function setUp(){
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index c62fa43863abd526fb8f50d96d5829fe83fb4b51..a7a189c98e5e15dc72a52bc510d389c4bfcf21c9 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -26,13 +26,14 @@ namespace OC\AppFramework\Http;
use OC\AppFramework\Http;
-//require_once(__DIR__ . "/../classloader.php");
-
-
class HttpTest extends \PHPUnit_Framework_TestCase {
private $server;
+
+ /**
+ * @var Http
+ */
private $http;
protected function setUp(){
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index c0c58ebf7612a002e02c0fcd7268bd72e8b1e376..f7c89a9d2e1b3fb77109d48304d07945c7c6135c 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -30,10 +30,6 @@ namespace OC\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http;
-//require_once(__DIR__ . "/../classloader.php");
-
-
-
class JSONResponseTest extends \PHPUnit_Framework_TestCase {
/**
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index dfd0d7ee7dcc9a03e0f7a27b8b196f24144613ab..e5d452f7f916e5d7daa513570f5bcc51668de921 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -26,13 +26,12 @@ namespace OCP\AppFramework\Http;
use OCP\AppFramework\Http;
-//require_once(__DIR__ . "/../classloader.php");
-
-
class RedirectResponseTest extends \PHPUnit_Framework_TestCase {
-
+ /**
+ * @var RedirectResponse
+ */
protected $response;
protected function setUp(){
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index db98bb4e9c266f3bd8f10204b870e72542522a1c..5b9089b32e14cee8f3581ad08d4731d31e822451 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
-require_once 'archive.php';
-
class Test_Archive_TAR extends Test_Archive {
public function setUp() {
if (OC_Util::runningOnWindows()) {
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index 195e3450f3ff76a40129df4c40a01041dacfec0a..90958baf38024a66125aefe8e997766f5cdf7d66 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
-require_once 'archive.php';
-
if (!OC_Util::runningOnWindows()) {
class Test_Archive_ZIP extends Test_Archive {
protected function getExisting() {