From aa979f5dff4234a3db9e6fb1ddc50335c04c194b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 21 Aug 2013 00:44:39 +0200
Subject: [PATCH] cleanup of tests
---
tests/lib/appframework/AppTest.php | 8 --------
.../middleware/MiddlewareDispatcherTest.php | 19 ++++++++++++++-----
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index e8ae8c8f67..80abaefc43 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -24,14 +24,6 @@
namespace OC\AppFramework;
-use OC\AppFramework\Http\Request;
-use OC\AppFramework\Core\API;
-use OC\AppFramework\Middleware\MiddlewareDispatcher;
-
-// FIXME: loading pimpl correctly from 3rdparty repo
-require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';
-//require_once __DIR__ . "/classloader.php";
-
class AppTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index d1b2fedee5..43727846dc 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -99,6 +99,15 @@ class TestMiddleware extends Middleware {
class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
+ public $exception;
+ public $response;
+ private $out;
+ private $method;
+ private $controller;
+
+ /**
+ * @var MiddlewareDispatcher
+ */
private $dispatcher;
@@ -107,7 +116,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
$this->controller = $this->getControllerMock();
$this->method = 'method';
$this->response = new Response();
- $this->output = 'hi';
+ $this->out = 'hi';
$this->exception = new \Exception();
}
@@ -202,11 +211,11 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
public function testBeforeOutputCorrectArguments(){
$m1 = $this->getMiddleware();
- $this->dispatcher->beforeOutput($this->controller, $this->method, $this->output);
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
$this->assertEquals($this->controller, $m1->controller);
$this->assertEquals($this->method, $m1->methodName);
- $this->assertEquals($this->output, $m1->output);
+ $this->assertEquals($this->out, $m1->output);
}
@@ -248,7 +257,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
$m1 = $this->getMiddleware();
$m2 = $this->getMiddleware();
- $this->dispatcher->beforeOutput($this->controller, $this->method, $this->output);
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
$this->assertEquals(2, $m1->beforeOutputOrder);
$this->assertEquals(1, $m2->beforeOutputOrder);
@@ -268,7 +277,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
$this->dispatcher->registerMiddleware($m3);
- $this->dispatcher->beforeOutput($this->controller, $this->method, $this->output);
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
$this->assertEquals(2, $m1->beforeOutputOrder);
$this->assertEquals(1, $m2->beforeOutputOrder);
--
GitLab