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

Merge pull request #1509 from owncloud/correct-public-contacts-tests 

Correct lib/public/contacts.php tests
This commit is contained in:
Lukas Reschke 2013-02-06 12:29:51 -08:00
parent e969a78cf9 a4d3cc798f
commit 2dfe67423d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/public/contacts.php
View File

@ -149,14 +149,14 @@ namespace OCP {
/** /**
* @param \OCP\IAddressBook $address_book * @param \OCP\IAddressBook $address_book
*/ */
public static function registerAddressBook($address_book) { public static function registerAddressBook(\OCP\IAddressBook $address_book) {
self::$address_books[$address_book->getKey()] = $address_book; self::$address_books[$address_book->getKey()] = $address_book;
} }
/** /**
* @param \OCP\IAddressBook $address_book * @param \OCP\IAddressBook $address_book
*/ */
public static function unregisterAddressBook($address_book) { public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
unset(self::$address_books[$address_book->getKey()]); unset(self::$address_books[$address_book->getKey()]);
} }

8
tests/lib/public/contacts.php
View File

@ -39,7 +39,7 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
public function testEnabledAfterRegister() { public function testEnabledAfterRegister() {
// create mock for the addressbook // create mock for the addressbook
$stub = $this->getMock("SimpleAddressBook", array('getKey')); $stub = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey'));
// we expect getKey to be called twice: // we expect getKey to be called twice:
// first time on register // first time on register
@ -65,7 +65,7 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
public function testAddressBookEnumeration() { public function testAddressBookEnumeration() {
// create mock for the addressbook // create mock for the addressbook
$stub = $this->getMock("SimpleAddressBook", array('getKey', 'getDisplayName')); $stub = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName'));
// setup return for method calls // setup return for method calls
$stub->expects($this->any()) $stub->expects($this->any())
@ -85,8 +85,8 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
public function testSearchInAddressBook() { public function testSearchInAddressBook() {
// create mock for the addressbook // create mock for the addressbook
$stub1 = $this->getMock("SimpleAddressBook1", array('getKey', 'getDisplayName', 'search')); $stub1 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
$stub2 = $this->getMock("SimpleAddressBook2", array('getKey', 'getDisplayName', 'search')); $stub2 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
$searchResult1 = array( $searchResult1 = array(
array('id' => 0, 'FN' => 'Frank Karlitschek', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'), array('id' => 0, 'FN' => 'Frank Karlitschek', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),