summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-06-18 11:33:43 +0200
committerJoas Schilling <coding@schilljs.com>2020-06-18 11:33:43 +0200
commit11513947397e10eb8cfd70bf880781cba270ad31 (patch)
tree4ca9f8cdf78f54d5e44705a0be5e0edb66092004 /tests/lib
parent9ff7a9c38e57b51abdd8561535d91256bf95b086 (diff)
downloadnextcloud-server-11513947397e10eb8cfd70bf880781cba270ad31.tar.gz
nextcloud-server-11513947397e10eb8cfd70bf880781cba270ad31.zip
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/Collaboration/Collaborators/UserPluginTest.php84
1 files changed, 47 insertions, 37 deletions
diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php
index 0256c1eb157..40813c82850 100644
--- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php
@@ -275,7 +275,7 @@ class UserPluginTest extends TestCase {
true,
['abc', 'xyz'],
[
- ['abc', 'test', 2, 0, [$this->getUserMock('test1', 'Test One')]],
+ ['abc', 'test', 2, 0, ['test1' => 'Test One']],
['xyz', 'test', 2, 0, []],
],
[],
@@ -284,6 +284,7 @@ class UserPluginTest extends TestCase {
],
true,
false,
+ [['test1', $this->getUserMock('test1', 'Test One')]],
],
[
'test',
@@ -291,13 +292,14 @@ class UserPluginTest extends TestCase {
false,
['abc', 'xyz'],
[
- ['abc', 'test', 2, 0, [$this->getUserMock('test1', 'Test One')]],
+ ['abc', 'test', 2, 0, ['test1' => 'Test One']],
['xyz', 'test', 2, 0, []],
],
[],
[],
true,
false,
+ [['test1', $this->getUserMock('test1', 'Test One')]],
],
[
'test',
@@ -306,12 +308,12 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'],
[
['abc', 'test', 2, 0, [
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
+ 'test1' => 'Test One',
+ 'test2' => 'Test Two',
]],
['xyz', 'test', 2, 0, [
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
+ 'test1' => 'Test One',
+ 'test2' => 'Test Two',
]],
],
[],
@@ -321,6 +323,10 @@ class UserPluginTest extends TestCase {
],
false,
false,
+ [
+ ['test1', $this->getUserMock('test1', 'Test One')],
+ ['test2', $this->getUserMock('test2', 'Test Two')],
+ ],
],
[
'test',
@@ -329,18 +335,22 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'],
[
['abc', 'test', 2, 0, [
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
+ 'test1' => 'Test One',
+ 'test2' => 'Test Two',
]],
['xyz', 'test', 2, 0, [
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
+ 'test1' => 'Test One',
+ 'test2' => 'Test Two',
]],
],
[],
[],
true,
false,
+ [
+ ['test1', $this->getUserMock('test1', 'Test One')],
+ ['test2', $this->getUserMock('test2', 'Test Two')],
+ ],
],
[
'test',
@@ -349,10 +359,10 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'],
[
['abc', 'test', 2, 0, [
- $this->getUserMock('test', 'Test One'),
+ 'test' => 'Test One',
]],
['xyz', 'test', 2, 0, [
- $this->getUserMock('test2', 'Test Two'),
+ 'test2' => 'Test Two',
]],
],
[
@@ -363,6 +373,10 @@ class UserPluginTest extends TestCase {
],
false,
false,
+ [
+ ['test', $this->getUserMock('test', 'Test One')],
+ ['test2', $this->getUserMock('test2', 'Test Two')],
+ ],
],
[
'test',
@@ -371,10 +385,10 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'],
[
['abc', 'test', 2, 0, [
- $this->getUserMock('test', 'Test One'),
+ 'test' => 'Test One',
]],
['xyz', 'test', 2, 0, [
- $this->getUserMock('test2', 'Test Two'),
+ 'test2' => 'Test Two',
]],
],
[
@@ -383,6 +397,10 @@ class UserPluginTest extends TestCase {
[],
true,
false,
+ [
+ ['test', $this->getUserMock('test', 'Test One')],
+ ['test2', $this->getUserMock('test2', 'Test Two')],
+ ],
],
];
}
@@ -399,6 +417,7 @@ class UserPluginTest extends TestCase {
* @param array $expected
* @param bool $reachedEnd
* @param bool|IUser $singleUser
+ * @param array $users
*/
public function testSearch(
$searchTerm,
@@ -409,7 +428,8 @@ class UserPluginTest extends TestCase {
array $exactExpected,
array $expected,
$reachedEnd,
- $singleUser
+ $singleUser,
+ array $users = []
) {
$this->mockConfig($shareWithGroupOnly, $shareeEnumeration, false);
$this->instantiatePlugin();
@@ -424,39 +444,29 @@ class UserPluginTest extends TestCase {
->with($searchTerm, $this->limit, $this->offset)
->willReturn($userResponse);
} else {
- $groups = array_combine($groupResponse, array_map(function ($gid) {
- return $this->getGroupMock($gid);
- }, $groupResponse));
- if ($singleUser !== false) {
- $this->groupManager->method('getUserGroups')
- ->with($this->user)
- ->willReturn($groups);
+ $this->groupManager->method('getUserGroupIds')
+ ->with($this->user)
+ ->willReturn($groupResponse);
+ if ($singleUser !== false) {
$this->groupManager->method('getUserGroupIds')
->with($singleUser)
->willReturn($groupResponse);
- } else {
- $this->groupManager->expects($this->once())
- ->method('getUserGroups')
- ->with($this->user)
- ->willReturn($groups);
}
- foreach ($userResponse as $groupDefinition) {
- [$gid, $search, $limit, $offset, $users] = $groupDefinition;
- $groups[$gid]->method('searchDisplayName')
- ->with($search, $limit, $offset)
- ->willReturn($users);
- }
+ $this->groupManager->method('displayNamesInGroup')
+ ->willReturnMap($userResponse);
}
if ($singleUser !== false) {
- $this->userManager->expects($this->once())
- ->method('get')
- ->with($searchTerm)
- ->willReturn($singleUser);
+ $users[] = [$searchTerm, $singleUser];
}
+ if (!empty($users)) {
+ $this->userManager->expects($this->atLeastOnce())
+ ->method('get')
+ ->willReturnMap($users);
+ }
$moreResults = $this->plugin->search($searchTerm, $this->limit, $this->offset, $this->searchResult);
$result = $this->searchResult->asArray();