diff options
author | Lukas Reschke <lukas@owncloud.com> | 2014-10-31 15:10:59 +0300 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2014-10-31 15:10:59 +0300 |
commit | e0528c7598bc98ae951f4a6a44b126bbfabd8f3b (patch) | |
tree | 0238647e79fb5e3a6b489cf25856b80a4dae54c4 | |
parent | 55658e7bb24156660f12d26d622ee38cda242b38 (diff) | |
parent | f776bcd4a0e58a8803ae4bf922bb278f6a5c5203 (diff) |
Merge pull request #11876 from owncloud/remove-pointless-requires
remove unnecessary require calls - the ownCloud class loader is supposed...
33 files changed, 57 insertions, 128 deletions
diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php index f269cc70ed5..17be1770c33 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 a89754d4a14..1b8291fea28 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 df7ff8cdb11..ed543bf89f6 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 c7353deee22..c2434c0f5f6 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 ad7d2cfcd45..e2486ee93eb 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 56d6cd2f736..d3e568f8914 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 e640b8c1a6a..d7efe21a8fd 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 b8c18fbe049..2b57f11c680 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 5890292cd7b..d795240399c 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 d5bfb86a2e4..210ffcc5410 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 cc0cff9aa5c..c838ddd29d1 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 035aa1b6a5b..88acbd8e775 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 9653713a9f9..e113c940678 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 1b0fe6fdc6d..2c9790ce66d 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 2e93afa1987..0c741bb8199 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 6169a9f5094..1a27739ec34 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 299e471a3fd..639ebfb5936 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 b6599a1b646..68cd81f963a 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 fe80cfca781..2b5978f8e57 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 ac910944f9f..e991d381e14 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 972f9257e25..b106add1300 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 index 6bc02ec2008..a098feb550d 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 be29c38acc3..583f607d9cb 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 1f51b9a315c..07349c1334d 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 bce93c80a6c..67f55394ae8 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 6a8955f5d1d..6fdb53f7271 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 558c8dfcb8a..4909d0606b1 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 5be16ce3c49..ab381e5c298 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 c62fa43863a..a7a189c98e5 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 c0c58ebf761..f7c89a9d2e1 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 dfd0d7ee7dc..e5d452f7f91 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 db98bb4e9c2..5b9089b32e1 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 195e3450f3f..90958baf380 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() { |