diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-08 12:11:22 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-08 12:11:22 +0200 |
| commit | f051b7381ba00d538dd5ad0b1ba5b016d4aa62b1 (patch) | |
| tree | 1ad3f14faa57dcdff8198f30ace4a5ed4f396c59 /tests/lib | |
| parent | 2fb1b0864adea92102d8c91d92681dc0ef0bbafc (diff) | |
| parent | d683752b37dd2ed40cddbc446e326015b3036ad3 (diff) | |
| download | nextcloud-server-f051b7381ba00d538dd5ad0b1ba5b016d4aa62b1.tar.gz nextcloud-server-f051b7381ba00d538dd5ad0b1ba5b016d4aa62b1.zip | |
Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
Sort user groups by group name and hide the user count
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/group/metadata.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/lib/group/metadata.php b/tests/lib/group/metadata.php index 94944189cad..3f4019c2fac 100644 --- a/tests/lib/group/metadata.php +++ b/tests/lib/group/metadata.php @@ -16,7 +16,7 @@ class Test_MetaData extends \Test\TestCase { ->getMock(); } - private function getGroupMock() { + private function getGroupMock($countCallCount = 0) { $group = $this->getMockBuilder('\OC\Group\Group') ->disableOriginalConstructor() ->getMock(); @@ -28,7 +28,7 @@ class Test_MetaData extends \Test\TestCase { 'g2', 'g2', 'g2', 'g3', 'g3', 'g3')); - $group->expects($this->exactly(3)) + $group->expects($this->exactly($countCallCount)) ->method('count') ->with('') ->will($this->onConsecutiveCalls(2, 3, 5)); @@ -54,14 +54,15 @@ class Test_MetaData extends \Test\TestCase { $this->assertSame(2, count($ordinaryGroups)); $this->assertSame('g2', $ordinaryGroups[0]['name']); - $this->assertSame(3, $ordinaryGroups[0]['usercount']); + // user count is not loaded + $this->assertSame(0, $ordinaryGroups[0]['usercount']); } public function testGetWithSorting() { $groupManager = $this->getGroupManagerMock(); $groupMetaData = new \OC\Group\MetaData('foo', true, $groupManager); $groupMetaData->setSorting($groupMetaData::SORT_USERCOUNT); - $group = $this->getGroupMock(); + $group = $this->getGroupMock(3); $groups = array_fill(0, 3, $group); $groupManager->expects($this->once()) |