summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-07-28 22:38:56 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-29 00:34:02 +0200
commit09ebe1cfa60b13d061efe9bb0f48c21012866ce9 (patch)
tree1ee6ee82b91d5204bf5a3a4fa338be63f5b7b6f3
parent0dc649f3914c4917cbc679827fb4f080e4679b35 (diff)
downloadnextcloud-server-09ebe1cfa60b13d061efe9bb0f48c21012866ce9.tar.gz
nextcloud-server-09ebe1cfa60b13d061efe9bb0f48c21012866ce9.zip
function declaration did not match
-rw-r--r--tests/lib/contacts/localadressbook.php10
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() {