[Tests] Reduced code duplication in custom providers test cases

ibexa · Jul 5, 2024 · f3108e5 · f3108e5
1 parent 5d23ed7
commit f3108e5
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 92 deletions.
diff --git a/tests/lib/MVC/Symfony/Security/User/BaseProviderTestCase.php b/tests/lib/MVC/Symfony/Security/User/BaseProviderTestCase.php
@@ -12,14 +12,18 @@
 use Ibexa\Contracts\Core\Repository\UserService;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\User\User as APIUser;
+use Ibexa\Core\Base\Exceptions\NotFoundException;
 use Ibexa\Core\MVC\Symfony\Security\User as MVCUser;
 use Ibexa\Core\MVC\Symfony\Security\User\BaseProvider;
 use Ibexa\Core\MVC\Symfony\Security\UserInterface;
 use Ibexa\Core\Repository\Values\Content\Content;
 use Ibexa\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Core\Repository\Values\User\User;
+use Ibexa\Core\Repository\Values\User\UserReference;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface;
 
 abstract class BaseProviderTestCase extends TestCase
@@ -73,6 +77,34 @@ public function testLoadUserByAPIUser(): void
         self::assertSame(['ROLE_USER'], $user->getRoles());
     }
 
+    public function testRefreshUserNotFound(): void
+    {
+        $userId = 123;
+        $apiUser = $this->buildUserValueObjectStub($userId);
+        $user = $this->createMock(UserInterface::class);
+        $user
+            ->expects(self::once())
+            ->method('getAPIUser')
+            ->willReturn($apiUser);
+
+        $this->userService
+            ->expects(self::once())
+            ->method('loadUser')
+            ->with($userId)
+            ->willThrowException(new NotFoundException('user', 'foo'));
+
+        $this->expectException(UserNotFoundException::class);
+        $this->userProvider->refreshUser($user);
+    }
+
+    public function testRefreshUserNotSupported(): void
+    {
+        $user = $this->createMock(SymfonyUserInterface::class);
+
+        $this->expectException(UnsupportedUserException::class);
+        $this->userProvider->refreshUser($user);
+    }
+
     protected function createUserWrapperMockFromAPIUser(User $apiUser, int $userId): UserInterface & MockObject
     {
         $refreshedAPIUser = clone $apiUser;
@@ -98,6 +130,20 @@ protected function createUserWrapperMockFromAPIUser(User $apiUser, int $userId):
         return $user;
     }
 
+    public function testRefreshUser(): void
+    {
+        $userId = 123;
+        $apiUser = $this->buildUserValueObjectStub($userId);
+        $user = $this->createUserWrapperMockFromAPIUser($apiUser, $userId);
+
+        $this->permissionResolver
+            ->expects(self::once())
+            ->method('setCurrentUserReference')
+            ->with(new UserReference($apiUser->getUserId()));
+
+        self::assertSame($user, $this->userProvider->refreshUser($user));
+    }
+
     protected function buildUserValueObjectStub(int $userId): User
     {
         return new User(

diff --git a/tests/lib/MVC/Symfony/Security/User/EmailProviderTest.php b/tests/lib/MVC/Symfony/Security/User/EmailProviderTest.php
@@ -13,11 +13,7 @@
 use Ibexa\Core\MVC\Symfony\Security\User\BaseProvider;
 use Ibexa\Core\MVC\Symfony\Security\User\EmailProvider;
 use Ibexa\Core\MVC\Symfony\Security\UserInterface;
-use Ibexa\Core\Repository\Values\User\UserReference;
-use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
-use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface;
 
 /**
  * @covers \Ibexa\Core\MVC\Symfony\Security\User\EmailProvider
@@ -58,47 +54,4 @@ public function testLoadUserByUsername(): void
         self::assertSame($apiUser, $user->getAPIUser());
         self::assertSame(['ROLE_USER'], $user->getRoles());
     }
-
-    public function testRefreshUserNotSupported(): void
-    {
-        $user = $this->createMock(SymfonyUserInterface::class);
-
-        $this->expectException(UnsupportedUserException::class);
-        $this->userProvider->refreshUser($user);
-    }
-
-    public function testRefreshUser(): void
-    {
-        $userId = 123;
-        $apiUser = $this->buildUserValueObjectStub($userId);
-        $user = $this->createUserWrapperMockFromAPIUser($apiUser, $userId);
-
-        $this->permissionResolver
-            ->expects(self::once())
-            ->method('setCurrentUserReference')
-            ->with(new UserReference($apiUser->getUserId()));
-
-        self::assertSame($user, $this->userProvider->refreshUser($user));
-    }
-
-    public function testRefreshUserNotFound(): void
-    {
-        $this->expectException(UsernameNotFoundException::class);
-
-        $userId = 123;
-        $apiUser = $this->buildUserValueObjectStub($userId);
-        $user = $this->createMock(UserInterface::class);
-        $user
-            ->expects(self::once())
-            ->method('getAPIUser')
-            ->willReturn($apiUser);
-
-        $this->userService
-            ->expects(self::once())
-            ->method('loadUser')
-            ->with($userId)
-            ->willThrowException(new NotFoundException('user', 'foo'));
-
-        $this->userProvider->refreshUser($user);
-    }
 }
diff --git a/tests/lib/MVC/Symfony/Security/User/UsernameProviderTest.php b/tests/lib/MVC/Symfony/Security/User/UsernameProviderTest.php
@@ -13,10 +13,7 @@
 use Ibexa\Core\MVC\Symfony\Security\User\BaseProvider;
 use Ibexa\Core\MVC\Symfony\Security\User\UsernameProvider;
 use Ibexa\Core\MVC\Symfony\Security\UserInterface;
-use Ibexa\Core\Repository\Values\User\UserReference;
-use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
-use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface;
 
 /**
  * @covers \Ibexa\Core\MVC\Symfony\Security\User\UsernameProvider
@@ -57,46 +54,4 @@ public function testLoadUserByUsername(): void
         self::assertSame($apiUser, $user->getAPIUser());
         self::assertSame(['ROLE_USER'], $user->getRoles());
     }
-
-    public function testRefreshUserNotSupported(): void
-    {
-        $user = $this->createMock(SymfonyUserInterface::class);
-
-        $this->expectException(UnsupportedUserException::class);
-        $this->userProvider->refreshUser($user);
-    }
-
-    public function testRefreshUser(): void
-    {
-        $userId = 123;
-        $apiUser = $this->buildUserValueObjectStub($userId);
-        $user = $this->createUserWrapperMockFromAPIUser($apiUser, $userId);
-
-        $this->permissionResolver
-            ->expects(self::once())
-            ->method('setCurrentUserReference')
-            ->with(new UserReference($apiUser->getUserId()));
-
-        self::assertSame($user, $this->userProvider->refreshUser($user));
-    }
-
-    public function testRefreshUserNotFound(): void
-    {
-        $userId = 123;
-        $apiUser = $this->buildUserValueObjectStub($userId);
-        $user = $this->createMock(UserInterface::class);
-        $user
-            ->expects(self::once())
-            ->method('getAPIUser')
-            ->willReturn($apiUser);
-
-        $this->userService
-            ->expects(self::once())
-            ->method('loadUser')
-            ->with($userId)
-            ->willThrowException(new NotFoundException('user', 'foo'));
-
-        $this->expectException(UserNotFoundException::class);
-        $this->userProvider->refreshUser($user);
-    }
 }