upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Fix tests

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-10-02 10:37:18 +02:00
parent 3212c074b9
commit 95a301ea57
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
2 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/AppFramework/Http/Dispatcher.php
View file

@ -35,12 +35,10 @@ namespace OC\AppFramework\Http;
use OC\AppFramework\Http;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
use OC\AppFramework\Utility\ControllerMethodReflector;
use OC\DB\Connection;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\Response;
use OCP\Diagnostics\IQueryLogger;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IRequest;

55
tests/lib/AppFramework/Http/DispatcherTest.php
View file

@ -33,6 +33,9 @@ use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\Response;
use OCP\IConfig;
use OCP\IRequest;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
class TestController extends Controller {
/**
@ -72,7 +75,12 @@ class TestController extends Controller {
}
}
/**
* Class DispatcherTest
*
* @package Test\AppFramework\Http
* @group DB
*/
class DispatcherTest extends \Test\TestCase {
/** @var MiddlewareDispatcher */
private $middlewareDispatcher;
@ -80,16 +88,24 @@ class DispatcherTest extends \Test\TestCase {
private $dispatcher;
private $controllerMethod;
private $response;
/** @var IRequest|MockObject */
private $request;
private $lastModified;
private $etag;
/** @var Http|MockObject */
private $http;
private $reflector;
/** @var IConfig|MockObject */
private $config;
/** @var LoggerInterface|MockObject */
private $logger;
protected function setUp(): void {
parent::setUp();
$this->controllerMethod = 'test';
$this->config = $this->createMock(IConfig::class);
$this->logger = $this->createMock(LoggerInterface::class);
$app = $this->getMockBuilder(
'OC\AppFramework\DependencyInjection\DIContainer')
->disableOriginalConstructor()
@ -99,7 +115,7 @@ class DispatcherTest extends \Test\TestCase {
->disableOriginalConstructor()
->getMock();
$this->http = $this->getMockBuilder(
'\OC\AppFramework\Http')
\OC\AppFramework\Http::class)
->disableOriginalConstructor()
->getMock();
@ -124,7 +140,10 @@ class DispatcherTest extends \Test\TestCase {
$this->http,
$this->middlewareDispatcher,
$this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$this->response = $this->createMock(Response::class);
@ -299,7 +318,10 @@ class DispatcherTest extends \Test\TestCase {
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$controller = new TestController('app', $this->request);
@ -330,7 +352,10 @@ class DispatcherTest extends \Test\TestCase {
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$controller = new TestController('app', $this->request);
@ -364,7 +389,10 @@ class DispatcherTest extends \Test\TestCase {
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$controller = new TestController('app', $this->request);
@ -397,7 +425,10 @@ class DispatcherTest extends \Test\TestCase {
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$controller = new TestController('app', $this->request);
@ -431,7 +462,10 @@ class DispatcherTest extends \Test\TestCase {
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$controller = new TestController('app', $this->request);
@ -467,7 +501,10 @@ class DispatcherTest extends \Test\TestCase {
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
$this->request
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
);
$controller = new TestController('app', $this->request);