diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2014-03-14 13:51:17 +0100 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-04-28 13:49:56 +0200 |
commit | 45e42c25de5e498197a9aace7161b4f377a8dacc (patch) | |
tree | f08d13bc5b8d561659fd6ca50ee70bae640c4956 /tests/lib/user | |
parent | e27dc5b6f9acd7e8758da66013dd012540618b74 (diff) | |
download | nextcloud-server-45e42c25de5e498197a9aace7161b4f377a8dacc.tar.gz nextcloud-server-45e42c25de5e498197a9aace7161b4f377a8dacc.zip |
Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
Diffstat (limited to 'tests/lib/user')
-rw-r--r-- | tests/lib/user/manager.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php index 8ca0f94c6fa..fd0931af7e4 100644 --- a/tests/lib/user/manager.php +++ b/tests/lib/user/manager.php @@ -190,8 +190,8 @@ class Manager extends \PHPUnit_Framework_TestCase { $result = $manager->search('fo'); $this->assertEquals(2, count($result)); - $this->assertEquals('afoo', $result[0]->getUID()); - $this->assertEquals('foo', $result[1]->getUID()); + $this->assertEquals('afoo', array_shift($result)->getUID()); + $this->assertEquals('foo', array_shift($result)->getUID()); } public function testSearchTwoBackendLimitOffset() { @@ -219,9 +219,9 @@ class Manager extends \PHPUnit_Framework_TestCase { $result = $manager->search('fo', 3, 1); $this->assertEquals(3, count($result)); - $this->assertEquals('foo1', $result[0]->getUID()); - $this->assertEquals('foo2', $result[1]->getUID()); - $this->assertEquals('foo3', $result[2]->getUID()); + $this->assertEquals('foo1', array_shift($result)->getUID()); + $this->assertEquals('foo2', array_shift($result)->getUID()); + $this->assertEquals('foo3', array_shift($result)->getUID()); } public function testCreateUserSingleBackendNotExists() { |