aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/Notification
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/Notification')
-rw-r--r--tests/lib/Notification/ActionTest.php67
-rw-r--r--tests/lib/Notification/DummyApp.php20
-rw-r--r--tests/lib/Notification/DummyNotifier.php20
-rw-r--r--tests/lib/Notification/ManagerTest.php111
-rw-r--r--tests/lib/Notification/NotificationTest.php253
5 files changed, 197 insertions, 274 deletions
diff --git a/tests/lib/Notification/ActionTest.php b/tests/lib/Notification/ActionTest.php
index 6016760c24f..252819f1e29 100644
--- a/tests/lib/Notification/ActionTest.php
+++ b/tests/lib/Notification/ActionTest.php
@@ -1,22 +1,9 @@
<?php
+
/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Test\Notification;
@@ -34,7 +21,7 @@ class ActionTest extends TestCase {
$this->action = new Action();
}
- public function dataSetLabel() {
+ public static function dataSetLabel(): array {
return [
['test1'],
[str_repeat('a', 1)],
@@ -43,16 +30,16 @@ class ActionTest extends TestCase {
}
/**
- * @dataProvider dataSetLabel
* @param string $label
*/
- public function testSetLabel($label) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetLabel')]
+ public function testSetLabel($label): void {
$this->assertSame('', $this->action->getLabel());
$this->assertSame($this->action, $this->action->setLabel($label));
$this->assertSame($label, $this->action->getLabel());
}
- public function dataSetLabelInvalid() {
+ public static function dataSetLabelInvalid(): array {
return [
[''],
[str_repeat('a', 33)],
@@ -60,17 +47,17 @@ class ActionTest extends TestCase {
}
/**
- * @dataProvider dataSetLabelInvalid
* @param mixed $label
*
*/
- public function testSetLabelInvalid($label) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetLabelInvalid')]
+ public function testSetLabelInvalid($label): void {
$this->expectException(\InvalidArgumentException::class);
$this->action->setLabel($label);
}
- public function dataSetParsedLabel() {
+ public static function dataSetParsedLabel(): array {
return [
['test1'],
[str_repeat('a', 1)],
@@ -79,33 +66,33 @@ class ActionTest extends TestCase {
}
/**
- * @dataProvider dataSetParsedLabel
* @param string $label
*/
- public function testSetParsedLabel($label) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetParsedLabel')]
+ public function testSetParsedLabel($label): void {
$this->assertSame('', $this->action->getParsedLabel());
$this->assertSame($this->action, $this->action->setParsedLabel($label));
$this->assertSame($label, $this->action->getParsedLabel());
}
- public function dataSetParsedLabelInvalid() {
+ public static function dataSetParsedLabelInvalid(): array {
return [
[''],
];
}
/**
- * @dataProvider dataSetParsedLabelInvalid
* @param mixed $label
*
*/
- public function testSetParsedLabelInvalid($label) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetParsedLabelInvalid')]
+ public function testSetParsedLabelInvalid($label): void {
$this->expectException(\InvalidArgumentException::class);
$this->action->setParsedLabel($label);
}
- public function dataSetLink() {
+ public static function dataSetLink(): array {
return [
['test1', 'GET'],
['test2', 'POST'],
@@ -115,18 +102,18 @@ class ActionTest extends TestCase {
}
/**
- * @dataProvider dataSetLink
* @param string $link
* @param string $type
*/
- public function testSetLink($link, $type) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetLink')]
+ public function testSetLink($link, $type): void {
$this->assertSame('', $this->action->getLink());
$this->assertSame($this->action, $this->action->setLink($link, $type));
$this->assertSame($link, $this->action->getLink());
$this->assertSame($type, $this->action->getRequestType());
}
- public function dataSetLinkInvalid() {
+ public static function dataSetLinkInvalid(): array {
return [
// Invalid link
['', 'GET'],
@@ -138,18 +125,18 @@ class ActionTest extends TestCase {
}
/**
- * @dataProvider dataSetLinkInvalid
* @param mixed $link
* @param mixed $type
*
*/
- public function testSetLinkInvalid($link, $type) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetLinkInvalid')]
+ public function testSetLinkInvalid($link, $type): void {
$this->expectException(\InvalidArgumentException::class);
$this->action->setLink($link, $type);
}
- public function dataSetPrimary() {
+ public static function dataSetPrimary(): array {
return [
[true],
[false],
@@ -157,16 +144,16 @@ class ActionTest extends TestCase {
}
/**
- * @dataProvider dataSetPrimary
* @param bool $primary
*/
- public function testSetPrimary($primary) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetPrimary')]
+ public function testSetPrimary($primary): void {
$this->assertSame(false, $this->action->isPrimary());
$this->assertSame($this->action, $this->action->setPrimary($primary));
$this->assertSame($primary, $this->action->isPrimary());
}
- public function testIsValid() {
+ public function testIsValid(): void {
$this->assertFalse($this->action->isValid());
$this->assertFalse($this->action->isValidParsed());
$this->action->setLabel('label');
@@ -177,7 +164,7 @@ class ActionTest extends TestCase {
$this->assertFalse($this->action->isValidParsed());
}
- public function testIsValidParsed() {
+ public function testIsValidParsed(): void {
$this->assertFalse($this->action->isValid());
$this->assertFalse($this->action->isValidParsed());
$this->action->setParsedLabel('label');
diff --git a/tests/lib/Notification/DummyApp.php b/tests/lib/Notification/DummyApp.php
index b1281f6b7a0..7cd99f13fd6 100644
--- a/tests/lib/Notification/DummyApp.php
+++ b/tests/lib/Notification/DummyApp.php
@@ -2,23 +2,8 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\Notification;
@@ -27,7 +12,6 @@ use OCP\Notification\IApp;
use OCP\Notification\INotification;
class DummyApp implements IApp {
-
/**
* @param INotification $notification
* @throws \InvalidArgumentException When the notification is not valid
diff --git a/tests/lib/Notification/DummyNotifier.php b/tests/lib/Notification/DummyNotifier.php
index 92c1ddfb310..c536c8483f2 100644
--- a/tests/lib/Notification/DummyNotifier.php
+++ b/tests/lib/Notification/DummyNotifier.php
@@ -2,23 +2,8 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\Notification;
@@ -28,7 +13,6 @@ use OCP\Notification\INotification;
use OCP\Notification\INotifier;
class DummyNotifier implements INotifier {
-
/**
* Identifier of the notifier, only use [a-z0-9_]
*
diff --git a/tests/lib/Notification/ManagerTest.php b/tests/lib/Notification/ManagerTest.php
index 400ae3a53ef..cbd76989d24 100644
--- a/tests/lib/Notification/ManagerTest.php
+++ b/tests/lib/Notification/ManagerTest.php
@@ -2,23 +2,9 @@
declare(strict_types=1);
/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Test\Notification;
@@ -27,12 +13,12 @@ use OC\AppFramework\Bootstrap\Coordinator;
use OC\AppFramework\Bootstrap\RegistrationContext;
use OC\AppFramework\Bootstrap\ServiceRegistration;
use OC\Notification\Manager;
-use OCP\AppFramework\Utility\ITimeFactory;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IUserManager;
use OCP\Notification\IManager;
use OCP\Notification\INotification;
+use OCP\RichObjectStrings\IRichTextFormatter;
use OCP\RichObjectStrings\IValidator;
use OCP\Support\Subscription\IRegistry;
use PHPUnit\Framework\MockObject\MockObject;
@@ -43,16 +29,14 @@ class ManagerTest extends TestCase {
/** @var IManager */
protected $manager;
- /** @var IValidator|MockObject */
- protected $validator;
+ protected IValidator&MockObject $validator;
+ protected IRichTextFormatter&MockObject $richTextFormatter;
/** @var IUserManager|MockObject */
protected $userManager;
/** @var ICacheFactory|MockObject */
protected $cacheFactory;
/** @var ICache|MockObject */
protected $cache;
- /** @var ITimeFactory|MockObject */
- protected $timeFactory;
/** @var IRegistry|MockObject */
protected $subscriptionRegistry;
/** @var LoggerInterface|MockObject */
@@ -66,9 +50,9 @@ class ManagerTest extends TestCase {
parent::setUp();
$this->validator = $this->createMock(IValidator::class);
+ $this->richTextFormatter = $this->createMock(IRichTextFormatter::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->cache = $this->createMock(ICache::class);
- $this->timeFactory = $this->createMock(ITimeFactory::class);
$this->subscriptionRegistry = $this->createMock(IRegistry::class);
$this->logger = $this->createMock(LoggerInterface::class);
@@ -82,10 +66,18 @@ class ManagerTest extends TestCase {
$this->coordinator->method('getRegistrationContext')
->willReturn($this->registrationContext);
- $this->manager = new Manager($this->validator, $this->userManager, $this->cacheFactory, $this->timeFactory, $this->subscriptionRegistry, $this->logger, $this->coordinator);
+ $this->manager = new Manager(
+ $this->validator,
+ $this->userManager,
+ $this->cacheFactory,
+ $this->subscriptionRegistry,
+ $this->logger,
+ $this->coordinator,
+ $this->richTextFormatter,
+ );
}
- public function testRegisterApp() {
+ public function testRegisterApp(): void {
$this->assertEquals([], self::invokePrivate($this->manager, 'getApps'));
$this->manager->registerApp(DummyApp::class);
@@ -98,7 +90,7 @@ class ManagerTest extends TestCase {
$this->assertCount(2, self::invokePrivate($this->manager, 'getApps'));
}
- public function testRegisterAppInvalid() {
+ public function testRegisterAppInvalid(): void {
$this->manager->registerApp(DummyNotifier::class);
$this->logger->expects($this->once())
@@ -106,7 +98,7 @@ class ManagerTest extends TestCase {
self::invokePrivate($this->manager, 'getApps');
}
- public function testRegisterNotifier() {
+ public function testRegisterNotifier(): void {
$this->assertEquals([], self::invokePrivate($this->manager, 'getNotifiers'));
$this->manager->registerNotifierService(DummyNotifier::class);
@@ -119,7 +111,7 @@ class ManagerTest extends TestCase {
$this->assertCount(2, self::invokePrivate($this->manager, 'getNotifiers'));
}
- public function testRegisterNotifierBootstrap() {
+ public function testRegisterNotifierBootstrap(): void {
$this->registrationContext->method('getNotifierServices')
->willReturn([
new ServiceRegistration('app', DummyNotifier::class),
@@ -129,7 +121,7 @@ class ManagerTest extends TestCase {
$this->assertCount(1, self::invokePrivate($this->manager, 'getNotifiers'));
}
- public function testRegisterNotifierInvalid() {
+ public function testRegisterNotifierInvalid(): void {
$this->manager->registerNotifierService(DummyApp::class);
$this->logger->expects($this->once())
@@ -137,13 +129,13 @@ class ManagerTest extends TestCase {
self::invokePrivate($this->manager, 'getNotifiers');
}
- public function testCreateNotification() {
+ public function testCreateNotification(): void {
$action = $this->manager->createNotification();
- $this->assertInstanceOf('OCP\Notification\INotification', $action);
+ $this->assertInstanceOf(INotification::class, $action);
}
- public function testNotify() {
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ public function testNotify(): void {
+ /** @var INotification|MockObject $notification */
$notification = $this->getMockBuilder(INotification::class)
->disableOriginalConstructor()
->getMock();
@@ -156,12 +148,12 @@ class ManagerTest extends TestCase {
$this->validator,
$this->userManager,
$this->cacheFactory,
- $this->timeFactory,
$this->subscriptionRegistry,
$this->logger,
$this->coordinator,
+ $this->richTextFormatter,
])
- ->setMethods(['getApps'])
+ ->onlyMethods(['getApps'])
->getMock();
$manager->expects($this->once())
@@ -172,10 +164,10 @@ class ManagerTest extends TestCase {
}
- public function testNotifyInvalid() {
+ public function testNotifyInvalid(): void {
$this->expectException(\InvalidArgumentException::class);
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ /** @var INotification|MockObject $notification */
$notification = $this->getMockBuilder(INotification::class)
->disableOriginalConstructor()
->getMock();
@@ -188,12 +180,12 @@ class ManagerTest extends TestCase {
$this->validator,
$this->userManager,
$this->cacheFactory,
- $this->timeFactory,
$this->subscriptionRegistry,
$this->logger,
$this->coordinator,
+ $this->richTextFormatter,
])
- ->setMethods(['getApps'])
+ ->onlyMethods(['getApps'])
->getMock();
$manager->expects($this->never())
@@ -202,8 +194,8 @@ class ManagerTest extends TestCase {
$manager->notify($notification);
}
- public function testMarkProcessed() {
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ public function testMarkProcessed(): void {
+ /** @var INotification|MockObject $notification */
$notification = $this->getMockBuilder(INotification::class)
->disableOriginalConstructor()
->getMock();
@@ -213,12 +205,12 @@ class ManagerTest extends TestCase {
$this->validator,
$this->userManager,
$this->cacheFactory,
- $this->timeFactory,
$this->subscriptionRegistry,
$this->logger,
$this->coordinator,
+ $this->richTextFormatter,
])
- ->setMethods(['getApps'])
+ ->onlyMethods(['getApps'])
->getMock();
$manager->expects($this->once())
@@ -228,8 +220,8 @@ class ManagerTest extends TestCase {
$manager->markProcessed($notification);
}
- public function testGetCount() {
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ public function testGetCount(): void {
+ /** @var INotification|MockObject $notification */
$notification = $this->getMockBuilder(INotification::class)
->disableOriginalConstructor()
->getMock();
@@ -239,12 +231,12 @@ class ManagerTest extends TestCase {
$this->validator,
$this->userManager,
$this->cacheFactory,
- $this->timeFactory,
$this->subscriptionRegistry,
$this->logger,
$this->coordinator,
+ $this->richTextFormatter,
])
- ->setMethods(['getApps'])
+ ->onlyMethods(['getApps'])
->getMock();
$manager->expects($this->once())
@@ -254,33 +246,22 @@ class ManagerTest extends TestCase {
$manager->getCount($notification);
}
- public function dataIsFairUseOfFreePushService() {
+ public static function dataIsFairUseOfFreePushService(): array {
return [
- // Before 1st March
- [1646089199, true, 4999, true],
- [1646089199, true, 5000, true],
- [1646089199, false, 4999, true],
- [1646089199, false, 5000, true],
-
- // After 1st March
- [1646089200, true, 4999, true],
- [1646089200, true, 5000, true],
- [1646089200, false, 4999, true],
- [1646089200, false, 5000, false],
+ [true, 999, true],
+ [true, 1000, true],
+ [false, 999, true],
+ [false, 1000, false],
];
}
/**
- * @dataProvider dataIsFairUseOfFreePushService
- * @param int $time
* @param bool $hasValidSubscription
* @param int $userCount
* @param bool $isFair
*/
- public function testIsFairUseOfFreePushService(int $time, bool $hasValidSubscription, int $userCount, bool $isFair): void {
- $this->timeFactory->method('getTime')
- ->willReturn($time);
-
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataIsFairUseOfFreePushService')]
+ public function testIsFairUseOfFreePushService(bool $hasValidSubscription, int $userCount, bool $isFair): void {
$this->subscriptionRegistry->method('delegateHasValidSubscription')
->willReturn($hasValidSubscription);
diff --git a/tests/lib/Notification/NotificationTest.php b/tests/lib/Notification/NotificationTest.php
index 1479e8841a2..cebe9d51021 100644
--- a/tests/lib/Notification/NotificationTest.php
+++ b/tests/lib/Notification/NotificationTest.php
@@ -2,23 +2,9 @@
declare(strict_types = 1);
/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace Test\Notification;
@@ -26,22 +12,25 @@ namespace Test\Notification;
use OC\Notification\Notification;
use OCP\Notification\IAction;
use OCP\Notification\INotification;
+use OCP\RichObjectStrings\IRichTextFormatter;
use OCP\RichObjectStrings\IValidator;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class NotificationTest extends TestCase {
/** @var INotification */
protected $notification;
- /** @var IValidator|\PHPUnit\Framework\MockObject\MockObject */
- protected $validator;
+ protected IValidator&MockObject $validator;
+ protected IRichTextFormatter&MockObject $richTextFormatter;
protected function setUp(): void {
parent::setUp();
$this->validator = $this->createMock(IValidator::class);
- $this->notification = new Notification($this->validator);
+ $this->richTextFormatter = $this->createMock(IRichTextFormatter::class);
+ $this->notification = new Notification($this->validator, $this->richTextFormatter);
}
- protected function dataValidString($maxLength) {
+ protected static function dataValidString($maxLength): array {
$dataSets = [
['test1'],
['1564'],
@@ -53,7 +42,7 @@ class NotificationTest extends TestCase {
return $dataSets;
}
- protected function dataInvalidString($maxLength) {
+ protected static function dataInvalidString($maxLength): array {
$dataSets = [
['']
];
@@ -63,66 +52,66 @@ class NotificationTest extends TestCase {
return $dataSets;
}
- public function dataSetApp() {
- return $this->dataValidString(32);
+ public static function dataSetApp(): array {
+ return self::dataValidString(32);
}
/**
- * @dataProvider dataSetApp
* @param string $app
*/
- public function testSetApp($app) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetApp')]
+ public function testSetApp($app): void {
$this->assertSame('', $this->notification->getApp());
$this->assertSame($this->notification, $this->notification->setApp($app));
$this->assertSame($app, $this->notification->getApp());
}
- public function dataSetAppInvalid() {
- return $this->dataInvalidString(32);
+ public static function dataSetAppInvalid(): array {
+ return self::dataInvalidString(32);
}
/**
- * @dataProvider dataSetAppInvalid
* @param mixed $app
*
*/
- public function testSetAppInvalid($app) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetAppInvalid')]
+ public function testSetAppInvalid($app): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setApp($app);
}
- public function dataSetUser() {
- return $this->dataValidString(64);
+ public static function dataSetUser(): array {
+ return self::dataValidString(64);
}
/**
- * @dataProvider dataSetUser
* @param string $user
*/
- public function testSetUser($user) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetUser')]
+ public function testSetUser($user): void {
$this->assertSame('', $this->notification->getUser());
$this->assertSame($this->notification, $this->notification->setUser($user));
$this->assertSame($user, $this->notification->getUser());
}
- public function dataSetUserInvalid() {
- return $this->dataInvalidString(64);
+ public static function dataSetUserInvalid(): array {
+ return self::dataInvalidString(64);
}
/**
- * @dataProvider dataSetUserInvalid
* @param mixed $user
*
*/
- public function testSetUserInvalid($user) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetUserInvalid')]
+ public function testSetUserInvalid($user): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setUser($user);
}
- public function dataSetDateTime() {
+ public static function dataSetDateTime(): array {
$past = new \DateTime();
$past->sub(new \DateInterval('P1Y'));
$current = new \DateTime();
@@ -137,16 +126,16 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataSetDateTime
* @param \DateTime $dateTime
*/
- public function testSetDateTime(\DateTime $dateTime) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetDateTime')]
+ public function testSetDateTime(\DateTime $dateTime): void {
$this->assertSame(0, $this->notification->getDateTime()->getTimestamp());
$this->assertSame($this->notification, $this->notification->setDateTime($dateTime));
$this->assertSame($dateTime, $this->notification->getDateTime());
}
- public function dataSetDateTimeZero() {
+ public static function dataSetDateTimeZero(): array {
$nineTeenSeventy = new \DateTime();
$nineTeenSeventy->setTimestamp(0);
return [
@@ -155,18 +144,17 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataSetDateTimeZero
* @param \DateTime $dateTime
- *
* @expectedMessage 'The given date time is invalid'
*/
- public function testSetDateTimeZero($dateTime) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetDateTimeZero')]
+ public function testSetDateTimeZero($dateTime): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setDateTime($dateTime);
}
- public function dataSetObject() {
+ public static function dataSetObject(): array {
return [
['a', '21'],
[str_repeat('a', 64), '42'],
@@ -174,11 +162,11 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataSetObject
* @param string $type
* @param string $id
*/
- public function testSetObject($type, $id) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetObject')]
+ public function testSetObject($type, $id): void {
$this->assertSame('', $this->notification->getObjectType());
$this->assertSame('', $this->notification->getObjectId());
$this->assertSame($this->notification, $this->notification->setObject($type, $id));
@@ -186,11 +174,11 @@ class NotificationTest extends TestCase {
$this->assertSame($id, $this->notification->getObjectId());
}
- public function dataSetObjectTypeInvalid() {
- return $this->dataInvalidString(64);
+ public static function dataSetObjectTypeInvalid(): array {
+ return self::dataInvalidString(64);
}
- public function dataSetObjectIdInvalid() {
+ public static function dataSetObjectIdInvalid(): array {
return [
[''],
[str_repeat('a', 64 + 1)],
@@ -198,18 +186,17 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataSetObjectIdInvalid
* @param mixed $id
- *
* @expectedMessage 'The given object id is invalid'
*/
- public function testSetObjectIdInvalid($id) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetObjectIdInvalid')]
+ public function testSetObjectIdInvalid($id): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setObject('object', $id);
}
- public function dataSetSubject() {
+ public static function dataSetSubject(): array {
return [
['a', []],
[str_repeat('a', 64), [str_repeat('a', 160)]],
@@ -218,11 +205,11 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataSetSubject
* @param string $subject
* @param array $parameters
*/
- public function testSetSubject($subject, $parameters) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetSubject')]
+ public function testSetSubject($subject, $parameters): void {
$this->assertSame('', $this->notification->getSubject());
$this->assertSame([], $this->notification->getSubjectParameters());
$this->assertSame($this->notification, $this->notification->setSubject($subject, $parameters));
@@ -230,51 +217,51 @@ class NotificationTest extends TestCase {
$this->assertSame($parameters, $this->notification->getSubjectParameters());
}
- public function dataSetSubjectInvalidSubject() {
- return $this->dataInvalidString(64);
+ public static function dataSetSubjectInvalidSubject(): array {
+ return self::dataInvalidString(64);
}
/**
- * @dataProvider dataSetSubjectInvalidSubject
* @param mixed $subject
*
*/
- public function testSetSubjectInvalidSubject($subject) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetSubjectInvalidSubject')]
+ public function testSetSubjectInvalidSubject($subject): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setSubject($subject, []);
}
- public function dataSetParsedSubject() {
- return $this->dataValidString(false);
+ public static function dataSetParsedSubject(): array {
+ return self::dataValidString(false);
}
/**
- * @dataProvider dataSetParsedSubject
* @param string $subject
*/
- public function testSetParsedSubject($subject) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetParsedSubject')]
+ public function testSetParsedSubject($subject): void {
$this->assertSame('', $this->notification->getParsedSubject());
$this->assertSame($this->notification, $this->notification->setParsedSubject($subject));
$this->assertSame($subject, $this->notification->getParsedSubject());
}
- public function dataSetParsedSubjectInvalid() {
- return $this->dataInvalidString(false);
+ public static function dataSetParsedSubjectInvalid(): array {
+ return self::dataInvalidString(false);
}
/**
- * @dataProvider dataSetParsedSubjectInvalid
* @param mixed $subject
*
*/
- public function testSetParsedSubjectInvalid($subject) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetParsedSubjectInvalid')]
+ public function testSetParsedSubjectInvalid($subject): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setParsedSubject($subject);
}
- public function dataSetMessage() {
+ public static function dataSetMessage(): array {
return [
['a', []],
[str_repeat('a', 64), [str_repeat('a', 160)]],
@@ -283,11 +270,11 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataSetMessage
* @param string $message
* @param array $parameters
*/
- public function testSetMessage($message, $parameters) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetMessage')]
+ public function testSetMessage($message, $parameters): void {
$this->assertSame('', $this->notification->getMessage());
$this->assertSame([], $this->notification->getMessageParameters());
$this->assertSame($this->notification, $this->notification->setMessage($message, $parameters));
@@ -295,115 +282,115 @@ class NotificationTest extends TestCase {
$this->assertSame($parameters, $this->notification->getMessageParameters());
}
- public function dataSetMessageInvalidMessage() {
- return $this->dataInvalidString(64);
+ public static function dataSetMessageInvalidMessage(): array {
+ return self::dataInvalidString(64);
}
/**
- * @dataProvider dataSetMessageInvalidMessage
* @param mixed $message
*
*/
- public function testSetMessageInvalidMessage($message) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetMessageInvalidMessage')]
+ public function testSetMessageInvalidMessage($message): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setMessage($message, []);
}
- public function dataSetParsedMessage() {
- return $this->dataValidString(false);
+ public static function dataSetParsedMessage(): array {
+ return self::dataValidString(false);
}
/**
- * @dataProvider dataSetParsedMessage
* @param string $message
*/
- public function testSetParsedMessage($message) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetParsedMessage')]
+ public function testSetParsedMessage($message): void {
$this->assertSame('', $this->notification->getParsedMessage());
$this->assertSame($this->notification, $this->notification->setParsedMessage($message));
$this->assertSame($message, $this->notification->getParsedMessage());
}
- public function dataSetParsedMessageInvalid() {
- return $this->dataInvalidString(false);
+ public static function dataSetParsedMessageInvalid(): array {
+ return self::dataInvalidString(false);
}
/**
- * @dataProvider dataSetParsedMessageInvalid
* @param mixed $message
*
*/
- public function testSetParsedMessageInvalid($message) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetParsedMessageInvalid')]
+ public function testSetParsedMessageInvalid($message): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setParsedMessage($message);
}
- public function dataSetLink() {
- return $this->dataValidString(4000);
+ public static function dataSetLink(): array {
+ return self::dataValidString(4000);
}
/**
- * @dataProvider dataSetLink
* @param string $link
*/
- public function testSetLink($link) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetLink')]
+ public function testSetLink($link): void {
$this->assertSame('', $this->notification->getLink());
$this->assertSame($this->notification, $this->notification->setLink($link));
$this->assertSame($link, $this->notification->getLink());
}
- public function dataSetLinkInvalid() {
- return $this->dataInvalidString(4000);
+ public static function dataSetLinkInvalid(): array {
+ return self::dataInvalidString(4000);
}
/**
- * @dataProvider dataSetLinkInvalid
* @param mixed $link
*
*/
- public function testSetLinkInvalid($link) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetLinkInvalid')]
+ public function testSetLinkInvalid($link): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setLink($link);
}
- public function dataSetIcon() {
- return $this->dataValidString(4000);
+ public static function dataSetIcon(): array {
+ return self::dataValidString(4000);
}
/**
- * @dataProvider dataSetIcon
* @param string $icon
*/
- public function testSetIcon($icon) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetIcon')]
+ public function testSetIcon($icon): void {
$this->assertSame('', $this->notification->getIcon());
$this->assertSame($this->notification, $this->notification->setIcon($icon));
$this->assertSame($icon, $this->notification->getIcon());
}
- public function dataSetIconInvalid() {
- return $this->dataInvalidString(4000);
+ public static function dataSetIconInvalid(): array {
+ return self::dataInvalidString(4000);
}
/**
- * @dataProvider dataSetIconInvalid
* @param mixed $icon
*
*/
- public function testSetIconInvalid($icon) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataSetIconInvalid')]
+ public function testSetIconInvalid($icon): void {
$this->expectException(\InvalidArgumentException::class);
$this->notification->setIcon($icon);
}
- public function testCreateAction() {
+ public function testCreateAction(): void {
$action = $this->notification->createAction();
$this->assertInstanceOf(IAction::class, $action);
}
- public function testAddAction() {
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ public function testAddAction(): void {
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action = $this->createMock(IAction::class);
$action->expects($this->once())
->method('isValid')
@@ -418,10 +405,10 @@ class NotificationTest extends TestCase {
}
- public function testAddActionInvalid() {
+ public function testAddActionInvalid(): void {
$this->expectException(\InvalidArgumentException::class);
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action = $this->createMock(IAction::class);
$action->expects($this->once())
->method('isValid')
@@ -432,8 +419,8 @@ class NotificationTest extends TestCase {
$this->notification->addAction($action);
}
- public function testAddActionSecondPrimary() {
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ public function testAddActionSecondPrimary(): void {
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action = $this->createMock(IAction::class);
$action->expects($this->exactly(2))
->method('isValid')
@@ -448,8 +435,8 @@ class NotificationTest extends TestCase {
$this->notification->addAction($action);
}
- public function testAddParsedAction() {
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ public function testAddParsedAction(): void {
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action = $this->createMock(IAction::class);
$action->expects($this->once())
->method('isValidParsed')
@@ -464,10 +451,10 @@ class NotificationTest extends TestCase {
}
- public function testAddParsedActionInvalid() {
+ public function testAddParsedActionInvalid(): void {
$this->expectException(\InvalidArgumentException::class);
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action = $this->createMock(IAction::class);
$action->expects($this->once())
->method('isValidParsed')
@@ -478,8 +465,8 @@ class NotificationTest extends TestCase {
$this->notification->addParsedAction($action);
}
- public function testAddActionSecondParsedPrimary() {
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ public function testAddActionSecondParsedPrimary(): void {
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action = $this->createMock(IAction::class);
$action->expects($this->exactly(2))
->method('isValidParsed')
@@ -494,8 +481,8 @@ class NotificationTest extends TestCase {
$this->notification->addParsedAction($action);
}
- public function testAddActionParsedPrimaryEnd() {
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ public function testAddActionParsedPrimaryEnd(): void {
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action1 = $this->createMock(IAction::class);
$action1->expects($this->exactly(2))
->method('isValidParsed')
@@ -503,7 +490,7 @@ class NotificationTest extends TestCase {
$action1->expects($this->exactly(2))
->method('isPrimary')
->willReturn(false);
- /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */
+ /** @var IAction|\PHPUnit\Framework\MockObject\MockObject $action */
$action2 = $this->createMock(IAction::class);
$action2->expects($this->once())
->method('isValidParsed')
@@ -519,7 +506,7 @@ class NotificationTest extends TestCase {
$this->assertEquals([$action2, $action1, $action1], $this->notification->getParsedActions());
}
- public function dataIsValid() {
+ public static function dataIsValid(): array {
return [
[false, '', false],
[true, '', false],
@@ -529,21 +516,21 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataIsValid
*
* @param bool $isValidCommon
* @param string $subject
* @param bool $expected
*/
- public function testIsValid($isValidCommon, $subject, $expected) {
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataIsValid')]
+ public function testIsValid($isValidCommon, $subject, $expected): void {
+ /** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
$notification = $this->getMockBuilder(Notification::class)
- ->setMethods([
+ ->onlyMethods([
'isValidCommon',
'getSubject',
'getParsedSubject',
])
- ->setConstructorArgs([$this->validator])
+ ->setConstructorArgs([$this->validator, $this->richTextFormatter])
->getMock();
$notification->expects($this->once())
@@ -562,21 +549,21 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataIsValid
*
* @param bool $isValidCommon
* @param string $subject
* @param bool $expected
*/
- public function testIsParsedValid($isValidCommon, $subject, $expected) {
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataIsValid')]
+ public function testIsParsedValid($isValidCommon, $subject, $expected): void {
+ /** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
$notification = $this->getMockBuilder(Notification::class)
- ->setMethods([
+ ->onlyMethods([
'isValidCommon',
'getParsedSubject',
'getSubject',
])
- ->setConstructorArgs([$this->validator])
+ ->setConstructorArgs([$this->validator, $this->richTextFormatter])
->getMock();
$notification->expects($this->once())
@@ -594,7 +581,7 @@ class NotificationTest extends TestCase {
$this->assertEquals($expected, $notification->isValidParsed());
}
- public function dataIsValidCommon() {
+ public static function dataIsValidCommon(): array {
return [
['', '', 0, '', '', false],
['app', '', 0, '', '', false],
@@ -606,7 +593,6 @@ class NotificationTest extends TestCase {
}
/**
- * @dataProvider dataIsValidCommon
*
* @param string $app
* @param string $user
@@ -615,17 +601,18 @@ class NotificationTest extends TestCase {
* @param string $objectId
* @param bool $expected
*/
- public function testIsValidCommon($app, $user, $timestamp, $objectType, $objectId, $expected) {
- /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataIsValidCommon')]
+ public function testIsValidCommon($app, $user, $timestamp, $objectType, $objectId, $expected): void {
+ /** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */
$notification = $this->getMockBuilder(Notification::class)
- ->setMethods([
+ ->onlyMethods([
'getApp',
'getUser',
'getDateTime',
'getObjectType',
'getObjectId',
])
- ->setConstructorArgs([$this->validator])
+ ->setConstructorArgs([$this->validator, $this->richTextFormatter])
->getMock();
$notification->expects($this->any())
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 23:34:14 +0000