From 0dd00351d4d16d4a1bf717b2b6488ce8f025918c Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Tue, 30 Jan 2024 10:44:43 +0100
Subject: [PATCH] chore: Fix twofactor_backupcodes tests
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 .../Unit/Listener/ProviderDisabledTest.php     | 18 ++++++------------
 .../Unit/Listener/ProviderEnabledTest.php      | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php b/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php
index 659b16676b0..4ebd94d96bd 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php
@@ -29,22 +29,16 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\Listener;
 use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
 use OCA\TwoFactorBackupCodes\Listener\ProviderDisabled;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
-use OCP\Authentication\TwoFactorAuth\RegistryEvent;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserUnregistered;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\IUser;
 use Test\TestCase;
 
 class ProviderDisabledTest extends TestCase {
-
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	private $registy;
-
-	/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var ProviderDisabled */
-	private $listener;
+	private IRegistry $registy;
+	private IJobList $jobList;
+	private ProviderDisabled $listener;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -67,7 +61,7 @@ class ProviderDisabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserUnregistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 
@@ -88,7 +82,7 @@ class ProviderDisabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserUnregistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 
diff --git a/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderEnabledTest.php b/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderEnabledTest.php
index d74fa6e259d..a85d6734a07 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderEnabledTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderEnabledTest.php
@@ -29,22 +29,16 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\Listener;
 use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
 use OCA\TwoFactorBackupCodes\Listener\ProviderEnabled;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
-use OCP\Authentication\TwoFactorAuth\RegistryEvent;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserRegistered;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\IUser;
 use Test\TestCase;
 
 class ProviderEnabledTest extends TestCase {
-
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	private $registy;
-
-	/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var ProviderEnabled */
-	private $listener;
+	private IRegistry $registy;
+	private IJobList $jobList;
+	private ProviderEnabled $listener;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -67,7 +61,7 @@ class ProviderEnabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserRegistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 
@@ -87,7 +81,7 @@ class ProviderEnabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserRegistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 
-- 
2.39.5