Correct lib/public/contacts.php tests

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 44d82c37908260775f387de82f1f81921b4207ce..88d812e735a857b79e47cb85b712ab9801836711 100644 (file)
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -149,14 +149,14 @@ namespace OCP {
                /**
                 * @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;
                }
 
                /**
                 * @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()]);
                }
 

diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index 23994667a26a50622345a76747ae246acd626b1b..ce5d762226b540c0a7ba06d4536886dea40f3a68 100644 (file)
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -39,7 +39,7 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
        public function testEnabledAfterRegister() {
                // 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:
                // first time on register
@@ -65,7 +65,7 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
        public function testAddressBookEnumeration() {
                // 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
                $stub->expects($this->any())
@@ -85,8 +85,8 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
        public function testSearchInAddressBook() {
                // create mock for the addressbook
-               $stub1 = $this->getMock("SimpleAddressBook1", array('getKey', 'getDisplayName', 'search'));
-               $stub2 = $this->getMock("SimpleAddressBook2", array('getKey', 'getDisplayName', 'search'));
+               $stub1 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
+               $stub2 = $this->getMockForAbstractClass("OCP\IAddressBook", array('getKey', 'getDisplayName', 'search'));
 
                $searchResult1 = array(
                        array('id' => 0, 'FN' => 'Frank Karlitschek', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),