summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/dav/tests/unit/CalDAV/CalendarTest.php3
-rw-r--r--apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php6
-rw-r--r--apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php3
3 files changed, 8 insertions, 4 deletions
diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php
index e143820daeb..cfbc08d79dc 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php
@@ -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);
diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
index 2fb97969655..87db11ddd69 100644
--- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
+++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
@@ -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')
diff --git a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
index d857aa3d86b..87f7c79a770 100644
--- a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
+++ b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
@@ -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')