aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/Activity/ManagerTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/Activity/ManagerTest.php')
-rw-r--r--tests/lib/Activity/ManagerTest.php103
1 files changed, 50 insertions, 53 deletions
diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php
index 9a39f21f4e5..c7c30357ec7 100644
--- a/tests/lib/Activity/ManagerTest.php
+++ b/tests/lib/Activity/ManagerTest.php
@@ -1,48 +1,37 @@
<?php
/**
- * @copyright Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
- * @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: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\Activity;
+use OCP\Activity\Exceptions\IncompleteActivityException;
+use OCP\Activity\IConsumer;
+use OCP\Activity\IEvent;
+use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserSession;
+use OCP\RichObjectStrings\IRichTextFormatter;
use OCP\RichObjectStrings\IValidator;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class ManagerTest extends TestCase {
/** @var \OC\Activity\Manager */
private $activityManager;
- /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
- protected $request;
- /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- protected $session;
- /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
- protected $config;
- /** @var IValidator|\PHPUnit\Framework\MockObject\MockObject */
- protected $validator;
+ protected IRequest&MockObject $request;
+ protected IUserSession&MockObject $session;
+ protected IConfig&MockObject $config;
+ protected IValidator&MockObject $validator;
+ protected IRichTextFormatter&MockObject $richTextFormatter;
+ private ITimeFactory&MockObject $time;
protected function setUp(): void {
parent::setUp();
@@ -51,13 +40,17 @@ class ManagerTest extends TestCase {
$this->session = $this->createMock(IUserSession::class);
$this->config = $this->createMock(IConfig::class);
$this->validator = $this->createMock(IValidator::class);
+ $this->richTextFormatter = $this->createMock(IRichTextFormatter::class);
+ $this->time = $this->createMock(ITimeFactory::class);
$this->activityManager = new \OC\Activity\Manager(
$this->request,
$this->session,
$this->config,
$this->validator,
- $this->createMock(IL10N::class)
+ $this->richTextFormatter,
+ $this->createMock(IL10N::class),
+ $this->time,
);
$this->assertSame([], self::invokePrivate($this->activityManager, 'getConsumers'));
@@ -70,14 +63,14 @@ class ManagerTest extends TestCase {
$this->assertNotEmpty(self::invokePrivate($this->activityManager, 'getConsumers'));
}
- public function testGetConsumers() {
+ public function testGetConsumers(): void {
$consumers = self::invokePrivate($this->activityManager, 'getConsumers');
$this->assertNotEmpty($consumers);
}
- public function testGetConsumersInvalidConsumer() {
+ public function testGetConsumersInvalidConsumer(): void {
$this->expectException(\InvalidArgumentException::class);
$this->activityManager->registerConsumer(function () {
@@ -87,7 +80,7 @@ class ManagerTest extends TestCase {
self::invokePrivate($this->activityManager, 'getConsumers');
}
- public function getUserFromTokenThrowInvalidTokenData() {
+ public static function getUserFromTokenThrowInvalidTokenData(): array {
return [
[null, []],
['', []],
@@ -99,19 +92,19 @@ class ManagerTest extends TestCase {
}
/**
- * @dataProvider getUserFromTokenThrowInvalidTokenData
*
* @param string $token
* @param array $users
*/
- public function testGetUserFromTokenThrowInvalidToken($token, $users) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('getUserFromTokenThrowInvalidTokenData')]
+ public function testGetUserFromTokenThrowInvalidToken($token, $users): void {
$this->expectException(\UnexpectedValueException::class);
$this->mockRSSToken($token, $token, $users);
self::invokePrivate($this->activityManager, 'getUserFromToken');
}
- public function getUserFromTokenData() {
+ public static function getUserFromTokenData(): array {
return [
[null, '123456789012345678901234567890', 'user1'],
['user2', null, 'user2'],
@@ -120,13 +113,13 @@ class ManagerTest extends TestCase {
}
/**
- * @dataProvider getUserFromTokenData
*
* @param string $userLoggedIn
* @param string $token
* @param string $expected
*/
- public function testGetUserFromToken($userLoggedIn, $token, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('getUserFromTokenData')]
+ public function testGetUserFromToken($userLoggedIn, $token, $expected): void {
if ($userLoggedIn !== null) {
$this->mockUserSession($userLoggedIn);
}
@@ -166,16 +159,16 @@ class ManagerTest extends TestCase {
}
- public function testPublishExceptionNoApp() {
- $this->expectException(\BadMethodCallException::class);
+ public function testPublishExceptionNoApp(): void {
+ $this->expectException(IncompleteActivityException::class);
$event = $this->activityManager->generateEvent();
$this->activityManager->publish($event);
}
- public function testPublishExceptionNoType() {
- $this->expectException(\BadMethodCallException::class);
+ public function testPublishExceptionNoType(): void {
+ $this->expectException(IncompleteActivityException::class);
$event = $this->activityManager->generateEvent();
$event->setApp('test');
@@ -183,8 +176,8 @@ class ManagerTest extends TestCase {
}
- public function testPublishExceptionNoAffectedUser() {
- $this->expectException(\BadMethodCallException::class);
+ public function testPublishExceptionNoAffectedUser(): void {
+ $this->expectException(IncompleteActivityException::class);
$event = $this->activityManager->generateEvent();
$event->setApp('test')
@@ -193,8 +186,8 @@ class ManagerTest extends TestCase {
}
- public function testPublishExceptionNoSubject() {
- $this->expectException(\BadMethodCallException::class);
+ public function testPublishExceptionNoSubject(): void {
+ $this->expectException(IncompleteActivityException::class);
$event = $this->activityManager->generateEvent();
$event->setApp('test')
@@ -203,7 +196,7 @@ class ManagerTest extends TestCase {
$this->activityManager->publish($event);
}
- public function dataPublish() {
+ public static function dataPublish(): array {
return [
[null, ''],
['test_author', 'test_author'],
@@ -211,11 +204,11 @@ class ManagerTest extends TestCase {
}
/**
- * @dataProvider dataPublish
* @param string|null $author
* @param string $expected
*/
- public function testPublish($author, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataPublish')]
+ public function testPublish($author, $expected): void {
if ($author !== null) {
$authorObject = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor()
@@ -228,6 +221,11 @@ class ManagerTest extends TestCase {
->willReturn($authorObject);
}
+ $time = time();
+ $this->time
+ ->method('getTime')
+ ->willReturn($time);
+
$event = $this->activityManager->generateEvent();
$event->setApp('test')
->setType('test_type')
@@ -241,9 +239,8 @@ class ManagerTest extends TestCase {
$consumer->expects($this->once())
->method('receive')
->with($event)
- ->willReturnCallback(function (\OCP\Activity\IEvent $event) use ($expected) {
- $this->assertLessThanOrEqual(time() + 2, $event->getTimestamp(), 'Timestamp not set correctly');
- $this->assertGreaterThanOrEqual(time() - 2, $event->getTimestamp(), 'Timestamp not set correctly');
+ ->willReturnCallback(function (IEvent $event) use ($expected, $time): void {
+ $this->assertEquals($time, $event->getTimestamp(), 'Timestamp not set correctly');
$this->assertSame($expected, $event->getAuthor(), 'Author name not set correctly');
});
$this->activityManager->registerConsumer(function () use ($consumer) {
@@ -253,7 +250,7 @@ class ManagerTest extends TestCase {
$this->activityManager->publish($event);
}
- public function testPublishAllManually() {
+ public function testPublishAllManually(): void {
$event = $this->activityManager->generateEvent();
$event->setApp('test_app')
->setType('test_type')
@@ -271,7 +268,7 @@ class ManagerTest extends TestCase {
->getMock();
$consumer->expects($this->once())
->method('receive')
- ->willReturnCallback(function (\OCP\Activity\IEvent $event) {
+ ->willReturnCallback(function (IEvent $event): void {
$this->assertSame('test_app', $event->getApp(), 'App not set correctly');
$this->assertSame('test_type', $event->getType(), 'Type not set correctly');
$this->assertSame('test_affected', $event->getAffectedUser(), 'Affected user not set correctly');
@@ -294,7 +291,7 @@ class ManagerTest extends TestCase {
}
}
-class NoOpConsumer implements \OCP\Activity\IConsumer {
- public function receive(\OCP\Activity\IEvent $event) {
+class NoOpConsumer implements IConsumer {
+ public function receive(IEvent $event) {
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 20:54:39 +0000