Skip to content

Commit 82ef79d

Browse files
committed
fix: Adapt tests
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
1 parent 8aca7b5 commit 82ef79d

3 files changed

Lines changed: 12 additions & 18 deletions

File tree

tests/lib/Group/GroupTest.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace Test\Group;
1010

11-
use OC\User\User;
1211
use OCP\EventDispatcher\IEventDispatcher;
1312
use OCP\IUser;
1413
use PHPUnit\Framework\MockObject\MockObject;
@@ -22,12 +21,7 @@ protected function setUp(): void {
2221
$this->dispatcher = $this->createMock(IEventDispatcher::class);
2322
}
2423

25-
/**
26-
* @param string $uid
27-
* @param \OC\User\Backend $backend
28-
* @return User
29-
*/
30-
private function newUser($uid, \OC\User\Backend $backend) {
24+
private function newUser(string $uid, \OC\User\Backend $backend): IUser {
3125
$user = $this->createMock(IUser::class);
3226
$user->method('getUID')
3327
->willReturn($uid);
@@ -52,11 +46,11 @@ protected function getUserManager() {
5246
$user3 = $this->newUser('user3', $backend);
5347
$userManager->expects($this->any())
5448
->method('get')
55-
->willReturnMap([
56-
['user1', $user1],
57-
['user2', $user2],
58-
['user3', $user3]
59-
]);
49+
->willReturnCallback(fn (string $userId, array $excludedBackend) => match ($userId) {
50+
'user1' => $user1,
51+
'user2' => $user2,
52+
'user3' => $user3,
53+
});
6054
return $userManager;
6155
}
6256

tests/lib/Repair/CleanTagsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public function testRun() {
103103
$this->userManager->expects($this->exactly(2))
104104
->method('userExists')
105105
->willReturnMap([
106-
['userExists', true],
107-
['TestRepairCleanTags', false],
106+
['userExists', [], true],
107+
['TestRepairCleanTags', [], false],
108108
]);
109109

110110
self::invokePrivate($this->repair, 'deleteOrphanTags', [$this->outputMock]);

tests/lib/Share20/ManagerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,8 +986,8 @@ public function testGeneralChecks($share, $exceptionMessage, $exception) {
986986
$thrown = null;
987987

988988
$this->userManager->method('userExists')->willReturnMap([
989-
['user0', true],
990-
['user1', true],
989+
['user0', [], true],
990+
['user1', [], true],
991991
]);
992992

993993
$this->groupManager->method('groupExists')->willReturnMap([
@@ -1030,8 +1030,8 @@ public function testGeneralCheckShareRoot() {
10301030
$thrown = null;
10311031

10321032
$this->userManager->method('userExists')->willReturnMap([
1033-
['user0', true],
1034-
['user1', true],
1033+
['user0', [], true],
1034+
['user1', [], true],
10351035
]);
10361036

10371037
$userFolder = $this->createMock(Folder::class);

0 commit comments

Comments
 (0)