diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-07-29 07:44:23 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-07-29 07:44:23 +0200 |
| commit | 021f25836abd68f9415eeca5c7ce94cccad6dffd (patch) | |
| tree | 869d1084accc3aba731acc26fc04430202e3ad45 | |
| parent | 708b734e48f181e68876acc14e262fe126ab8d14 (diff) | |
| parent | 09ebe1cfa60b13d061efe9bb0f48c21012866ce9 (diff) | |
| download | nextcloud-server-021f25836abd68f9415eeca5c7ce94cccad6dffd.tar.gz nextcloud-server-021f25836abd68f9415eeca5c7ce94cccad6dffd.zip | |
Merge pull request #9989 from owncloud/fix-failing-unit-test-master
function declaration did not match
| -rw-r--r-- | tests/lib/contacts/localadressbook.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/contacts/localadressbook.php b/tests/lib/contacts/localadressbook.php index 276863aeb6c..bb69910820f 100644 --- a/tests/lib/contacts/localadressbook.php +++ b/tests/lib/contacts/localadressbook.php @@ -17,7 +17,7 @@ class Test_LocalAddressBook extends PHPUnit_Framework_TestCase public function testSearchFN() { $stub = $this->getMockForAbstractClass('\OCP\IUserManager', array('searchDisplayName')); - $stub->expects($this->any())->method('searchDisplayName')->will($this->return(array( + $stub->expects($this->any())->method('searchDisplayName')->will($this->returnValue(array( new SimpleUserForTesting('tom', 'Thomas'), new SimpleUserForTesting('tomtom', 'Thomas T.'), ))); @@ -25,13 +25,13 @@ class Test_LocalAddressBook extends PHPUnit_Framework_TestCase $localAddressBook = new LocalAddressBook($stub); $result = $localAddressBook->search('tom', array('FN'), array()); - $this->assertEqual(2, count($result)); + $this->assertEquals(2, count($result)); } public function testSearchId() { $stub = $this->getMockForAbstractClass('\OCP\IUserManager', array('searchDisplayName')); - $stub->expects($this->any())->method('search')->will($this->return(array( + $stub->expects($this->any())->method('search')->will($this->returnValue(array( new SimpleUserForTesting('tom', 'Thomas'), new SimpleUserForTesting('tomtom', 'Thomas T.'), ))); @@ -39,7 +39,7 @@ class Test_LocalAddressBook extends PHPUnit_Framework_TestCase $localAddressBook = new LocalAddressBook($stub); $result = $localAddressBook->search('tom', array('id'), array()); - $this->assertEqual(2, count($result)); + $this->assertEquals(2, count($result)); } } @@ -72,7 +72,7 @@ class SimpleUserForTesting implements \OCP\IUser { public function delete() { } - public function setPassword($password, $recoveryPassword) { + public function setPassword($password, $recoveryPassword = null) { } public function getHome() { |