upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

chore(tests): Adapt tests to the countUsers refactor

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-01-14 16:34:15 +01:00
parent 17887d7e74
commit db94aeb96e
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 15 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
apps/updatenotification/tests/Settings/AdminTest.php
View file

@ -8,7 +8,6 @@ declare(strict_types=1);
*/
namespace OCA\UpdateNotification\Tests\Settings;
use OC\User\Backend;
use OCA\UpdateNotification\Settings\Admin;
use OCA\UpdateNotification\UpdateChecker;
use OCP\AppFramework\Http\TemplateResponse;
@ -22,8 +21,6 @@ use OCP\IUserManager;
use OCP\L10N\IFactory;
use OCP\L10N\ILanguageIterator;
use OCP\Support\Subscription\IRegistry;
use OCP\User\Backend\ICountUsersBackend;
use OCP\UserInterface;
use OCP\Util;
use Psr\Log\LoggerInterface;
use Test\TestCase;
@ -81,42 +78,10 @@ class AdminTest extends TestCase {
}
public function testGetFormWithUpdate(): void {
$backend1 = $this->createMock(CountUsersBackend::class);
$backend2 = $this->createMock(CountUsersBackend::class);
$backend3 = $this->createMock(CountUsersBackend::class);
$backend1
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(false);
$backend2
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(true);
$backend3
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(true);
$backend1
->expects($this->never())
->method('countUsers');
$backend2
->expects($this->once())
->method('countUsers')
->with()
->willReturn(false);
$backend3
->expects($this->once())
->method('countUsers')
->with()
->willReturn(5);
$this->userManager
->expects($this->once())
->method('getBackends')
->with()
->willReturn([$backend1, $backend2, $backend3]);
->method('countUsersTotal')
->willReturn(5);
$channels = [
'daily',
'beta',
@ -207,42 +172,10 @@ class AdminTest extends TestCase {
}
public function testGetFormWithUpdateAndChangedUpdateServer(): void {
$backend1 = $this->createMock(CountUsersBackend::class);
$backend2 = $this->createMock(CountUsersBackend::class);
$backend3 = $this->createMock(CountUsersBackend::class);
$backend1
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(false);
$backend2
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(true);
$backend3
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(true);
$backend1
->expects($this->never())
->method('countUsers');
$backend2
->expects($this->once())
->method('countUsers')
->with()
->willReturn(false);
$backend3
->expects($this->once())
->method('countUsers')
->with()
->willReturn(5);
$this->userManager
->expects($this->once())
->method('getBackends')
->with()
->willReturn([$backend1, $backend2, $backend3]);
->method('countUsersTotal')
->willReturn(5);
$channels = [
'daily',
'beta',
@ -334,42 +267,10 @@ class AdminTest extends TestCase {
}
public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
$backend1 = $this->createMock(CountUsersBackend::class);
$backend2 = $this->createMock(CountUsersBackend::class);
$backend3 = $this->createMock(CountUsersBackend::class);
$backend1
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(false);
$backend2
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(true);
$backend3
->expects($this->once())
->method('implementsActions')
->with(Backend::COUNT_USERS)
->willReturn(true);
$backend1
->expects($this->never())
->method('countUsers');
$backend2
->expects($this->once())
->method('countUsers')
->with()
->willReturn(false);
$backend3
->expects($this->once())
->method('countUsers')
->with()
->willReturn(5);
$this->userManager
->expects($this->once())
->method('getBackends')
->with()
->willReturn([$backend1, $backend2, $backend3]);
->method('countUsersTotal')
->willReturn(5);
$channels = [
'daily',
'beta',
@ -543,7 +444,3 @@ class AdminTest extends TestCase {
$this->assertSame($expectation, $result);
}
}
abstract class CountUsersBackend implements UserInterface, ICountUsersBackend {
}

41
tests/lib/Support/Subscription/RegistryTest.php
View file

@ -8,7 +8,6 @@
namespace Test\Support\Subscription;
use OC\Support\Subscription\Registry;
use OC\User\Database;
use OCP\IConfig;
use OCP\IGroup;
use OCP\IGroupManager;
@ -17,33 +16,19 @@ use OCP\IUserManager;
use OCP\Notification\IManager;
use OCP\Support\Subscription\ISubscription;
use OCP\Support\Subscription\ISupportedApps;
use OCP\User\Backend\ICountUsersBackend;
use OCP\UserInterface;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\TestCase;
class RegistryTest extends TestCase {
/** @var Registry */
private $registry;
private Registry $registry;
/** @var MockObject|IConfig */
private $config;
/** @var MockObject|IServerContainer */
private $serverContainer;
/** @var MockObject|IUserManager */
private $userManager;
/** @var MockObject|IGroupManager */
private $groupManager;
/** @var MockObject|LoggerInterface */
private $logger;
/** @var MockObject|IManager */
private $notificationManager;
private MockObject&IConfig $config;
private MockObject&IServerContainer $serverContainer;
private MockObject&IUserManager $userManager;
private MockObject&IGroupManager $groupManager;
private MockObject&LoggerInterface $logger;
private MockObject&IManager $notificationManager;
protected function setUp(): void {
parent::setUp();
@ -198,17 +183,9 @@ class RegistryTest extends TestCase {
->method('getUsersForUserValue')
->with('core', 'enabled', 'false')
->willReturn(array_fill(0, $disabledUsers, ''));
/* @var UserInterface|ICountUsersBackend|\PHPUnit\Framework\MockObject\MockObject $dummyBackend */
$dummyBackend = $this->createMock(Database::class);
$dummyBackend->expects($this->once())
->method('implementsActions')
->willReturn(true);
$dummyBackend->expects($this->once())
->method('countUsers')
->willReturn($userCount);
$this->userManager->expects($this->once())
->method('getBackends')
->willReturn([$dummyBackend]);
->method('countUsersTotal')
->willReturn($userCount);
if ($expectedResult) {
$dummyGroup = $this->createMock(IGroup::class);