mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unit tests 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-09-20 18:59:14 +02:00
parent ce964f0a10
commit 7dd952d5a2
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/dav/tests/unit/CardDAV/AddressBookTest.php
View File

@ -25,6 +25,7 @@ namespace OCA\DAV\Tests\unit\CardDAV;
use OCA\DAV\CardDAV\AddressBook; use OCA\DAV\CardDAV\AddressBook;
use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\CardDavBackend;
use OCP\IL10N;
use Sabre\DAV\PropPatch; use Sabre\DAV\PropPatch;
use Test\TestCase; use Test\TestCase;
@ -40,9 +41,11 @@ class AddressBookTest extends TestCase {
$calendarInfo = [ $calendarInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1', '{http://owncloud.org/ns}owner-principal' => 'user1',
'principaluri' => 'user2', 'principaluri' => 'user2',
'id' => 666 'id' => 666,
'uri' => 'default',
]; ];
$c = new AddressBook($backend, $calendarInfo); $l = $this->createMock(IL10N::class);
$c = new AddressBook($backend, $calendarInfo, $l);
$c->delete(); $c->delete();
} }
@ -59,9 +62,11 @@ class AddressBookTest extends TestCase {
$calendarInfo = [ $calendarInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1', '{http://owncloud.org/ns}owner-principal' => 'user1',
'principaluri' => 'user2', 'principaluri' => 'user2',
'id' => 666 'id' => 666,
'uri' => 'default',
]; ];
$c = new AddressBook($backend, $calendarInfo); $l = $this->createMock(IL10N::class);
$c = new AddressBook($backend, $calendarInfo, $l);
$c->delete(); $c->delete();
} }
@ -74,9 +79,11 @@ class AddressBookTest extends TestCase {
$calendarInfo = [ $calendarInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1', '{http://owncloud.org/ns}owner-principal' => 'user1',
'principaluri' => 'user2', 'principaluri' => 'user2',
'id' => 666 'id' => 666,
'uri' => 'default',
]; ];
$c = new AddressBook($backend, $calendarInfo); $l = $this->createMock(IL10N::class);
$c = new AddressBook($backend, $calendarInfo, $l);
$c->propPatch(new PropPatch([])); $c->propPatch(new PropPatch([]));
} }
@ -98,7 +105,8 @@ class AddressBookTest extends TestCase {
if ($hasOwnerSet) { if ($hasOwnerSet) {
$calendarInfo['{http://owncloud.org/ns}owner-principal'] = 'user1'; $calendarInfo['{http://owncloud.org/ns}owner-principal'] = 'user1';
} }
$c = new AddressBook($backend, $calendarInfo); $l = $this->createMock(IL10N::class);
$c = new AddressBook($backend, $calendarInfo, $l);
$acl = $c->getACL(); $acl = $c->getACL();
$childAcl = $c->getChildACL(); $childAcl = $c->getChildACL();

7
apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
View File

@ -33,6 +33,7 @@ use OCA\DAV\CardDAV\CardDavBackend;
use OCA\DAV\Connector\Sabre\Principal; use OCA\DAV\Connector\Sabre\Principal;
use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\IL10N;
use Sabre\DAV\PropPatch; use Sabre\DAV\PropPatch;
use Sabre\VObject\Component\VCard; use Sabre\VObject\Component\VCard;
use Sabre\VObject\Property\Text; use Sabre\VObject\Property\Text;
@ -146,7 +147,8 @@ class CardDavBackendTest extends TestCase {
$this->backend->createAddressBook(self::UNIT_TEST_USER, 'Example', []); $this->backend->createAddressBook(self::UNIT_TEST_USER, 'Example', []);
$books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER); $books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER);
$this->assertEquals(1, count($books)); $this->assertEquals(1, count($books));
$addressBook = new AddressBook($this->backend, $books[0]); $l = $this->createMock(IL10N::class);
$addressBook = new AddressBook($this->backend, $books[0], $l);
$this->backend->updateShares($addressBook, [ $this->backend->updateShares($addressBook, [
[ [
'href' => 'principal:' . self::UNIT_TEST_USER1, 'href' => 'principal:' . self::UNIT_TEST_USER1,
@ -329,7 +331,8 @@ class CardDavBackendTest extends TestCase {
$books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER); $books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER);
$this->assertEquals(1, count($books)); $this->assertEquals(1, count($books));
$exampleBook = new AddressBook($this->backend, $books[0]); $l = $this->createMock(IL10N::class);
$exampleBook = new AddressBook($this->backend, $books[0], $l);
$this->backend->updateShares($exampleBook, [['href' => 'principal:principals/best-friend']], []); $this->backend->updateShares($exampleBook, [['href' => 'principal:principals/best-friend']], []);
$shares = $this->backend->getShares($exampleBook->getResourceId()); $shares = $this->backend->getShares($exampleBook->getResourceId());

6
apps/dav/tests/unit/CardDAV/ContactsManagerTest.php
View File

@ -27,6 +27,7 @@ namespace OCA\DAV\Tests\unit\CardDAV;
use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\CardDavBackend;
use OCA\DAV\CardDAV\ContactsManager; use OCA\DAV\CardDAV\ContactsManager;
use OCP\Contacts\IManager; use OCP\Contacts\IManager;
use OCP\IL10N;
use Test\TestCase; use Test\TestCase;
class ContactsManagerTest extends TestCase { class ContactsManagerTest extends TestCase {
@ -38,10 +39,11 @@ class ContactsManagerTest extends TestCase {
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backEnd */ /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backEnd */
$backEnd = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock(); $backEnd = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock();
$backEnd->method('getAddressBooksForUser')->willReturn([ $backEnd->method('getAddressBooksForUser')->willReturn([
[] ['uri' => 'default'],
]); ]);
$app = new ContactsManager($backEnd); $l = $this->createMock(IL10N::class);
$app = new ContactsManager($backEnd, $l);
$app->setupContactsProvider($cm, 'user01', $urlGenerator); $app->setupContactsProvider($cm, 'user01', $urlGenerator);
} }
} }