sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11876 from owncloud/remove-pointless-requires 

remove unnecessary require calls - the ownCloud class loader is supposed...
remotes/origin/fix-10825
Lukas Reschke 2014-10-31 13:10:59 +07:00
parent 55658e7bb2 f776bcd4a0
commit e0528c7598
33 changed files with 57 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/tests/helper.php
Unescape Escape View File

@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
require_once __DIR__ . '/../lib/helper.php';
use OCA\Files;
/**

10
apps/files_encryption/tests/crypt.php
Unescape Escape View File

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

2
apps/files_encryption/tests/helper.php
Unescape Escape View File

@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
require_once __DIR__ . '/../lib/helper.php';
require_once __DIR__ . '/util.php';
use OCA\Encryption;

6
apps/files_encryption/tests/hooks.php
Unescape Escape View File

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

8
apps/files_encryption/tests/keymanager.php
Unescape Escape View File

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

7
apps/files_encryption/tests/proxy.php
Unescape Escape View File

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

8
apps/files_encryption/tests/share.php
Unescape Escape View File

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

7
apps/files_encryption/tests/stream.php
Unescape Escape View File

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

8
apps/files_encryption/tests/trashbin.php
Unescape Escape View File

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

8
apps/files_encryption/tests/util.php
Unescape Escape View File

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

7
apps/files_encryption/tests/webdav.php
Unescape Escape View File

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

5
apps/files_sharing/tests/api.php
Unescape Escape View File

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

5
apps/files_sharing/tests/backend.php
Unescape Escape View File

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

5
apps/files_sharing/tests/cache.php
Unescape Escape View File

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

2
apps/files_sharing/tests/externalstorage.php
Unescape Escape View File

@ -20,8 +20,6 @@
*
*/
require_once __DIR__ . '/base.php';
/**
* Tests for the external Storage class for remote shares.
*/

5
apps/files_sharing/tests/helper.php
Unescape Escape View File

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

3
apps/files_sharing/tests/permissions.php
Unescape Escape View File

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

3
apps/files_sharing/tests/proxy.php
Unescape Escape View File

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

4
apps/files_sharing/tests/share.php
Unescape Escape View File

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

4
apps/files_sharing/tests/sharedmount.php
Unescape Escape View File

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

4
apps/files_sharing/tests/sharedstorage.php
Unescape Escape View File

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

6
apps/files_sharing/tests/base.php → apps/files_sharing/tests/testcase.php
Unescape Escape View File

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

3
apps/files_sharing/tests/update.php
Unescape Escape View File

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

3
apps/files_sharing/tests/updater.php
Unescape Escape View File

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

23
apps/files_sharing/tests/watcher.php
Unescape Escape View File

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

2
apps/files_trashbin/tests/trashbin.php
Unescape Escape View File

@ -20,8 +20,6 @@
*
*/
require_once __DIR__ . '/../../../lib/base.php';
use OCA\Files_Trashbin;
/**

5
apps/files_versions/tests/versions.php
Unescape Escape View File

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

8
tests/lib/appframework/http/DownloadResponseTest.php
Unescape Escape View File

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

7
tests/lib/appframework/http/HttpTest.php
Unescape Escape View File

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

4
tests/lib/appframework/http/JSONResponseTest.php
Unescape Escape View File

@ -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 {
/**

7
tests/lib/appframework/http/RedirectResponseTest.php
Unescape Escape View File

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

2
tests/lib/archive/tar.php
Unescape Escape View File

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

2
tests/lib/archive/zip.php
Unescape Escape View File

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