wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup of tests

Browse source
This commit is contained in:
Thomas Müller 2013-08-21 00:44:39 +02:00
parent 33db8a3089
commit aa979f5dff
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,14 +24,6 @@
namespace OC\AppFramework; 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 { class AppTest extends \PHPUnit_Framework_TestCase {

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

@ -99,6 +99,15 @@ class TestMiddleware extends Middleware {
class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase { class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
public $exception;
public $response;
private $out;
private $method;
private $controller;
/**
* @var MiddlewareDispatcher
*/
private $dispatcher; private $dispatcher;
@ -107,7 +116,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
$this->controller = $this->getControllerMock(); $this->controller = $this->getControllerMock();
$this->method = 'method'; $this->method = 'method';
$this->response = new Response(); $this->response = new Response();
$this->output = 'hi'; $this->out = 'hi';
$this->exception = new \Exception(); $this->exception = new \Exception();
} }
@ -202,11 +211,11 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
public function testBeforeOutputCorrectArguments(){ public function testBeforeOutputCorrectArguments(){
$m1 = $this->getMiddleware(); $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->controller, $m1->controller);
$this->assertEquals($this->method, $m1->methodName); $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(); $m1 = $this->getMiddleware();
$m2 = $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(2, $m1->beforeOutputOrder);
$this->assertEquals(1, $m2->beforeOutputOrder); $this->assertEquals(1, $m2->beforeOutputOrder);
@ -268,7 +277,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
$this->dispatcher->registerMiddleware($m3); $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(2, $m1->beforeOutputOrder);
$this->assertEquals(1, $m2->beforeOutputOrder); $this->assertEquals(1, $m2->beforeOutputOrder);