Skip to content

Commit 970122f

Browse files
committed
test: adjust test cases
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent a743a5a commit 970122f

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

apps/settings/tests/Settings/Admin/SharingTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace OCA\Settings\Tests\Settings\Admin;
77

8+
use OC\Share20\Manager;
89
use OCA\Settings\Settings\Admin\Sharing;
910
use OCP\App\IAppManager;
1011
use OCP\AppFramework\Http\TemplateResponse;
@@ -13,7 +14,6 @@
1314
use OCP\IConfig;
1415
use OCP\IL10N;
1516
use OCP\IURLGenerator;
16-
use OCP\Share\IManager;
1717
use PHPUnit\Framework\MockObject\MockObject;
1818
use Test\TestCase;
1919

@@ -24,7 +24,7 @@ class SharingTest extends TestCase {
2424
private $config;
2525
/** @var IL10N&MockObject */
2626
private $l10n;
27-
/** @var IManager|MockObject */
27+
/** @var Manager|MockObject */
2828
private $shareManager;
2929
/** @var IAppManager|MockObject */
3030
private $appManager;
@@ -38,8 +38,8 @@ protected function setUp(): void {
3838
$this->config = $this->getMockBuilder(IConfig::class)->getMock();
3939
$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
4040

41-
/** @var IManager|MockObject */
42-
$this->shareManager = $this->getMockBuilder(IManager::class)->getMock();
41+
/** @var Manager|MockObject */
42+
$this->shareManager = $this->createMock(Manager::class);
4343
/** @var IAppManager|MockObject */
4444
$this->appManager = $this->getMockBuilder(IAppManager::class)->getMock();
4545
/** @var IURLGenerator|MockObject */

tests/lib/Collaboration/Collaborators/UserPluginTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,10 @@ public function testSearch(
456456
->method('getUser')
457457
->willReturn($this->user);
458458

459+
$this->userManager->expects($this->any())
460+
->method('searchDisplayName')
461+
->willReturn($userResponse);
462+
459463
if (!$shareWithGroupOnly) {
460464
if ($shareeEnumerationPhone) {
461465
$this->userManager->expects($this->once())
@@ -766,10 +770,10 @@ public function testSearchEnumerationLimit($search, $userGroups, $matchingUsers,
766770
->willReturnCallback(function ($search) use ($matchingUsers) {
767771
$users = array_filter(
768772
$matchingUsers,
769-
fn ($user) => str_contains(strtolower($user['displayName']), strtolower($search))
773+
fn ($user) => str_contains(strtolower($user['displayName'] ?? $user['uid']), strtolower($search))
770774
);
771775
return array_map(
772-
fn ($user) => $this->getUserMock($user['uid'], $user['displayName']),
776+
fn ($user) => $this->getUserMock($user['uid'], $user['displayName'] ?? $user['uid']),
773777
$users);
774778
});
775779

0 commit comments

Comments
 (0)