upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

kill superfluent classloader from tests - this approach might be of interest within the apps

Browse source
This commit is contained in:
Thomas Müller 2013-08-21 00:41:20 +02:00
parent 395deacc67
commit 33db8a3089
17 changed files with 33 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/lib/appframework/AppTest.php
View file

@ -30,7 +30,7 @@ use OC\AppFramework\Middleware\MiddlewareDispatcher;
// FIXME: loading pimpl correctly from 3rdparty repo
require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';
require_once __DIR__ . "/classloader.php";
//require_once __DIR__ . "/classloader.php";
class AppTest extends \PHPUnit_Framework_TestCase {

54
tests/lib/appframework/classloader.php
View file

@ -1,54 +0,0 @@
<?php
/**
* ownCloud - App Framework
*
* @author Bernhard Posselt
* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
// to execute without ownCloud, we need to create our own class loader
spl_autoload_register(function ($className){
if (strpos($className, 'OC\\AppFramework') === 0) {
$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
$relPath = __DIR__ . '/../../../lib/' . $path;
if(file_exists($relPath)){
require_once $relPath;
}
}
if (strpos($className, 'OCP\\') === 0) {
$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
$relPath = __DIR__ . '/../../../lib/public' . $path;
if(file_exists($relPath)){
require_once $relPath;
}
}
// FIXME: this will most probably not work anymore
if (strpos($className, 'OCA\\') === 0) {
$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
$relPath = __DIR__ . '/../..' . $path;
if(file_exists($relPath)){
require_once $relPath;
}
}
});

5
tests/lib/appframework/controller/ControllerTest.php
View file

@ -25,12 +25,11 @@
namespace Test\AppFramework\Controller;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\JSONResponse;
use OC\AppFramework\Http\TemplateResponse;
use OC\AppFramework\Controller\Controller;
use OCP\AppFramework\Http\TemplateResponse;
require_once(__DIR__ . "/../classloader.php");
//require_once __DIR__ . "/../classloader.php";
class ChildController extends Controller {};

2
tests/lib/appframework/dependencyinjection/DIContainerTest.php
View file

@ -29,7 +29,7 @@ namespace OC\AppFramework\DependencyInjection;
use \OC\AppFramework\Http\Request;
require_once(__DIR__ . "/../classloader.php");
//require_once(__DIR__ . "/../classloader.php");
class DIContainerTest extends \PHPUnit_Framework_TestCase {

6
tests/lib/appframework/http/DispatcherTest.php
View file

@ -27,7 +27,7 @@ namespace OC\AppFramework\Http;
use OC\AppFramework\Core\API;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
require_once(__DIR__ . "/../classloader.php");
//require_once(__DIR__ . "/../classloader.php");
class DispatcherTest extends \PHPUnit_Framework_TestCase {
@ -69,7 +69,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
$this->http, $this->middlewareDispatcher);
$this->response = $this->getMockBuilder(
'\OC\AppFramework\Http\Response')
'\OCP\AppFramework\Http\Response')
->disableOriginalConstructor()
->getMock();
@ -207,7 +207,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
$out = 'yo';
$httpHeaders = 'Http';
$responseHeaders = array('hell' => 'yeah');
$this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false);
$this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false);
$this->setExpectedException('\Exception');
$response = $this->dispatcher->dispatch($this->controller,

2
tests/lib/appframework/http/DownloadResponseTest.php
View file

@ -25,7 +25,7 @@
namespace OC\AppFramework\Http;
require_once(__DIR__ . "/../classloader.php");
//require_once(__DIR__ . "/../classloader.php");
class ChildDownloadResponse extends DownloadResponse {};

2
tests/lib/appframework/http/HttpTest.php
View file

@ -25,7 +25,7 @@
namespace OC\AppFramework\Http;
require_once(__DIR__ . "/../classloader.php");
//require_once(__DIR__ . "/../classloader.php");

4
tests/lib/appframework/http/JSONResponseTest.php
View file

@ -27,7 +27,9 @@
namespace OC\AppFramework\Http;
require_once(__DIR__ . "/../classloader.php");
use OCP\AppFramework\Http\JSONResponse;
//require_once(__DIR__ . "/../classloader.php");

2
tests/lib/appframework/http/RedirectResponseTest.php
View file

@ -25,7 +25,7 @@
namespace OC\AppFramework\Http;
require_once(__DIR__ . "/../classloader.php");
//require_once(__DIR__ . "/../classloader.php");

2
tests/lib/appframework/http/RequestTest.php
View file

@ -9,8 +9,6 @@
namespace OC\AppFramework\Http;
require_once(__DIR__ . "/../classloader.php");
class RequestTest extends \PHPUnit_Framework_TestCase {
public function testRequestAccessors() {

7
tests/lib/appframework/http/ResponseTest.php
View file

@ -25,13 +25,14 @@
namespace OC\AppFramework\Http;
require_once(__DIR__ . "/../classloader.php");
use OCP\AppFramework\Http\Response;
class ResponseTest extends \PHPUnit_Framework_TestCase {
/**
* @var \OCP\AppFramework\Http\Response
*/
private $childResponse;
protected function setUp(){

12
tests/lib/appframework/http/TemplateResponseTest.php
View file

@ -24,15 +24,19 @@
namespace OC\AppFramework\Http;
use OC\AppFramework\Core\API;
require_once(__DIR__ . "/../classloader.php");
use OCP\AppFramework\Http\TemplateResponse;
class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
/**
* @var \OCP\AppFramework\Http\TemplateResponse
*/
private $tpl;
/**
* @var \OCP\AppFramework\IApi
*/
private $api;
protected function setUp() {

6
tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
View file

@ -24,14 +24,10 @@
namespace OC\AppFramework;
use OC\AppFramework\Controller\Controller;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\Response;
use OC\AppFramework\Middleware\Middleware;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
require_once(__DIR__ . "/../classloader.php");
use OCP\AppFramework\Http\Response;
// needed to test ordering

11
tests/lib/appframework/middleware/MiddlewareTest.php
View file

@ -28,14 +28,14 @@ use OC\AppFramework\Http\Request;
use OC\AppFramework\Middleware\Middleware;
require_once(__DIR__ . "/../classloader.php");
class ChildMiddleware extends Middleware {};
class MiddlewareTest extends \PHPUnit_Framework_TestCase {
/**
* @var Middleware
*/
private $middleware;
private $controller;
private $exception;
@ -50,12 +50,13 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase {
$this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
array(), array($this->api, new Request()));
$this->exception = new \Exception();
$this->response = $this->getMock('OC\AppFramework\Http\Response');
$this->response = $this->getMock('OCP\AppFramework\Http\Response');
}
public function testBeforeController() {
$this->middleware->beforeController($this->controller, null, $this->exception);
$this->middleware->beforeController($this->controller, null);
$this->assertNull(null);
}

6
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
View file

@ -27,11 +27,7 @@ namespace OC\AppFramework\Middleware\Security;
use OC\AppFramework\Http\Http;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\RedirectResponse;
use OC\AppFramework\Http\JSONResponse;
use OC\AppFramework\Middleware\Middleware;
require_once(__DIR__ . "/../../classloader.php");
use OCP\AppFramework\Http\JSONResponse;
class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {

1
tests/lib/appframework/routing/RoutingTest.php
View file

@ -5,7 +5,6 @@ namespace OC\AppFramework\Routing;
use OC\AppFramework\DependencyInjection\DIContainer;
use OC\AppFramework\routing\RouteConfig;
require_once(__DIR__ . "/../classloader.php");
class RouteConfigTest extends \PHPUnit_Framework_TestCase
{

3
tests/lib/appframework/utility/MethodAnnotationReaderTest.php
View file

@ -25,9 +25,6 @@
namespace OC\AppFramework\Utility;
require_once __DIR__ . "/../classloader.php";
class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase {