886bda5f81
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
99 lines
2.5 KiB
PHP
99 lines
2.5 KiB
PHP
<?php
|
|
|
|
/**
|
|
* ownCloud - App Framework
|
|
*
|
|
* @author Bernhard Posselt
|
|
* @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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/>.
|
|
*
|
|
*/
|
|
|
|
|
|
namespace OC\AppFramework;
|
|
|
|
use OC\AppFramework\Http\Request;
|
|
use OCP\AppFramework\Middleware;
|
|
use OCP\AppFramework\Http\Response;
|
|
|
|
class ChildMiddleware extends Middleware {};
|
|
|
|
|
|
class MiddlewareTest extends \Test\TestCase {
|
|
|
|
/**
|
|
* @var Middleware
|
|
*/
|
|
private $middleware;
|
|
private $controller;
|
|
private $exception;
|
|
private $api;
|
|
/** @var Response */
|
|
private $response;
|
|
|
|
protected function setUp(){
|
|
parent::setUp();
|
|
|
|
$this->middleware = new ChildMiddleware();
|
|
|
|
$this->api = $this->getMockBuilder(
|
|
'OC\AppFramework\DependencyInjection\DIContainer')
|
|
->disableOriginalConstructor()
|
|
->getMock();
|
|
|
|
$this->controller = $this->getMock(
|
|
'OCP\AppFramework\Controller',
|
|
[],
|
|
[
|
|
$this->api,
|
|
new Request(
|
|
[],
|
|
$this->getMock('\OCP\Security\ISecureRandom'),
|
|
$this->getMock('\OCP\IConfig')
|
|
)
|
|
]
|
|
);
|
|
$this->exception = new \Exception();
|
|
$this->response = $this->getMock('OCP\AppFramework\Http\Response');
|
|
}
|
|
|
|
|
|
public function testBeforeController() {
|
|
$this->middleware->beforeController($this->controller, null);
|
|
$this->assertNull(null);
|
|
}
|
|
|
|
|
|
public function testAfterExceptionRaiseAgainWhenUnhandled() {
|
|
$this->setExpectedException('Exception');
|
|
$afterEx = $this->middleware->afterException($this->controller, null, $this->exception);
|
|
}
|
|
|
|
|
|
public function testAfterControllerReturnResponseWhenUnhandled() {
|
|
$response = $this->middleware->afterController($this->controller, null, $this->response);
|
|
|
|
$this->assertEquals($this->response, $response);
|
|
}
|
|
|
|
|
|
public function testBeforeOutputReturnOutputhenUnhandled() {
|
|
$output = $this->middleware->beforeOutput($this->controller, null, 'test');
|
|
|
|
$this->assertEquals('test', $output);
|
|
}
|
|
|
|
|
|
}
|