Skip to content

refactor(updatenotification): remove unused notifier mock branch #64160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor(updatenotification): remove unused notifier mock branch #64160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9112080
refactor(updatenotification): remove unused notifier mock branch
joshtrichards Sep 10, 2026
63645a5
test(updatenotification): use PHPUnit exception expectations
joshtrichards Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 35 additions & 45 deletions apps/updatenotification/tests/Notification/NotifierTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,59 +51,49 @@ protected function setUp(): void {
/**
* @param array $methods
*/
protected function getNotifier(array $methods = []): Notifier|MockObject {
if (empty($methods)) {
return new Notifier(
$this->urlGenerator,
$this->appConfig,
$this->notificationManager,
$this->l10nFactory,
$this->userSession,
$this->groupManager,
$this->appManager,
$this->serverVersion,
);
}
{
return $this->getMockBuilder(Notifier::class)
->setConstructorArgs([
$this->urlGenerator,
$this->appConfig,
$this->notificationManager,
$this->l10nFactory,
$this->userSession,
$this->groupManager,
$this->appManager,
$this->serverVersion,
])
->onlyMethods($methods)
->getMock();
}
protected function getNotifier(): Notifier {
return new Notifier(
$this->urlGenerator,
$this->appConfig,
$this->notificationManager,
$this->l10nFactory,
$this->userSession,
$this->groupManager,
$this->appManager,
$this->serverVersion,
);
}

public static function dataUpdateAlreadyInstalledCheck(): array {
return [
['1.1.0', '1.0.0', false],
['1.1.0', '1.1.0', true],
['1.1.0', '1.2.0', true],
];
public function testUpdateAlreadyInstalledCheckWithOlderInstalledVersion(): void {
$notifier = $this->getNotifier();

$notification = $this->createMock(INotification::class);
$notification->expects($this->once())
->method('getObjectId')
->willReturn('1.1.0');

self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, '1.0.0']);
$this->addToAssertionCount(1);
}

#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'dataUpdateAlreadyInstalledCheck')]
public function testUpdateAlreadyInstalledCheck(string $versionNotification, string $versionInstalled, bool $exception): void {
#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'dataAlreadyInstalledVersions')]
public function testUpdateAlreadyInstalledCheckThrows(string $versionInstalled): void {
$notifier = $this->getNotifier();

$notification = $this->createMock(INotification::class);
$notification->expects($this->once())
->method('getObjectId')
->willReturn($versionNotification);

try {
self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, $versionInstalled]);
$this->assertFalse($exception);
} catch (\Exception $e) {
$this->assertTrue($exception);
$this->assertInstanceOf(AlreadyProcessedException::class, $e);
}
->willReturn('1.1.0');

$this->expectException(AlreadyProcessedException::class);

self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, $versionInstalled]);
}

public static function dataAlreadyInstalledVersions(): array {
return [
['1.1.0'],
['1.2.0'],
];
}
}
Loading