summaryrefslogtreecommitdiffstats
path: root/apps/dav/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-04 13:38:32 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-12 14:24:47 +0100
commit90d9834c8c0d3ae10cc754595d729821584e76a9 (patch)
tree7a50a81c630c835e131e9da3aaf2ac50aad2c88b /apps/dav/tests
parentdbddbb634bcb6df346988b85cb2847e76e22e632 (diff)
downloadnextcloud-server-90d9834c8c0d3ae10cc754595d729821584e76a9.tar.gz
nextcloud-server-90d9834c8c0d3ae10cc754595d729821584e76a9.zip
Decouple federation and dav app
Diffstat (limited to 'apps/dav/tests')
-rw-r--r--apps/dav/tests/unit/carddav/carddavbackendtest.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/apps/dav/tests/unit/carddav/carddavbackendtest.php b/apps/dav/tests/unit/carddav/carddavbackendtest.php
index fe01aa65cca..2f5e9eeded6 100644
--- a/apps/dav/tests/unit/carddav/carddavbackendtest.php
+++ b/apps/dav/tests/unit/carddav/carddavbackendtest.php
@@ -45,9 +45,6 @@ class CardDavBackendTest extends TestCase {
/** @var Principal | \PHPUnit_Framework_MockObject_MockObject */
private $principal;
- /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */
- private $logger;
-
/** @var IDBConnection */
private $db;
@@ -70,11 +67,10 @@ class CardDavBackendTest extends TestCase {
->willReturn([
'uri' => 'principals/best-friend'
]);
- $this->logger = $this->getMock('\OCP\ILogger');
$this->db = \OC::$server->getDatabaseConnection();
- $this->backend = new CardDavBackend($this->db, $this->principal, $this->logger);
+ $this->backend = new CardDavBackend($this->db, $this->principal);
// start every test with a empty cards_properties and cards table
$query = $this->db->getQueryBuilder();
@@ -129,7 +125,7 @@ class CardDavBackendTest extends TestCase {
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */
$backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')
- ->setConstructorArgs([$this->db, $this->principal, $this->logger])
+ ->setConstructorArgs([$this->db, $this->principal])
->setMethods(['updateProperties', 'purgeProperties'])->getMock();
// create a new address book
@@ -175,7 +171,7 @@ class CardDavBackendTest extends TestCase {
public function testMultiCard() {
$this->backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')
- ->setConstructorArgs([$this->db, $this->principal, $this->logger])
+ ->setConstructorArgs([$this->db, $this->principal])
->setMethods(['updateProperties'])->getMock();
// create a new address book
@@ -222,7 +218,7 @@ class CardDavBackendTest extends TestCase {
public function testSyncSupport() {
$this->backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')
- ->setConstructorArgs([$this->db, $this->principal, $this->logger])
+ ->setConstructorArgs([$this->db, $this->principal])
->setMethods(['updateProperties'])->getMock();
// create a new address book
@@ -279,7 +275,7 @@ class CardDavBackendTest extends TestCase {
$cardId = 2;
$backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')
- ->setConstructorArgs([$this->db, $this->principal, $this->logger])
+ ->setConstructorArgs([$this->db, $this->principal])
->setMethods(['getCardId'])->getMock();
$backend->expects($this->any())->method('getCardId')->willReturn($cardId);