fix: improve test cases

gabrielberthier · May 16, 2023 · 43146c6 · 43146c6
1 parent e16c503
commit 43146c6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 41 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Domain/UseCases/Auth/LoginTest.php b/tests/Domain/UseCases/Auth/LoginTest.php
@@ -59,12 +59,8 @@ public function makeService($repository, $comparer): LoginServiceInterface
         return new Login($repository, $comparer);
     }
 
-    /**
-     * Create a mocked repository.
-     *
-     * @return MockObject
-     */
-    public function mockRepository()
+
+    public function mockRepository(): AccountRepository|MockObject
     {
         return $this->getMockBuilder(AccountRepository::class)
             ->disableOriginalConstructor()
@@ -133,23 +129,26 @@ public function testShouldCallHashComparerWithCorrectValues()
     // Test should throw if password provided differs from retrieved by repository
     public function testShouldThrowIfPasswordDiffersFromRetrievedOne()
     {
-        $repository = $this->mockRepository();
-        $repository->method('findByAccess')->willReturn(
-            new Account(2,
+        $mockRepository = $this->mockRepository();
+        $mockRepository->method('findByAccess')->willReturn(
+            new Account(
+                2,
                 password: 'hashed_password',
                 email: 'mail.com',
-                username: 'user')
+                username: 'user'
+            )
         );
 
         $this->expectException(IncorrectPasswordException::class);
-        /**
-         * @var MockObject
-         */
+
         $mock = $this->getMockBuilder(ComparerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $mock->expects($this->once())->method('compare')->willReturn(false);
 
+        /** @var AccountRepository */
+        $repository = $mockRepository;
+
         $loginService = $this->makeService($repository, $mock);
 
         $credentialsStub = $this->makeCredentials();

diff --git a/tests/Presentation/Middleware/AuthMiddleware/RefreshTokenTestTrait.php b/tests/Presentation/Middleware/AuthMiddleware/RefreshTokenTestTrait.php
@@ -34,7 +34,7 @@ public function testShouldInterceptHttpCookieRefresh()
         ;
 
         /**
-         * @var Container
+         * @var \Psr\Container\ContainerInterface
          */
         $container = $this->getContainer();
 
@@ -44,4 +44,4 @@ public function testShouldInterceptHttpCookieRefresh()
 
         assertNotNull($response);
     }
-}
+}
diff --git a/tests/Presentation/Validation/MarkerValidationTest.php b/tests/Presentation/Validation/MarkerValidationTest.php
@@ -9,7 +9,6 @@
 use App\Presentation\Helpers\Validation\Validators\Interfaces\ValidationInterface;
 
 use function PHPUnit\Framework\assertNotNull;
-use function PHPUnit\Framework\assertTrue;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Tests\TestCase;
 
@@ -98,4 +97,4 @@ public function testShouldPassAsset()
 
         $this->assertNull($this->sut->validate($body['marker']));
     }
-}
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -27,7 +27,7 @@ class TestCase extends PHPUnit_TestCase
 
     public static function createDatabase()
     {
-        /** @var ContainerInterface */
+        /** @var \Psr\Container\ContainerInterface */
         $container = self::$container;
         /** @var EntityManager */
         $entityManager = $container->get(EntityManager::class);
@@ -38,11 +38,11 @@ public static function createDatabase()
 
     final public static function truncateDatabase()
     {
-        /** @var ContainerInterface */
+        /** @var \Psr\Container\ContainerInterface */
         $container = self::$container;
         /** @var EntityManager */
         $entityManager = $container->get(EntityManager::class);
         $schemaTool = new SchemaTool($entityManager);
         $schemaTool->dropDatabase();
     }
-}
+}