diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-30 17:20:40 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-30 17:20:40 +0100 |
commit | f776bcd4a0e58a8803ae4bf922bb278f6a5c5203 (patch) | |
tree | de248013ff131094a6ff91399ae71b17966a9cb6 /tests/lib | |
parent | 90e523ead09436c54993ea527a1eec3faad7a0bd (diff) | |
download | nextcloud-server-f776bcd4a0e58a8803ae4bf922bb278f6a5c5203.tar.gz nextcloud-server-f776bcd4a0e58a8803ae4bf922bb278f6a5c5203.zip |
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib/appframework/http/DownloadResponseTest.php | 8 | ||||
-rw-r--r-- | tests/lib/appframework/http/HttpTest.php | 7 | ||||
-rw-r--r-- | tests/lib/appframework/http/JSONResponseTest.php | 4 | ||||
-rw-r--r-- | tests/lib/appframework/http/RedirectResponseTest.php | 7 | ||||
-rw-r--r-- | tests/lib/archive/tar.php | 2 | ||||
-rw-r--r-- | tests/lib/archive/zip.php | 2 |
6 files changed, 12 insertions, 18 deletions
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() { |