Register all system address books to the contacts manager
This commit is contained in:
parent
b01d50216e
commit
ca25055cc8
|
@ -39,8 +39,18 @@ class ContactsManager {
|
||||||
* @param string $userId
|
* @param string $userId
|
||||||
*/
|
*/
|
||||||
public function setupContactsProvider(IManager $cm, $userId) {
|
public function setupContactsProvider(IManager $cm, $userId) {
|
||||||
$addressBooks = $this->backend->getAddressBooksForUser("principals/$userId");
|
$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
|
||||||
foreach ($addressBooks as $addressBookInfo) {
|
$this->register($cm, $addressBooks);
|
||||||
|
$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
|
||||||
|
$this->register($cm, $addressBooks);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param IManager $cm
|
||||||
|
* @param $addressBooks
|
||||||
|
*/
|
||||||
|
private function register(IManager $cm, $addressBooks) {
|
||||||
|
foreach ($addressBooks as $addressBookInfo) {
|
||||||
$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo);
|
$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo);
|
||||||
$cm->registerAddressBook(
|
$cm->registerAddressBook(
|
||||||
new AddressBookImpl(
|
new AddressBookImpl(
|
||||||
|
|
|
@ -35,17 +35,28 @@ use Test\TestCase;
|
||||||
class ApplicationTest extends TestCase {
|
class ApplicationTest extends TestCase {
|
||||||
public function test() {
|
public function test() {
|
||||||
$app = new Application();
|
$app = new Application();
|
||||||
|
$c = $app->getContainer();
|
||||||
|
|
||||||
// assert service instances in the container are properly setup
|
// assert service instances in the container are properly setup
|
||||||
$s = $app->getContainer()->query('ContactsManager');
|
$s = $c->query('ContactsManager');
|
||||||
$this->assertInstanceOf('OCA\DAV\CardDAV\ContactsManager', $s);
|
$this->assertInstanceOf('OCA\DAV\CardDAV\ContactsManager', $s);
|
||||||
$s = $app->getContainer()->query('CardDavBackend');
|
$s = $c->query('CardDavBackend');
|
||||||
$this->assertInstanceOf('OCA\DAV\CardDAV\CardDavBackend', $s);
|
$this->assertInstanceOf('OCA\DAV\CardDAV\CardDavBackend', $s);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testContactsManagerSetup() {
|
||||||
|
$app = new Application();
|
||||||
|
$c = $app->getContainer();
|
||||||
|
$c->registerService('CardDavBackend', function($c) {
|
||||||
|
$service = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock();
|
||||||
|
$service->method('getAddressBooksForUser')->willReturn([]);
|
||||||
|
return $service;
|
||||||
|
});
|
||||||
|
|
||||||
// assert setupContactsProvider() is proper
|
// assert setupContactsProvider() is proper
|
||||||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */
|
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */
|
||||||
$cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock();
|
$cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock();
|
||||||
$app->setupContactsProvider($cm, 'user01');
|
$app->setupContactsProvider($cm, 'xxx');
|
||||||
$this->assertTrue(true);
|
$this->assertTrue(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ class ContactsManagerTest extends TestCase {
|
||||||
public function test() {
|
public function test() {
|
||||||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */
|
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */
|
||||||
$cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock();
|
$cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock();
|
||||||
$cm->expects($this->once())->method('registerAddressBook');
|
$cm->expects($this->exactly(2))->method('registerAddressBook');
|
||||||
/** @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([
|
||||||
|
|
Loading…
Reference in New Issue