sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26662 from nextcloud/bugfix/noid/fix-dav-unit-tests 

Fix DAV unit tests
pull/26594/head
Roeland Jago Douma 2021-04-20 20:43:24 +07:00 committed by GitHub
parent cd5dd31ab0 379664974c
commit 1e767b4f44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/tests/unit/CalDAV/CalendarTest.php
Unescape Escape View File

@ -437,7 +437,8 @@ EOD;
->with('Busy')
->willReturn("Translated busy");
} else {
$l10n->expects($this->never());
$l10n->expects($this->never())
->method('t');
}
$c = new Calendar($backend, $calendarInfo, $l10n, $this->config);

6
apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
Unescape Escape View File

@ -34,6 +34,8 @@ use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
use OCA\DAV\Controller\InvitationResponseController;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\IResult;
use OCP\DB\QueryBuilder\IExpressionBuilder;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IRequest;
@ -408,8 +410,8 @@ EOF;
private function buildQueryExpects($token, $return, $time) {
$queryBuilder = $this->createMock(IQueryBuilder::class);
$stmt = $this->createMock(\Doctrine\DBAL\Driver\Statement::class);
$expr = $this->createMock(\OCP\DB\QueryBuilder\IExpressionBuilder::class);
$stmt = $this->createMock(IResult::class);
$expr = $this->createMock(IExpressionBuilder::class);
$this->dbConnection->expects($this->once())
->method('getQueryBuilder')

3
apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
Unescape Escape View File

@ -29,6 +29,7 @@ namespace OCA\DAV\Tests\unit\DAV\Migration;
use OCA\DAV\BackgroundJob\RefreshWebcalJob;
use OCA\DAV\Migration\RefreshWebcalJobRegistrar;
use OCP\BackgroundJob\IJobList;
use OCP\DB\IResult;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
@ -62,7 +63,7 @@ class RefreshWebcalJobRegistrarTest extends TestCase {
$output = $this->createMock(IOutput::class);
$queryBuilder = $this->createMock(IQueryBuilder::class);
$statement = $this->createMock(\Doctrine\DBAL\Driver\Statement::class);
$statement = $this->createMock(IResult::class);
$this->db->expects($this->once())
->method('getQueryBuilder')