diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-09-18 17:12:35 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-10-20 12:51:38 +0200 |
| commit | e46f87fdacb8273675311a8538fc4b47fdb0ac13 (patch) | |
| tree | ae770714eab7faa8d41dda09652f3634d476d1ad /tests | |
| parent | 6fc04c2f9129fc55966ad66d2ddca1b7d884f4e9 (diff) | |
| download | nextcloud-server-e46f87fdacb8273675311a8538fc4b47fdb0ac13.tar.gz nextcloud-server-e46f87fdacb8273675311a8538fc4b47fdb0ac13.zip | |
backport of #11494
fix retrievel of group members and cache group members
fix changed variable name
with several backends, more than limit can be returned
make performance less bad. Still far from good, but at least it works
add one simple cache test
adjust group manager tests
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/lib/access.php
apps/user_ldap/tests/group_ldap.php
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/group/manager.php | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index 54e8fc4f893..8ab35599007 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -367,15 +367,6 @@ class Manager extends \PHPUnit_Framework_TestCase { } })); - $backend->expects($this->once()) - ->method('implementsActions') - ->will($this->returnValue(true)); - - $backend->expects($this->once()) - ->method('countUsersInGroup') - ->with('testgroup', '') - ->will($this->returnValue(2)); - /** * @var \OC\User\Manager $userManager */ @@ -494,9 +485,9 @@ class Manager extends \PHPUnit_Framework_TestCase { ->with('testgroup') ->will($this->returnValue(true)); - $backend->expects($this->any()) - ->method('InGroup') - ->will($this->returnCallback(function($uid, $gid) { + $backend->expects($this->any()) + ->method('inGroup') + ->will($this->returnCallback(function($uid) { switch($uid) { case 'user1' : return false; case 'user2' : return true; @@ -519,9 +510,12 @@ class Manager extends \PHPUnit_Framework_TestCase { ->with('user3') ->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { switch($offset) { - case 0 : return array('user3' => new User('user3', $userBackend), - 'user33' => new User('user33', $userBackend)); - case 2 : return array('user333' => new User('user333', $userBackend)); + case 0 : + return array( + 'user3' => new User('user3', $userBackend), + 'user33' => new User('user33', $userBackend), + 'user333' => new User('user333', $userBackend) + ); } })); |