nextcloud / server

apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php

Indentation +84 added lines, -84 removed lines

@@ -19,88 +19,88 @@
 use Test\TestCase;
 
 class ProviderTest extends TestCase {
-	private IFactory&MockObject $l10n;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IManager&MockObject $activityManager;
-	private Provider $provider;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IFactory::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->activityManager = $this->createMock(IManager::class);
-
-		$this->provider = new Provider($this->l10n, $this->urlGenerator, $this->activityManager);
-	}
-
-	public function testParseUnrelated(): void {
-		$lang = 'ru';
-		$event = $this->createMock(IEvent::class);
-		$event->expects($this->once())
-			->method('getApp')
-			->willReturn('comments');
-		$this->expectException(UnknownActivityException::class);
-
-		$this->provider->parse($lang, $event);
-	}
-
-	public static function subjectData(): array {
-		return [
-			['codes_generated'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('subjectData')]
-	public function testParse(string $subject): void {
-		$lang = 'ru';
-		$event = $this->createMock(IEvent::class);
-		$l = $this->createMock(IL10N::class);
-
-		$event->expects($this->once())
-			->method('getApp')
-			->willReturn('twofactor_backupcodes');
-		$this->l10n->expects($this->once())
-			->method('get')
-			->with('twofactor_backupcodes', $lang)
-			->willReturn($l);
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->with('core', 'actions/password.svg')
-			->willReturn('path/to/image');
-		$this->urlGenerator->expects($this->once())
-			->method('getAbsoluteURL')
-			->with('path/to/image')
-			->willReturn('absolute/path/to/image');
-		$event->expects($this->once())
-			->method('setIcon')
-			->with('absolute/path/to/image');
-		$event->expects($this->once())
-			->method('getSubject')
-			->willReturn($subject);
-		$event->expects($this->once())
-			->method('setParsedSubject');
-
-		$this->provider->parse($lang, $event);
-	}
-
-	public function testParseInvalidSubject(): void {
-		$lang = 'ru';
-		$l = $this->createMock(IL10N::class);
-		$event = $this->createMock(IEvent::class);
-
-		$event->expects($this->once())
-			->method('getApp')
-			->willReturn('twofactor_backupcodes');
-		$this->l10n->expects($this->once())
-			->method('get')
-			->with('twofactor_backupcodes', $lang)
-			->willReturn($l);
-		$event->expects($this->once())
-			->method('getSubject')
-			->willReturn('unrelated');
-
-		$this->expectException(UnknownActivityException::class);
-		$this->provider->parse($lang, $event);
-	}
+    private IFactory&MockObject $l10n;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IManager&MockObject $activityManager;
+    private Provider $provider;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10n = $this->createMock(IFactory::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->activityManager = $this->createMock(IManager::class);
+
+        $this->provider = new Provider($this->l10n, $this->urlGenerator, $this->activityManager);
+    }
+
+    public function testParseUnrelated(): void {
+        $lang = 'ru';
+        $event = $this->createMock(IEvent::class);
+        $event->expects($this->once())
+            ->method('getApp')
+            ->willReturn('comments');
+        $this->expectException(UnknownActivityException::class);
+
+        $this->provider->parse($lang, $event);
+    }
+
+    public static function subjectData(): array {
+        return [
+            ['codes_generated'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('subjectData')]
+    public function testParse(string $subject): void {
+        $lang = 'ru';
+        $event = $this->createMock(IEvent::class);
+        $l = $this->createMock(IL10N::class);
+
+        $event->expects($this->once())
+            ->method('getApp')
+            ->willReturn('twofactor_backupcodes');
+        $this->l10n->expects($this->once())
+            ->method('get')
+            ->with('twofactor_backupcodes', $lang)
+            ->willReturn($l);
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->with('core', 'actions/password.svg')
+            ->willReturn('path/to/image');
+        $this->urlGenerator->expects($this->once())
+            ->method('getAbsoluteURL')
+            ->with('path/to/image')
+            ->willReturn('absolute/path/to/image');
+        $event->expects($this->once())
+            ->method('setIcon')
+            ->with('absolute/path/to/image');
+        $event->expects($this->once())
+            ->method('getSubject')
+            ->willReturn($subject);
+        $event->expects($this->once())
+            ->method('setParsedSubject');
+
+        $this->provider->parse($lang, $event);
+    }
+
+    public function testParseInvalidSubject(): void {
+        $lang = 'ru';
+        $l = $this->createMock(IL10N::class);
+        $event = $this->createMock(IEvent::class);
+
+        $event->expects($this->once())
+            ->method('getApp')
+            ->willReturn('twofactor_backupcodes');
+        $this->l10n->expects($this->once())
+            ->method('get')
+            ->with('twofactor_backupcodes', $lang)
+            ->willReturn($l);
+        $event->expects($this->once())
+            ->method('getSubject')
+            ->willReturn('unrelated');
+
+        $this->expectException(UnknownActivityException::class);
+        $this->provider->parse($lang, $event);
+    }
 }

apps/workflowengine/tests/Check/RequestRemoteAddressTest.php

Indentation +84 added lines, -84 removed lines

@@ -15,88 +15,88 @@
 
 class RequestRemoteAddressTest extends \Test\TestCase {
 
-	protected IRequest&MockObject $request;
-
-	protected function getL10NMock(): IL10N&MockObject {
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return sprintf($string, $args);
-			});
-		return $l;
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->request = $this->createMock(IRequest::class);
-	}
-
-	public static function dataExecuteCheckIPv4(): array {
-		return [
-			['127.0.0.1/32', '127.0.0.1', true],
-			['127.0.0.1/32', '127.0.0.0', false],
-			['127.0.0.1/31', '127.0.0.0', true],
-			['127.0.0.1/32', '127.0.0.2', false],
-			['127.0.0.1/31', '127.0.0.2', false],
-			['127.0.0.1/30', '127.0.0.2', true],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv4')]
-	public function testExecuteCheckMatchesIPv4(string $value, string $ip, bool $expected): void {
-		$check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
-
-		$this->request->expects($this->once())
-			->method('getRemoteAddress')
-			->willReturn($ip);
-
-		$this->assertEquals($expected, $check->executeCheck('matchesIPv4', $value));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv4')]
-	public function testExecuteCheckNotMatchesIPv4(string $value, string $ip, bool $expected): void {
-		$check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
-
-		$this->request->expects($this->once())
-			->method('getRemoteAddress')
-			->willReturn($ip);
-
-		$this->assertEquals(!$expected, $check->executeCheck('!matchesIPv4', $value));
-	}
-
-	public static function dataExecuteCheckIPv6(): array {
-		return [
-			['::1/128', '::1', true],
-			['::2/128', '::3', false],
-			['::2/127', '::3', true],
-			['::1/128', '::2', false],
-			['::1/127', '::2', false],
-			['::1/126', '::2', true],
-			['1234::1/127', '1234::', true],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv6')]
-	public function testExecuteCheckMatchesIPv6(string $value, string $ip, bool $expected): void {
-		$check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
-
-		$this->request->expects($this->once())
-			->method('getRemoteAddress')
-			->willReturn($ip);
-
-		$this->assertEquals($expected, $check->executeCheck('matchesIPv6', $value));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv6')]
-	public function testExecuteCheckNotMatchesIPv6(string $value, string $ip, bool $expected): void {
-		$check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
-
-		$this->request->expects($this->once())
-			->method('getRemoteAddress')
-			->willReturn($ip);
-
-		$this->assertEquals(!$expected, $check->executeCheck('!matchesIPv6', $value));
-	}
+    protected IRequest&MockObject $request;
+
+    protected function getL10NMock(): IL10N&MockObject {
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return sprintf($string, $args);
+            });
+        return $l;
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->request = $this->createMock(IRequest::class);
+    }
+
+    public static function dataExecuteCheckIPv4(): array {
+        return [
+            ['127.0.0.1/32', '127.0.0.1', true],
+            ['127.0.0.1/32', '127.0.0.0', false],
+            ['127.0.0.1/31', '127.0.0.0', true],
+            ['127.0.0.1/32', '127.0.0.2', false],
+            ['127.0.0.1/31', '127.0.0.2', false],
+            ['127.0.0.1/30', '127.0.0.2', true],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv4')]
+    public function testExecuteCheckMatchesIPv4(string $value, string $ip, bool $expected): void {
+        $check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
+
+        $this->request->expects($this->once())
+            ->method('getRemoteAddress')
+            ->willReturn($ip);
+
+        $this->assertEquals($expected, $check->executeCheck('matchesIPv4', $value));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv4')]
+    public function testExecuteCheckNotMatchesIPv4(string $value, string $ip, bool $expected): void {
+        $check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
+
+        $this->request->expects($this->once())
+            ->method('getRemoteAddress')
+            ->willReturn($ip);
+
+        $this->assertEquals(!$expected, $check->executeCheck('!matchesIPv4', $value));
+    }
+
+    public static function dataExecuteCheckIPv6(): array {
+        return [
+            ['::1/128', '::1', true],
+            ['::2/128', '::3', false],
+            ['::2/127', '::3', true],
+            ['::1/128', '::2', false],
+            ['::1/127', '::2', false],
+            ['::1/126', '::2', true],
+            ['1234::1/127', '1234::', true],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv6')]
+    public function testExecuteCheckMatchesIPv6(string $value, string $ip, bool $expected): void {
+        $check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
+
+        $this->request->expects($this->once())
+            ->method('getRemoteAddress')
+            ->willReturn($ip);
+
+        $this->assertEquals($expected, $check->executeCheck('matchesIPv6', $value));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheckIPv6')]
+    public function testExecuteCheckNotMatchesIPv6(string $value, string $ip, bool $expected): void {
+        $check = new RequestRemoteAddress($this->getL10NMock(), $this->request);
+
+        $this->request->expects($this->once())
+            ->method('getRemoteAddress')
+            ->willReturn($ip);
+
+        $this->assertEquals(!$expected, $check->executeCheck('!matchesIPv6', $value));
+    }
 }

apps/workflowengine/tests/Check/RequestUserAgentTest.php

Indentation +66 added lines, -66 removed lines

@@ -16,79 +16,79 @@
 use Test\TestCase;
 
 class RequestUserAgentTest extends TestCase {
-	protected IRequest&MockObject $request;
-	protected RequestUserAgent $check;
+    protected IRequest&MockObject $request;
+    protected RequestUserAgent $check;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->request = $this->createMock(IRequest::class);
-		/** @var IL10N&MockObject $l */
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return sprintf($string, $args);
-			});
+        $this->request = $this->createMock(IRequest::class);
+        /** @var IL10N&MockObject $l */
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return sprintf($string, $args);
+            });
 
-		$this->check = new RequestUserAgent($l, $this->request);
-	}
+        $this->check = new RequestUserAgent($l, $this->request);
+    }
 
-	public static function dataExecuteCheck(): array {
-		return [
-			['is', 'android', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
-			['is', 'android', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
-			['is', 'android', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
-			['is', 'android', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['is', 'android', 'Filelink for *cloud/2.2.0', false],
-			['!is', 'android', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
-			['!is', 'android', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
-			['!is', 'android', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
-			['!is', 'android', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['!is', 'android', 'Filelink for *cloud/2.2.0', true],
+    public static function dataExecuteCheck(): array {
+        return [
+            ['is', 'android', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
+            ['is', 'android', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
+            ['is', 'android', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
+            ['is', 'android', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
+            ['is', 'android', 'Filelink for *cloud/2.2.0', false],
+            ['!is', 'android', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
+            ['!is', 'android', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
+            ['!is', 'android', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
+            ['!is', 'android', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
+            ['!is', 'android', 'Filelink for *cloud/2.2.0', true],
 
-			['is', 'ios', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
-			['is', 'ios', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
-			['is', 'ios', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
-			['is', 'ios', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['is', 'ios', 'Filelink for *cloud/2.2.0', false],
-			['!is', 'ios', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
-			['!is', 'ios', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
-			['!is', 'ios', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
-			['!is', 'ios', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['!is', 'ios', 'Filelink for *cloud/2.2.0', true],
+            ['is', 'ios', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
+            ['is', 'ios', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
+            ['is', 'ios', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
+            ['is', 'ios', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
+            ['is', 'ios', 'Filelink for *cloud/2.2.0', false],
+            ['!is', 'ios', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
+            ['!is', 'ios', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
+            ['!is', 'ios', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
+            ['!is', 'ios', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
+            ['!is', 'ios', 'Filelink for *cloud/2.2.0', true],
 
-			['is', 'desktop', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
-			['is', 'desktop', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
-			['is', 'desktop', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
-			['is', 'desktop', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['is', 'desktop', 'Filelink for *cloud/2.2.0', false],
-			['!is', 'desktop', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
-			['!is', 'desktop', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
-			['!is', 'desktop', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
-			['!is', 'desktop', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['!is', 'desktop', 'Filelink for *cloud/2.2.0', true],
+            ['is', 'desktop', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
+            ['is', 'desktop', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
+            ['is', 'desktop', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
+            ['is', 'desktop', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
+            ['is', 'desktop', 'Filelink for *cloud/2.2.0', false],
+            ['!is', 'desktop', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
+            ['!is', 'desktop', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
+            ['!is', 'desktop', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
+            ['!is', 'desktop', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
+            ['!is', 'desktop', 'Filelink for *cloud/2.2.0', true],
 
-			['is', 'mail', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
-			['is', 'mail', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
-			['is', 'mail', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
-			['is', 'mail', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
-			['is', 'mail', 'Filelink for *cloud/2.2.0', true],
-			['!is', 'mail', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
-			['!is', 'mail', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
-			['!is', 'mail', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
-			['!is', 'mail', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
-			['!is', 'mail', 'Filelink for *cloud/2.2.0', false],
-		];
-	}
+            ['is', 'mail', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', false],
+            ['is', 'mail', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', false],
+            ['is', 'mail', 'Mozilla/5.0 (Linux) mirall/2.2.0', false],
+            ['is', 'mail', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', true],
+            ['is', 'mail', 'Filelink for *cloud/2.2.0', true],
+            ['!is', 'mail', 'Mozilla/5.0 (Android) Nextcloud-android/2.2.0', true],
+            ['!is', 'mail', 'Mozilla/5.0 (iOS) Nextcloud-iOS/2.2.0', true],
+            ['!is', 'mail', 'Mozilla/5.0 (Linux) mirall/2.2.0', true],
+            ['!is', 'mail', 'Mozilla/5.0 (Windows) Nextcloud-Outlook v2.2.0', false],
+            ['!is', 'mail', 'Filelink for *cloud/2.2.0', false],
+        ];
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheck')]
-	public function testExecuteCheck(string $operation, string $checkValue, string $actualValue, bool $expected): void {
-		$this->request->expects($this->once())
-			->method('getHeader')
-			->willReturn($actualValue);
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheck')]
+    public function testExecuteCheck(string $operation, string $checkValue, string $actualValue, bool $expected): void {
+        $this->request->expects($this->once())
+            ->method('getHeader')
+            ->willReturn($actualValue);
 
-		/** @var AbstractStringCheck $check */
-		$this->assertEquals($expected, $this->check->executeCheck($operation, $checkValue));
-	}
+        /** @var AbstractStringCheck $check */
+        $this->assertEquals($expected, $this->check->executeCheck($operation, $checkValue));
+    }
 }

apps/workflowengine/tests/Check/AbstractStringCheckTest.php

Indentation +101 added lines, -101 removed lines

@@ -13,105 +13,105 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class AbstractStringCheckTest extends \Test\TestCase {
-	protected function getCheckMock(): AbstractStringCheck|MockObject {
-		$l = $this->getMockBuilder(IL10N::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return sprintf($string, $args);
-			});
-
-		$check = $this->getMockBuilder(AbstractStringCheck::class)
-			->setConstructorArgs([
-				$l,
-			])
-			->onlyMethods([
-				'executeCheck',
-				'getActualValue',
-			])
-			->getMock();
-
-		return $check;
-	}
-
-	public static function dataExecuteStringCheck(): array {
-		return [
-			['is', 'same', 'same', true],
-			['is', 'different', 'not the same', false],
-			['!is', 'same', 'same', false],
-			['!is', 'different', 'not the same', true],
-
-			['matches', '/match/', 'match', true],
-			['matches', '/different/', 'not the same', false],
-			['!matches', '/match/', 'match', false],
-			['!matches', '/different/', 'not the same', true],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteStringCheck')]
-	public function testExecuteStringCheck(string $operation, string $checkValue, string $actualValue, bool $expected): void {
-		$check = $this->getCheckMock();
-
-		/** @var AbstractStringCheck $check */
-		$this->assertEquals($expected, $this->invokePrivate($check, 'executeStringCheck', [$operation, $checkValue, $actualValue]));
-	}
-
-	public static function dataValidateCheck(): array {
-		return [
-			['is', '/Invalid(Regex/'],
-			['!is', '/Invalid(Regex/'],
-			['matches', '/Valid(Regex)/'],
-			['!matches', '/Valid(Regex)/'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheck')]
-	public function testValidateCheck(string $operator, string $value): void {
-		$check = $this->getCheckMock();
-
-		/** @var AbstractStringCheck $check */
-		$check->validateCheck($operator, $value);
-
-		$this->addToAssertionCount(1);
-	}
-
-	public static function dataValidateCheckInvalid(): array {
-		return [
-			['!!is', '', 1, 'The given operator is invalid'],
-			['less', '', 1, 'The given operator is invalid'],
-			['matches', '/Invalid(Regex/', 2, 'The given regular expression is invalid'],
-			['!matches', '/Invalid(Regex/', 2, 'The given regular expression is invalid'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheckInvalid')]
-	public function testValidateCheckInvalid(string $operator, string $value, int $exceptionCode, string $exceptionMessage): void {
-		$check = $this->getCheckMock();
-
-		try {
-			/** @var AbstractStringCheck $check */
-			$check->validateCheck($operator, $value);
-		} catch (\UnexpectedValueException $e) {
-			$this->assertEquals($exceptionCode, $e->getCode());
-			$this->assertEquals($exceptionMessage, $e->getMessage());
-		}
-	}
-
-	public static function dataMatch(): array {
-		return [
-			['/valid/', 'valid', [], true],
-			['/valid/', 'valid', [md5('/valid/') => [md5('valid') => false]], false], // Cache hit
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataMatch')]
-	public function testMatch(string $pattern, string $subject, array $matches, bool $expected): void {
-		$check = $this->getCheckMock();
-
-		$this->invokePrivate($check, 'matches', [$matches]);
-
-		$this->assertEquals($expected, $this->invokePrivate($check, 'match', [$pattern, $subject]));
-	}
+    protected function getCheckMock(): AbstractStringCheck|MockObject {
+        $l = $this->getMockBuilder(IL10N::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return sprintf($string, $args);
+            });
+
+        $check = $this->getMockBuilder(AbstractStringCheck::class)
+            ->setConstructorArgs([
+                $l,
+            ])
+            ->onlyMethods([
+                'executeCheck',
+                'getActualValue',
+            ])
+            ->getMock();
+
+        return $check;
+    }
+
+    public static function dataExecuteStringCheck(): array {
+        return [
+            ['is', 'same', 'same', true],
+            ['is', 'different', 'not the same', false],
+            ['!is', 'same', 'same', false],
+            ['!is', 'different', 'not the same', true],
+
+            ['matches', '/match/', 'match', true],
+            ['matches', '/different/', 'not the same', false],
+            ['!matches', '/match/', 'match', false],
+            ['!matches', '/different/', 'not the same', true],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteStringCheck')]
+    public function testExecuteStringCheck(string $operation, string $checkValue, string $actualValue, bool $expected): void {
+        $check = $this->getCheckMock();
+
+        /** @var AbstractStringCheck $check */
+        $this->assertEquals($expected, $this->invokePrivate($check, 'executeStringCheck', [$operation, $checkValue, $actualValue]));
+    }
+
+    public static function dataValidateCheck(): array {
+        return [
+            ['is', '/Invalid(Regex/'],
+            ['!is', '/Invalid(Regex/'],
+            ['matches', '/Valid(Regex)/'],
+            ['!matches', '/Valid(Regex)/'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheck')]
+    public function testValidateCheck(string $operator, string $value): void {
+        $check = $this->getCheckMock();
+
+        /** @var AbstractStringCheck $check */
+        $check->validateCheck($operator, $value);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public static function dataValidateCheckInvalid(): array {
+        return [
+            ['!!is', '', 1, 'The given operator is invalid'],
+            ['less', '', 1, 'The given operator is invalid'],
+            ['matches', '/Invalid(Regex/', 2, 'The given regular expression is invalid'],
+            ['!matches', '/Invalid(Regex/', 2, 'The given regular expression is invalid'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheckInvalid')]
+    public function testValidateCheckInvalid(string $operator, string $value, int $exceptionCode, string $exceptionMessage): void {
+        $check = $this->getCheckMock();
+
+        try {
+            /** @var AbstractStringCheck $check */
+            $check->validateCheck($operator, $value);
+        } catch (\UnexpectedValueException $e) {
+            $this->assertEquals($exceptionCode, $e->getCode());
+            $this->assertEquals($exceptionMessage, $e->getMessage());
+        }
+    }
+
+    public static function dataMatch(): array {
+        return [
+            ['/valid/', 'valid', [], true],
+            ['/valid/', 'valid', [md5('/valid/') => [md5('valid') => false]], false], // Cache hit
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataMatch')]
+    public function testMatch(string $pattern, string $subject, array $matches, bool $expected): void {
+        $check = $this->getCheckMock();
+
+        $this->invokePrivate($check, 'matches', [$matches]);
+
+        $this->assertEquals($expected, $this->invokePrivate($check, 'match', [$pattern, $subject]));
+    }
 }

apps/workflowengine/tests/Check/RequestTimeTest.php

Indentation +109 added lines, -109 removed lines

@@ -14,113 +14,113 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class RequestTimeTest extends \Test\TestCase {
-	protected ITimeFactory&MockObject $timeFactory;
-
-	protected function getL10NMock(): IL10N&MockObject {
-		$l = $this->createMock(IL10N::class);
-		$l->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return sprintf($string, $args);
-			});
-		return $l;
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-	}
-
-	public static function dataExecuteCheck(): array {
-		return [
-			[json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467870105, false], // 2016-07-07T07:41:45+02:00
-			[json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467873705, true], // 2016-07-07T08:41:45+02:00
-			[json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467902505, true], // 2016-07-07T16:41:45+02:00
-			[json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467906105, false], // 2016-07-07T17:41:45+02:00
-			[json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467870105, true], // 2016-07-07T07:41:45+02:00
-			[json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467873705, false], // 2016-07-07T08:41:45+02:00
-			[json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467902505, false], // 2016-07-07T16:41:45+02:00
-			[json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467906105, true], // 2016-07-07T17:41:45+02:00
-
-			[json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467843105, false], // 2016-07-07T07:41:45+09:30
-			[json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467846705, true], // 2016-07-07T08:41:45+09:30
-			[json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467875505, true], // 2016-07-07T16:41:45+09:30
-			[json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467879105, false], // 2016-07-07T17:41:45+09:30
-			[json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467843105, true], // 2016-07-07T07:41:45+09:30
-			[json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467846705, false], // 2016-07-07T08:41:45+09:30
-			[json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467875505, false], // 2016-07-07T16:41:45+09:30
-			[json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467879105, true], // 2016-07-07T17:41:45+09:30
-
-			[json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467916905, false], // 2016-07-07T07:41:45-11:00
-			[json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467920505, true], // 2016-07-07T08:41:45-11:00
-			[json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467949305, true], // 2016-07-07T16:41:45-11:00
-			[json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467952905, false], // 2016-07-07T17:41:45-11:00
-			[json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467916905, true], // 2016-07-07T07:41:45-11:00
-			[json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467920505, false], // 2016-07-07T08:41:45-11:00
-			[json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467949305, false], // 2016-07-07T16:41:45-11:00
-			[json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467952905, true], // 2016-07-07T17:41:45-11:00
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheck')]
-	public function testExecuteCheckIn(string $value, int $timestamp, bool $expected): void {
-		$check = new RequestTime($this->getL10NMock(), $this->timeFactory);
-
-		$this->timeFactory->expects($this->once())
-			->method('getTime')
-			->willReturn($timestamp);
-
-		$this->assertEquals($expected, $check->executeCheck('in', $value));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheck')]
-	public function testExecuteCheckNotIn(string $value, int $timestamp, bool $expected): void {
-		$check = new RequestTime($this->getL10NMock(), $this->timeFactory);
-
-		$this->timeFactory->expects($this->once())
-			->method('getTime')
-			->willReturn($timestamp);
-
-		$this->assertEquals(!$expected, $check->executeCheck('!in', $value));
-	}
-
-	public static function dataValidateCheck(): array {
-		return [
-			['in', '["08:00 Europe/Berlin","17:00 Europe/Berlin"]'],
-			['!in', '["08:00 Europe/Berlin","17:00 America/North_Dakota/Beulah"]'],
-			['in', '["08:00 America/Port-au-Prince","17:00 America/Argentina/San_Luis"]'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheck')]
-	public function testValidateCheck(string $operator, string $value): void {
-		$check = new RequestTime($this->getL10NMock(), $this->timeFactory);
-		$check->validateCheck($operator, $value);
-		$this->addToAssertionCount(1);
-	}
-
-	public static function dataValidateCheckInvalid(): array {
-		return [
-			['!!in', '["08:00 Europe/Berlin","17:00 Europe/Berlin"]', 1, 'The given operator is invalid'],
-			['in', '["28:00 Europe/Berlin","17:00 Europe/Berlin"]', 2, 'The given time span is invalid'],
-			['in', '["08:00 Europe/Berlin","27:00 Europe/Berlin"]', 2, 'The given time span is invalid'],
-			['in', '["08:00 Europa/Berlin","17:00 Europe/Berlin"]', 3, 'The given start time is invalid'],
-			['in', '["08:00 Europe/Berlin","17:00 Europa/Berlin"]', 4, 'The given end time is invalid'],
-			['in', '["08:00 Europe/Bearlin","17:00 Europe/Berlin"]', 3, 'The given start time is invalid'],
-			['in', '["08:00 Europe/Berlin","17:00 Europe/Bearlin"]', 4, 'The given end time is invalid'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheckInvalid')]
-	public function testValidateCheckInvalid(string $operator, string $value, int $exceptionCode, string $exceptionMessage): void {
-		$check = new RequestTime($this->getL10NMock(), $this->timeFactory);
-
-		try {
-			$check->validateCheck($operator, $value);
-		} catch (\UnexpectedValueException $e) {
-			$this->assertEquals($exceptionCode, $e->getCode());
-			$this->assertEquals($exceptionMessage, $e->getMessage());
-		}
-	}
+    protected ITimeFactory&MockObject $timeFactory;
+
+    protected function getL10NMock(): IL10N&MockObject {
+        $l = $this->createMock(IL10N::class);
+        $l->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($string, $args) {
+                return sprintf($string, $args);
+            });
+        return $l;
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+    }
+
+    public static function dataExecuteCheck(): array {
+        return [
+            [json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467870105, false], // 2016-07-07T07:41:45+02:00
+            [json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467873705, true], // 2016-07-07T08:41:45+02:00
+            [json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467902505, true], // 2016-07-07T16:41:45+02:00
+            [json_encode(['08:00 Europe/Berlin', '17:00 Europe/Berlin']), 1467906105, false], // 2016-07-07T17:41:45+02:00
+            [json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467870105, true], // 2016-07-07T07:41:45+02:00
+            [json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467873705, false], // 2016-07-07T08:41:45+02:00
+            [json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467902505, false], // 2016-07-07T16:41:45+02:00
+            [json_encode(['17:00 Europe/Berlin', '08:00 Europe/Berlin']), 1467906105, true], // 2016-07-07T17:41:45+02:00
+
+            [json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467843105, false], // 2016-07-07T07:41:45+09:30
+            [json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467846705, true], // 2016-07-07T08:41:45+09:30
+            [json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467875505, true], // 2016-07-07T16:41:45+09:30
+            [json_encode(['08:00 Australia/Adelaide', '17:00 Australia/Adelaide']), 1467879105, false], // 2016-07-07T17:41:45+09:30
+            [json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467843105, true], // 2016-07-07T07:41:45+09:30
+            [json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467846705, false], // 2016-07-07T08:41:45+09:30
+            [json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467875505, false], // 2016-07-07T16:41:45+09:30
+            [json_encode(['17:00 Australia/Adelaide', '08:00 Australia/Adelaide']), 1467879105, true], // 2016-07-07T17:41:45+09:30
+
+            [json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467916905, false], // 2016-07-07T07:41:45-11:00
+            [json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467920505, true], // 2016-07-07T08:41:45-11:00
+            [json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467949305, true], // 2016-07-07T16:41:45-11:00
+            [json_encode(['08:00 Pacific/Niue', '17:00 Pacific/Niue']), 1467952905, false], // 2016-07-07T17:41:45-11:00
+            [json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467916905, true], // 2016-07-07T07:41:45-11:00
+            [json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467920505, false], // 2016-07-07T08:41:45-11:00
+            [json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467949305, false], // 2016-07-07T16:41:45-11:00
+            [json_encode(['17:00 Pacific/Niue', '08:00 Pacific/Niue']), 1467952905, true], // 2016-07-07T17:41:45-11:00
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheck')]
+    public function testExecuteCheckIn(string $value, int $timestamp, bool $expected): void {
+        $check = new RequestTime($this->getL10NMock(), $this->timeFactory);
+
+        $this->timeFactory->expects($this->once())
+            ->method('getTime')
+            ->willReturn($timestamp);
+
+        $this->assertEquals($expected, $check->executeCheck('in', $value));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExecuteCheck')]
+    public function testExecuteCheckNotIn(string $value, int $timestamp, bool $expected): void {
+        $check = new RequestTime($this->getL10NMock(), $this->timeFactory);
+
+        $this->timeFactory->expects($this->once())
+            ->method('getTime')
+            ->willReturn($timestamp);
+
+        $this->assertEquals(!$expected, $check->executeCheck('!in', $value));
+    }
+
+    public static function dataValidateCheck(): array {
+        return [
+            ['in', '["08:00 Europe/Berlin","17:00 Europe/Berlin"]'],
+            ['!in', '["08:00 Europe/Berlin","17:00 America/North_Dakota/Beulah"]'],
+            ['in', '["08:00 America/Port-au-Prince","17:00 America/Argentina/San_Luis"]'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheck')]
+    public function testValidateCheck(string $operator, string $value): void {
+        $check = new RequestTime($this->getL10NMock(), $this->timeFactory);
+        $check->validateCheck($operator, $value);
+        $this->addToAssertionCount(1);
+    }
+
+    public static function dataValidateCheckInvalid(): array {
+        return [
+            ['!!in', '["08:00 Europe/Berlin","17:00 Europe/Berlin"]', 1, 'The given operator is invalid'],
+            ['in', '["28:00 Europe/Berlin","17:00 Europe/Berlin"]', 2, 'The given time span is invalid'],
+            ['in', '["08:00 Europe/Berlin","27:00 Europe/Berlin"]', 2, 'The given time span is invalid'],
+            ['in', '["08:00 Europa/Berlin","17:00 Europe/Berlin"]', 3, 'The given start time is invalid'],
+            ['in', '["08:00 Europe/Berlin","17:00 Europa/Berlin"]', 4, 'The given end time is invalid'],
+            ['in', '["08:00 Europe/Bearlin","17:00 Europe/Berlin"]', 3, 'The given start time is invalid'],
+            ['in', '["08:00 Europe/Berlin","17:00 Europe/Bearlin"]', 4, 'The given end time is invalid'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataValidateCheckInvalid')]
+    public function testValidateCheckInvalid(string $operator, string $value, int $exceptionCode, string $exceptionMessage): void {
+        $check = new RequestTime($this->getL10NMock(), $this->timeFactory);
+
+        try {
+            $check->validateCheck($operator, $value);
+        } catch (\UnexpectedValueException $e) {
+            $this->assertEquals($exceptionCode, $e->getCode());
+            $this->assertEquals($exceptionMessage, $e->getMessage());
+        }
+    }
 }

apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php

Indentation +112 added lines, -112 removed lines

@@ -13,124 +13,124 @@
 use Test\TestCase;
 
 class CommentersSorterTest extends TestCase {
-	protected ICommentsManager&MockObject $commentsManager;
-	protected CommentersSorter $sorter;
+    protected ICommentsManager&MockObject $commentsManager;
+    protected CommentersSorter $sorter;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->commentsManager = $this->createMock(ICommentsManager::class);
+        $this->commentsManager = $this->createMock(ICommentsManager::class);
 
-		$this->sorter = new CommentersSorter($this->commentsManager);
-	}
+        $this->sorter = new CommentersSorter($this->commentsManager);
+    }
 
-	/**
-	 * @param $data
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('sortDataProvider')]
-	public function testSort($data): void {
-		$commentMocks = [];
-		foreach ($data['actors'] as $actorType => $actors) {
-			foreach ($actors as $actorId => $noOfComments) {
-				for ($i = 0;$i < $noOfComments;$i++) {
-					$mock = $this->createMock(IComment::class);
-					$mock->expects($this->atLeastOnce())
-						->method('getActorType')
-						->willReturn($actorType);
-					$mock->expects($this->atLeastOnce())
-						->method('getActorId')
-						->willReturn($actorId);
-					$commentMocks[] = $mock;
-				}
-			}
-		}
+    /**
+     * @param $data
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('sortDataProvider')]
+    public function testSort($data): void {
+        $commentMocks = [];
+        foreach ($data['actors'] as $actorType => $actors) {
+            foreach ($actors as $actorId => $noOfComments) {
+                for ($i = 0;$i < $noOfComments;$i++) {
+                    $mock = $this->createMock(IComment::class);
+                    $mock->expects($this->atLeastOnce())
+                        ->method('getActorType')
+                        ->willReturn($actorType);
+                    $mock->expects($this->atLeastOnce())
+                        ->method('getActorId')
+                        ->willReturn($actorId);
+                    $commentMocks[] = $mock;
+                }
+            }
+        }
 
-		$this->commentsManager->expects($this->once())
-			->method('getForObject')
-			->willReturn($commentMocks);
+        $this->commentsManager->expects($this->once())
+            ->method('getForObject')
+            ->willReturn($commentMocks);
 
-		$workArray = $data['input'];
-		$this->sorter->sort($workArray, ['itemType' => 'files', 'itemId' => '24']);
+        $workArray = $data['input'];
+        $this->sorter->sort($workArray, ['itemType' => 'files', 'itemId' => '24']);
 
-		$this->assertEquals($data['expected'], $workArray);
-	}
+        $this->assertEquals($data['expected'], $workArray);
+    }
 
-	public static function sortDataProvider(): array {
-		return [[
-			[
-				#1 – sort properly and otherwise keep existing order
-				'actors' => ['users' => ['celia' => 3, 'darius' => 7, 'faruk' => 5, 'gail' => 5], 'bots' => ['r2-d2' => 8]],
-				'input' => [
-					'users' => [
-						['value' => ['shareWith' => 'alice']],
-						['value' => ['shareWith' => 'bob']],
-						['value' => ['shareWith' => 'celia']],
-						['value' => ['shareWith' => 'darius']],
-						['value' => ['shareWith' => 'elena']],
-						['value' => ['shareWith' => 'faruk']],
-						['value' => ['shareWith' => 'gail']],
-					],
-					'bots' => [
-						['value' => ['shareWith' => 'c-3po']],
-						['value' => ['shareWith' => 'r2-d2']],
-					]
-				],
-				'expected' => [
-					'users' => [
-						['value' => ['shareWith' => 'darius']],
-						['value' => ['shareWith' => 'faruk']],
-						['value' => ['shareWith' => 'gail']],
-						['value' => ['shareWith' => 'celia']],
-						['value' => ['shareWith' => 'alice']],
-						['value' => ['shareWith' => 'bob']],
-						['value' => ['shareWith' => 'elena']],
-					],
-					'bots' => [
-						['value' => ['shareWith' => 'r2-d2']],
-						['value' => ['shareWith' => 'c-3po']],
-					]
-				],
-			],
-			[
-				#2 – no commentors, input equals output
-				'actors' => [],
-				'input' => [
-					'users' => [
-						['value' => ['shareWith' => 'alice']],
-						['value' => ['shareWith' => 'bob']],
-						['value' => ['shareWith' => 'celia']],
-						['value' => ['shareWith' => 'darius']],
-						['value' => ['shareWith' => 'elena']],
-						['value' => ['shareWith' => 'faruk']],
-						['value' => ['shareWith' => 'gail']],
-					],
-					'bots' => [
-						['value' => ['shareWith' => 'c-3po']],
-						['value' => ['shareWith' => 'r2-d2']],
-					]
-				],
-				'expected' => [
-					'users' => [
-						['value' => ['shareWith' => 'alice']],
-						['value' => ['shareWith' => 'bob']],
-						['value' => ['shareWith' => 'celia']],
-						['value' => ['shareWith' => 'darius']],
-						['value' => ['shareWith' => 'elena']],
-						['value' => ['shareWith' => 'faruk']],
-						['value' => ['shareWith' => 'gail']],
-					],
-					'bots' => [
-						['value' => ['shareWith' => 'c-3po']],
-						['value' => ['shareWith' => 'r2-d2']],
-					]
-				],
-			],
-			[
-				#3 – no nothing
-				'actors' => [],
-				'input' => [],
-				'expected' => [],
-			],
-		]];
-	}
+    public static function sortDataProvider(): array {
+        return [[
+            [
+                #1 – sort properly and otherwise keep existing order
+                'actors' => ['users' => ['celia' => 3, 'darius' => 7, 'faruk' => 5, 'gail' => 5], 'bots' => ['r2-d2' => 8]],
+                'input' => [
+                    'users' => [
+                        ['value' => ['shareWith' => 'alice']],
+                        ['value' => ['shareWith' => 'bob']],
+                        ['value' => ['shareWith' => 'celia']],
+                        ['value' => ['shareWith' => 'darius']],
+                        ['value' => ['shareWith' => 'elena']],
+                        ['value' => ['shareWith' => 'faruk']],
+                        ['value' => ['shareWith' => 'gail']],
+                    ],
+                    'bots' => [
+                        ['value' => ['shareWith' => 'c-3po']],
+                        ['value' => ['shareWith' => 'r2-d2']],
+                    ]
+                ],
+                'expected' => [
+                    'users' => [
+                        ['value' => ['shareWith' => 'darius']],
+                        ['value' => ['shareWith' => 'faruk']],
+                        ['value' => ['shareWith' => 'gail']],
+                        ['value' => ['shareWith' => 'celia']],
+                        ['value' => ['shareWith' => 'alice']],
+                        ['value' => ['shareWith' => 'bob']],
+                        ['value' => ['shareWith' => 'elena']],
+                    ],
+                    'bots' => [
+                        ['value' => ['shareWith' => 'r2-d2']],
+                        ['value' => ['shareWith' => 'c-3po']],
+                    ]
+                ],
+            ],
+            [
+                #2 – no commentors, input equals output
+                'actors' => [],
+                'input' => [
+                    'users' => [
+                        ['value' => ['shareWith' => 'alice']],
+                        ['value' => ['shareWith' => 'bob']],
+                        ['value' => ['shareWith' => 'celia']],
+                        ['value' => ['shareWith' => 'darius']],
+                        ['value' => ['shareWith' => 'elena']],
+                        ['value' => ['shareWith' => 'faruk']],
+                        ['value' => ['shareWith' => 'gail']],
+                    ],
+                    'bots' => [
+                        ['value' => ['shareWith' => 'c-3po']],
+                        ['value' => ['shareWith' => 'r2-d2']],
+                    ]
+                ],
+                'expected' => [
+                    'users' => [
+                        ['value' => ['shareWith' => 'alice']],
+                        ['value' => ['shareWith' => 'bob']],
+                        ['value' => ['shareWith' => 'celia']],
+                        ['value' => ['shareWith' => 'darius']],
+                        ['value' => ['shareWith' => 'elena']],
+                        ['value' => ['shareWith' => 'faruk']],
+                        ['value' => ['shareWith' => 'gail']],
+                    ],
+                    'bots' => [
+                        ['value' => ['shareWith' => 'c-3po']],
+                        ['value' => ['shareWith' => 'r2-d2']],
+                    ]
+                ],
+            ],
+            [
+                #3 – no nothing
+                'actors' => [],
+                'input' => [],
+                'expected' => [],
+            ],
+        ]];
+    }
 }

apps/comments/tests/Unit/Controller/NotificationsTest.php

Indentation +183 added lines, -183 removed lines

@@ -28,187 +28,187 @@
 use Test\TestCase;
 
 class NotificationsTest extends TestCase {
-	protected ICommentsManager&MockObject $commentsManager;
-	protected IRootFolder&MockObject $rootFolder;
-	protected IUserSession&MockObject $session;
-	protected IManager&MockObject $notificationManager;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected NotificationsController $notificationsController;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->commentsManager = $this->createMock(ICommentsManager::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->session = $this->createMock(IUserSession::class);
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-
-		$this->notificationsController = new NotificationsController(
-			'comments',
-			$this->createMock(IRequest::class),
-			$this->commentsManager,
-			$this->rootFolder,
-			$this->urlGenerator,
-			$this->notificationManager,
-			$this->session
-		);
-	}
-
-	public function testViewGuestRedirect(): void {
-		$this->commentsManager->expects($this->never())
-			->method('get');
-
-		$this->rootFolder->expects($this->never())
-			->method('getUserFolder');
-
-		$this->session->expects($this->once())
-			->method('getUser')
-			->willReturn(null);
-
-		$this->notificationManager->expects($this->never())
-			->method('createNotification');
-		$this->notificationManager->expects($this->never())
-			->method('markProcessed');
-
-		$this->urlGenerator->expects($this->exactly(2))
-			->method('linkToRoute')
-			->willReturnMap([
-				['comments.Notifications.view', ['id' => '42'], 'link-to-comment'],
-				['core.login.showLoginForm', ['redirect_url' => 'link-to-comment'], 'link-to-login'],
-			]);
-
-		/** @var RedirectResponse $response */
-		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf(RedirectResponse::class, $response);
-		$this->assertSame('link-to-login', $response->getRedirectURL());
-	}
-
-	public function testViewSuccess(): void {
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getId')
-			->willReturn('1234');
-
-		$this->commentsManager->expects($this->any())
-			->method('get')
-			->with('42')
-			->willReturn($comment);
-
-		$file = $this->createMock(Node::class);
-		$folder = $this->createMock(Folder::class);
-		$user = $this->createMock(IUser::class);
-
-		$this->rootFolder->expects($this->once())
-			->method('getUserFolder')
-			->willReturn($folder);
-
-		$folder->expects($this->once())
-			->method('getById')
-			->willReturn([$file]);
-
-		$this->session->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->any())
-			->method($this->anything())
-			->willReturn($notification);
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->once())
-			->method('markProcessed')
-			->with($notification);
-
-		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf(RedirectResponse::class, $response);
-	}
-
-	public function testViewInvalidComment(): void {
-		$this->commentsManager->expects($this->any())
-			->method('get')
-			->with('42')
-			->willThrowException(new NotFoundException());
-
-		$this->rootFolder->expects($this->never())
-			->method('getUserFolder');
-
-		$user = $this->createMock(IUser::class);
-
-		$this->session->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$this->notificationManager->expects($this->never())
-			->method('createNotification');
-		$this->notificationManager->expects($this->never())
-			->method('markProcessed');
-
-		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf(NotFoundResponse::class, $response);
-	}
-
-	public function testViewNoFile(): void {
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getId')
-			->willReturn('1234');
-
-		$this->commentsManager->expects($this->any())
-			->method('get')
-			->with('42')
-			->willReturn($comment);
-
-		$folder = $this->createMock(Folder::class);
-
-		$this->rootFolder->expects($this->once())
-			->method('getUserFolder')
-			->willReturn($folder);
-
-		$folder->expects($this->once())
-			->method('getById')
-			->willReturn([]);
-
-		$user = $this->createMock(IUser::class);
-
-		$this->session->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->any())
-			->method($this->anything())
-			->willReturn($notification);
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->once())
-			->method('markProcessed')
-			->with($notification);
-
-		$response = $this->notificationsController->view('42');
-		$this->assertInstanceOf(NotFoundResponse::class, $response);
-	}
+    protected ICommentsManager&MockObject $commentsManager;
+    protected IRootFolder&MockObject $rootFolder;
+    protected IUserSession&MockObject $session;
+    protected IManager&MockObject $notificationManager;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected NotificationsController $notificationsController;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->commentsManager = $this->createMock(ICommentsManager::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+        $this->session = $this->createMock(IUserSession::class);
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+
+        $this->notificationsController = new NotificationsController(
+            'comments',
+            $this->createMock(IRequest::class),
+            $this->commentsManager,
+            $this->rootFolder,
+            $this->urlGenerator,
+            $this->notificationManager,
+            $this->session
+        );
+    }
+
+    public function testViewGuestRedirect(): void {
+        $this->commentsManager->expects($this->never())
+            ->method('get');
+
+        $this->rootFolder->expects($this->never())
+            ->method('getUserFolder');
+
+        $this->session->expects($this->once())
+            ->method('getUser')
+            ->willReturn(null);
+
+        $this->notificationManager->expects($this->never())
+            ->method('createNotification');
+        $this->notificationManager->expects($this->never())
+            ->method('markProcessed');
+
+        $this->urlGenerator->expects($this->exactly(2))
+            ->method('linkToRoute')
+            ->willReturnMap([
+                ['comments.Notifications.view', ['id' => '42'], 'link-to-comment'],
+                ['core.login.showLoginForm', ['redirect_url' => 'link-to-comment'], 'link-to-login'],
+            ]);
+
+        /** @var RedirectResponse $response */
+        $response = $this->notificationsController->view('42');
+        $this->assertInstanceOf(RedirectResponse::class, $response);
+        $this->assertSame('link-to-login', $response->getRedirectURL());
+    }
+
+    public function testViewSuccess(): void {
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getId')
+            ->willReturn('1234');
+
+        $this->commentsManager->expects($this->any())
+            ->method('get')
+            ->with('42')
+            ->willReturn($comment);
+
+        $file = $this->createMock(Node::class);
+        $folder = $this->createMock(Folder::class);
+        $user = $this->createMock(IUser::class);
+
+        $this->rootFolder->expects($this->once())
+            ->method('getUserFolder')
+            ->willReturn($folder);
+
+        $folder->expects($this->once())
+            ->method('getById')
+            ->willReturn([$file]);
+
+        $this->session->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->any())
+            ->method($this->anything())
+            ->willReturn($notification);
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->once())
+            ->method('markProcessed')
+            ->with($notification);
+
+        $response = $this->notificationsController->view('42');
+        $this->assertInstanceOf(RedirectResponse::class, $response);
+    }
+
+    public function testViewInvalidComment(): void {
+        $this->commentsManager->expects($this->any())
+            ->method('get')
+            ->with('42')
+            ->willThrowException(new NotFoundException());
+
+        $this->rootFolder->expects($this->never())
+            ->method('getUserFolder');
+
+        $user = $this->createMock(IUser::class);
+
+        $this->session->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $this->notificationManager->expects($this->never())
+            ->method('createNotification');
+        $this->notificationManager->expects($this->never())
+            ->method('markProcessed');
+
+        $response = $this->notificationsController->view('42');
+        $this->assertInstanceOf(NotFoundResponse::class, $response);
+    }
+
+    public function testViewNoFile(): void {
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getId')
+            ->willReturn('1234');
+
+        $this->commentsManager->expects($this->any())
+            ->method('get')
+            ->with('42')
+            ->willReturn($comment);
+
+        $folder = $this->createMock(Folder::class);
+
+        $this->rootFolder->expects($this->once())
+            ->method('getUserFolder')
+            ->willReturn($folder);
+
+        $folder->expects($this->once())
+            ->method('getById')
+            ->willReturn([]);
+
+        $user = $this->createMock(IUser::class);
+
+        $this->session->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->any())
+            ->method($this->anything())
+            ->willReturn($notification);
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->once())
+            ->method('markProcessed')
+            ->with($notification);
+
+        $response = $this->notificationsController->view('42');
+        $this->assertInstanceOf(NotFoundResponse::class, $response);
+    }
 }

apps/comments/tests/Unit/Notification/ListenerTest.php

Indentation +174 added lines, -174 removed lines

@@ -18,178 +18,178 @@
 use Test\TestCase;
 
 class ListenerTest extends TestCase {
-	protected IManager&MockObject $notificationManager;
-	protected IUserManager&MockObject $userManager;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected Listener $listener;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$this->listener = new Listener(
-			$this->notificationManager,
-			$this->userManager
-		);
-	}
-
-	public static function eventProvider(): array {
-		return [
-			[CommentsEvent::EVENT_ADD, 'notify'],
-			[CommentsEvent::EVENT_UPDATE, 'notify'],
-			[CommentsEvent::EVENT_PRE_UPDATE, 'markProcessed'],
-			[CommentsEvent::EVENT_DELETE, 'markProcessed']
-		];
-	}
-
-	/**
-	 * @param string $eventType
-	 * @param string $notificationMethod
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
-	public function testEvaluate($eventType, $notificationMethod): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getCreationDateTime')
-			->willReturn(new \DateTime());
-		$comment->expects($this->once())
-			->method('getMentions')
-			->willReturn([
-				[ 'type' => 'user', 'id' => 'foobar'],
-				[ 'type' => 'user', 'id' => 'barfoo'],
-				[ 'type' => 'user', 'id' => 'foo@bar.com'],
-				[ 'type' => 'user', 'id' => 'bar@foo.org@foobar.io'],
-				[ 'type' => 'user', 'id' => '23452-4333-54353-2342'],
-				[ 'type' => 'user', 'id' => 'yolo'],
-			]);
-		$comment->expects($this->atLeastOnce())
-			->method('getId')
-			->willReturn('1234');
-
-		/** @var CommentsEvent|MockObject $event */
-		$event = $this->createMock(CommentsEvent::class);
-		$event->expects($this->once())
-			->method('getComment')
-			->willReturn($comment);
-		$event->expects(($this->any()))
-			->method(('getEvent'))
-			->willReturn($eventType);
-
-		/** @var INotification|MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->any())
-			->method($this->anything())
-			->willReturn($notification);
-		$notification->expects($this->exactly(6))
-			->method('setUser');
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->exactly(6))
-			->method($notificationMethod)
-			->with($this->isInstanceOf('\OCP\Notification\INotification'));
-
-		$this->userManager->expects($this->exactly(6))
-			->method('userExists')
-			->willReturnMap([
-				['foobar', true],
-				['barfoo', true],
-				['foo@bar.com', true],
-				['bar@foo.org@foobar.io', true],
-				['23452-4333-54353-2342', true],
-				['yolo', true]
-			]);
-
-		$this->listener->evaluate($event);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
-	public function testEvaluateNoMentions(string $eventType): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getCreationDateTime')
-			->willReturn(new \DateTime());
-		$comment->expects($this->once())
-			->method('getMentions')
-			->willReturn([]);
-
-		/** @var CommentsEvent|MockObject $event */
-		$event = $this->createMock(CommentsEvent::class);
-		$event->expects($this->once())
-			->method('getComment')
-			->willReturn($comment);
-		$event->expects(($this->any()))
-			->method(('getEvent'))
-			->willReturn($eventType);
-
-		$this->notificationManager->expects($this->never())
-			->method('createNotification');
-		$this->notificationManager->expects($this->never())
-			->method('notify');
-		$this->notificationManager->expects($this->never())
-			->method('markProcessed');
-
-		$this->userManager->expects($this->never())
-			->method('userExists');
-
-		$this->listener->evaluate($event);
-	}
-
-	public function testEvaluateUserDoesNotExist(): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->any())
-			->method('getObjectType')
-			->willReturn('files');
-		$comment->expects($this->any())
-			->method('getCreationDateTime')
-			->willReturn(new \DateTime());
-		$comment->expects($this->once())
-			->method('getMentions')
-			->willReturn([[ 'type' => 'user', 'id' => 'foobar']]);
-		$comment->expects($this->atLeastOnce())
-			->method('getId')
-			->willReturn('1234');
-
-		/** @var CommentsEvent|MockObject $event */
-		$event = $this->createMock(CommentsEvent::class);
-		$event->expects($this->once())
-			->method('getComment')
-			->willReturn($comment);
-		$event->expects(($this->any()))
-			->method(('getEvent'))
-			->willReturn(CommentsEvent::EVENT_ADD);
-
-		/** @var INotification|MockObject $notification */
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->any())
-			->method($this->anything())
-			->willReturn($notification);
-		$notification->expects($this->never())
-			->method('setUser');
-
-		$this->notificationManager->expects($this->once())
-			->method('createNotification')
-			->willReturn($notification);
-		$this->notificationManager->expects($this->never())
-			->method('notify');
-
-		$this->userManager->expects($this->once())
-			->method('userExists')
-			->with('foobar')
-			->willReturn(false);
-
-		$this->listener->evaluate($event);
-	}
+    protected IManager&MockObject $notificationManager;
+    protected IUserManager&MockObject $userManager;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected Listener $listener;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $this->listener = new Listener(
+            $this->notificationManager,
+            $this->userManager
+        );
+    }
+
+    public static function eventProvider(): array {
+        return [
+            [CommentsEvent::EVENT_ADD, 'notify'],
+            [CommentsEvent::EVENT_UPDATE, 'notify'],
+            [CommentsEvent::EVENT_PRE_UPDATE, 'markProcessed'],
+            [CommentsEvent::EVENT_DELETE, 'markProcessed']
+        ];
+    }
+
+    /**
+     * @param string $eventType
+     * @param string $notificationMethod
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
+    public function testEvaluate($eventType, $notificationMethod): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getCreationDateTime')
+            ->willReturn(new \DateTime());
+        $comment->expects($this->once())
+            ->method('getMentions')
+            ->willReturn([
+                [ 'type' => 'user', 'id' => 'foobar'],
+                [ 'type' => 'user', 'id' => 'barfoo'],
+                [ 'type' => 'user', 'id' => 'foo@bar.com'],
+                [ 'type' => 'user', 'id' => 'bar@foo.org@foobar.io'],
+                [ 'type' => 'user', 'id' => '23452-4333-54353-2342'],
+                [ 'type' => 'user', 'id' => 'yolo'],
+            ]);
+        $comment->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn('1234');
+
+        /** @var CommentsEvent|MockObject $event */
+        $event = $this->createMock(CommentsEvent::class);
+        $event->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+        $event->expects(($this->any()))
+            ->method(('getEvent'))
+            ->willReturn($eventType);
+
+        /** @var INotification|MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->any())
+            ->method($this->anything())
+            ->willReturn($notification);
+        $notification->expects($this->exactly(6))
+            ->method('setUser');
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->exactly(6))
+            ->method($notificationMethod)
+            ->with($this->isInstanceOf('\OCP\Notification\INotification'));
+
+        $this->userManager->expects($this->exactly(6))
+            ->method('userExists')
+            ->willReturnMap([
+                ['foobar', true],
+                ['barfoo', true],
+                ['foo@bar.com', true],
+                ['bar@foo.org@foobar.io', true],
+                ['23452-4333-54353-2342', true],
+                ['yolo', true]
+            ]);
+
+        $this->listener->evaluate($event);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('eventProvider')]
+    public function testEvaluateNoMentions(string $eventType): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getCreationDateTime')
+            ->willReturn(new \DateTime());
+        $comment->expects($this->once())
+            ->method('getMentions')
+            ->willReturn([]);
+
+        /** @var CommentsEvent|MockObject $event */
+        $event = $this->createMock(CommentsEvent::class);
+        $event->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+        $event->expects(($this->any()))
+            ->method(('getEvent'))
+            ->willReturn($eventType);
+
+        $this->notificationManager->expects($this->never())
+            ->method('createNotification');
+        $this->notificationManager->expects($this->never())
+            ->method('notify');
+        $this->notificationManager->expects($this->never())
+            ->method('markProcessed');
+
+        $this->userManager->expects($this->never())
+            ->method('userExists');
+
+        $this->listener->evaluate($event);
+    }
+
+    public function testEvaluateUserDoesNotExist(): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->any())
+            ->method('getObjectType')
+            ->willReturn('files');
+        $comment->expects($this->any())
+            ->method('getCreationDateTime')
+            ->willReturn(new \DateTime());
+        $comment->expects($this->once())
+            ->method('getMentions')
+            ->willReturn([[ 'type' => 'user', 'id' => 'foobar']]);
+        $comment->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn('1234');
+
+        /** @var CommentsEvent|MockObject $event */
+        $event = $this->createMock(CommentsEvent::class);
+        $event->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+        $event->expects(($this->any()))
+            ->method(('getEvent'))
+            ->willReturn(CommentsEvent::EVENT_ADD);
+
+        /** @var INotification|MockObject $notification */
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->any())
+            ->method($this->anything())
+            ->willReturn($notification);
+        $notification->expects($this->never())
+            ->method('setUser');
+
+        $this->notificationManager->expects($this->once())
+            ->method('createNotification')
+            ->willReturn($notification);
+        $this->notificationManager->expects($this->never())
+            ->method('notify');
+
+        $this->userManager->expects($this->once())
+            ->method('userExists')
+            ->with('foobar')
+            ->willReturn(false);
+
+        $this->listener->evaluate($event);
+    }
 }

apps/comments/tests/Unit/EventHandlerTest.php

Indentation +67 added lines, -67 removed lines

@@ -17,71 +17,71 @@
 use Test\TestCase;
 
 class EventHandlerTest extends TestCase {
-	protected ActivityListener&MockObject $activityListener;
-	protected NotificationListener&MockObject $notificationListener;
-	protected CommentsEventListener $eventHandler;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->activityListener = $this->createMock(ActivityListener::class);
-		$this->notificationListener = $this->createMock(NotificationListener::class);
-
-		$this->eventHandler = new CommentsEventListener($this->activityListener, $this->notificationListener);
-	}
-
-	public function testNotFiles(): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->once())
-			->method('getObjectType')
-			->willReturn('smiles');
-
-		/** @var CommentsEvent|MockObject $event */
-		$event = $this->createMock(CommentsEvent::class);
-		$event->expects($this->once())
-			->method('getComment')
-			->willReturn($comment);
-		$event->expects($this->never())
-			->method('getEvent');
-
-		$this->eventHandler->handle($event);
-	}
-
-	public static function handledProvider(): array {
-		return [
-			[CommentsEvent::EVENT_DELETE],
-			[CommentsEvent::EVENT_UPDATE],
-			[CommentsEvent::EVENT_PRE_UPDATE],
-			[CommentsEvent::EVENT_ADD]
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('handledProvider')]
-	public function testHandled(string $eventType): void {
-		/** @var IComment|MockObject $comment */
-		$comment = $this->createMock(IComment::class);
-		$comment->expects($this->once())
-			->method('getObjectType')
-			->willReturn('files');
-
-		/** @var CommentsEvent|MockObject $event */
-		$event = $this->createMock(CommentsEvent::class);
-		$event->expects($this->atLeastOnce())
-			->method('getComment')
-			->willReturn($comment);
-		$event->expects($this->atLeastOnce())
-			->method('getEvent')
-			->willReturn($eventType);
-
-		$this->notificationListener->expects($this->once())
-			->method('evaluate')
-			->with($event);
-
-		$this->activityListener->expects($this->any())
-			->method('commentEvent')
-			->with($event);
-
-		$this->eventHandler->handle($event);
-	}
+    protected ActivityListener&MockObject $activityListener;
+    protected NotificationListener&MockObject $notificationListener;
+    protected CommentsEventListener $eventHandler;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->activityListener = $this->createMock(ActivityListener::class);
+        $this->notificationListener = $this->createMock(NotificationListener::class);
+
+        $this->eventHandler = new CommentsEventListener($this->activityListener, $this->notificationListener);
+    }
+
+    public function testNotFiles(): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->once())
+            ->method('getObjectType')
+            ->willReturn('smiles');
+
+        /** @var CommentsEvent|MockObject $event */
+        $event = $this->createMock(CommentsEvent::class);
+        $event->expects($this->once())
+            ->method('getComment')
+            ->willReturn($comment);
+        $event->expects($this->never())
+            ->method('getEvent');
+
+        $this->eventHandler->handle($event);
+    }
+
+    public static function handledProvider(): array {
+        return [
+            [CommentsEvent::EVENT_DELETE],
+            [CommentsEvent::EVENT_UPDATE],
+            [CommentsEvent::EVENT_PRE_UPDATE],
+            [CommentsEvent::EVENT_ADD]
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('handledProvider')]
+    public function testHandled(string $eventType): void {
+        /** @var IComment|MockObject $comment */
+        $comment = $this->createMock(IComment::class);
+        $comment->expects($this->once())
+            ->method('getObjectType')
+            ->willReturn('files');
+
+        /** @var CommentsEvent|MockObject $event */
+        $event = $this->createMock(CommentsEvent::class);
+        $event->expects($this->atLeastOnce())
+            ->method('getComment')
+            ->willReturn($comment);
+        $event->expects($this->atLeastOnce())
+            ->method('getEvent')
+            ->willReturn($eventType);
+
+        $this->notificationListener->expects($this->once())
+            ->method('evaluate')
+            ->with($event);
+
+        $this->activityListener->expects($this->any())
+            ->method('commentEvent')
+            ->with($event);
+
+        $this->eventHandler->handle($event);
+    }
 }