Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2022-02-11 10:03:25 +01:00
parent eede608c0e
commit 2dd96fe8da
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 29 additions and 9 deletions

View File

@ -32,6 +32,7 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\Response;
use OCP\Diagnostics\IEventLogger;
use OCP\IConfig;
use OCP\IRequest;
use PHPUnit\Framework\MockObject\MockObject;
@ -99,6 +100,10 @@ class DispatcherTest extends \Test\TestCase {
private $config;
/** @var LoggerInterface|MockObject */
private $logger;
/**
* @var IEventLogger|MockObject
*/
private $eventLogger;
protected function setUp(): void {
parent::setUp();
@ -106,6 +111,7 @@ class DispatcherTest extends \Test\TestCase {
$this->config = $this->createMock(IConfig::class);
$this->logger = $this->createMock(LoggerInterface::class);
$this->eventLogger = $this->createMock(IEventLogger::class);
$app = $this->getMockBuilder(
'OC\AppFramework\DependencyInjection\DIContainer')
->disableOriginalConstructor()
@ -143,7 +149,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$this->response = $this->createMock(Response::class);
@ -321,7 +328,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$controller = new TestController('app', $this->request);
@ -355,7 +363,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$controller = new TestController('app', $this->request);
@ -392,7 +401,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$controller = new TestController('app', $this->request);
@ -428,7 +438,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$controller = new TestController('app', $this->request);
@ -465,7 +476,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$controller = new TestController('app', $this->request);
@ -504,7 +516,8 @@ class DispatcherTest extends \Test\TestCase {
$this->request,
$this->config,
\OC::$server->getDatabaseConnection(),
$this->logger
$this->logger,
$this->eventLogger
);
$controller = new TestController('app', $this->request);

View File

@ -21,18 +21,25 @@
namespace Test\Diagnostics;
use Psr\Log\LoggerInterface;
use OC\Diagnostics\EventLogger;
use OC\Log;
use OC\SystemConfig;
use Test\TestCase;
class EventLoggerTest extends TestCase {
/** @var \OC\Diagnostics\EventLogger */
private $logger;
protected function setUp(): void {
parent::setUp();
$this->logger = new EventLogger();
$this->logger = new EventLogger(
$this->createMock(SystemConfig::class),
$this->createMock(LoggerInterface::class),
$this->createMock(Log::class)
);
}
public function testQueryLogger() {