aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/appframework/middleware/MiddlewareTest.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-08-21 00:41:20 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-21 00:41:20 +0200
commit33db8a3089760947eec93149a2029164b676eae8 (patch)
tree0300b1d7319935a9df7e888f3b7739d8de406bc6 /tests/lib/appframework/middleware/MiddlewareTest.php
parent395deacc6760564544a76338023d9b0bf39e0bfe (diff)
downloadnextcloud-server-33db8a3089760947eec93149a2029164b676eae8.tar.gz
nextcloud-server-33db8a3089760947eec93149a2029164b676eae8.zip
kill superfluent classloader from tests - this approach might be of interest within the apps
Diffstat (limited to 'tests/lib/appframework/middleware/MiddlewareTest.php')
-rw-r--r--tests/lib/appframework/middleware/MiddlewareTest.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index 1adce6b3d4f..5e2930ac6a3 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -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);
}