Browse Source

fix unit tests

Olivier Massot 2 tháng trước cách đây
mục cha
commit
9afb4206a0

+ 1 - 4
tests/Unit/Service/Cron/Job/CleanTempFilesTest.php

@@ -7,7 +7,6 @@ use App\Enum\Core\FileStatusEnum;
 use App\Repository\Core\FileRepository;
 use App\Service\Cron\Job\CleanTempFiles;
 use App\Service\Cron\UI\CronUIInterface;
-use App\Service\File\Storage\LocalStorage;
 use App\Service\Utils\DatesUtils;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\EntityManagerInterface;
@@ -43,7 +42,6 @@ class CleanTempFilesTest extends TestCase
     private MockObject|LoggerInterface $logger;
     private FileRepository|MockObject $fileRepository;
     private Connection|MockObject $connection;
-    private LocalStorage|MockObject $storage;
     private EntityManagerInterface|MockObject $em;
 
     public function setUp(): void
@@ -53,14 +51,13 @@ class CleanTempFilesTest extends TestCase
 
         $this->fileRepository = $this->getMockBuilder(FileRepository::class)->disableOriginalConstructor()->getMock();
         $this->connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
-        $this->storage = $this->getMockBuilder(LocalStorage::class)->disableOriginalConstructor()->getMock();
         $this->em = $this->getMockBuilder(EntityManagerInterface::class)->disableOriginalConstructor()->getMock();
     }
 
     private function getMockFor(string $method): MockObject|TestableCleanTempFile
     {
         $cleanTempFiles = $this->getMockBuilder(TestableCleanTempFile::class)
-            ->setConstructorArgs([$this->connection, $this->fileRepository, $this->storage, $this->em])
+            ->setConstructorArgs([$this->connection, $this->fileRepository, $this->em])
             ->setMethodsExcept([$method, 'setUI', 'setLoggerInterface'])
             ->getMock();
         $cleanTempFiles->setUI($this->ui);

+ 1 - 4
tests/Unit/Service/Cron/Job/FilesGarbageCollectorTest.php

@@ -9,7 +9,6 @@ use App\Repository\Core\FileRepository;
 use App\Service\Cron\Job\FilesGarbageCollector;
 use App\Service\Cron\UI\CronUIInterface;
 use App\Service\File\Storage\LocalStorage;
-use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
@@ -39,7 +38,6 @@ class FilesGarbageCollectorTest extends TestCase
 {
     private CronUIInterface|MockObject $ui;
     private MockObject|LoggerInterface $logger;
-    private Connection|MockObject $connection;
     private FileRepository|MockObject $fileRepository;
     private LocalStorage|MockObject $storage;
 
@@ -47,7 +45,6 @@ class FilesGarbageCollectorTest extends TestCase
     {
         $this->ui = $this->getMockBuilder(CronUIInterface::class)->disableOriginalConstructor()->getMock();
         $this->logger = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
-        $this->connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
         $this->fileRepository = $this->getMockBuilder(FileRepository::class)->disableOriginalConstructor()->getMock();
         $this->storage = $this->getMockBuilder(LocalStorage::class)->disableOriginalConstructor()->getMock();
     }
@@ -55,7 +52,7 @@ class FilesGarbageCollectorTest extends TestCase
     private function getFilesGarbageCollectorMockFor(string $methodName): TestableFilesGarbageCollector|MockObject
     {
         $filesGarbageCollector = $this->getMockBuilder(TestableFilesGarbageCollector::class)
-            ->setConstructorArgs([$this->connection, $this->fileRepository, $this->storage])
+            ->setConstructorArgs([$this->fileRepository, $this->storage])
             ->setMethodsExcept([$methodName, 'setUI', 'setLoggerInterface'])
             ->getMock();
         $filesGarbageCollector->setUI($this->ui);

+ 2 - 10
tests/Unit/Service/HelloAsso/HelloAssoServiceTest.php

@@ -15,7 +15,6 @@ use App\Service\Utils\DatesUtils;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -67,7 +66,6 @@ class HelloAssoServiceTest extends TestCase
     private OrganizationRepository|MockObject $organizationRepository;
     private EventRepository|MockObject $eventRepository;
     private EntityManagerInterface|MockObject $entityManager;
-    private LoggerInterface|MockObject $logger;
 
     private string $baseUrl = 'https://test-base.com';
     private string $publicAppBaseUrl = 'https://test-public.com';
@@ -93,10 +91,6 @@ class HelloAssoServiceTest extends TestCase
         $this->entityManager = $this->getMockBuilder(EntityManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->logger = $this->getMockBuilder(LoggerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
     }
 
     private function getHelloAssoServiceMockFor(string $methodName): TestableHelloAssoService|MockObject
@@ -106,14 +100,12 @@ class HelloAssoServiceTest extends TestCase
                 $this->httpClient,
                 $this->organizationRepository,
                 $this->eventRepository,
-                $this->baseUrl,
                 $this->publicAppBaseUrl,
                 $this->helloAssoApiBaseUrl,
                 $this->helloAssoAuthBaseUrl,
                 $this->helloAssoClientId,
                 $this->helloAssoClientSecret,
                 $this->entityManager,
-                $this->logger,
             ])
             ->setMethodsExcept([$methodName])
             ->getMock();
@@ -130,12 +122,12 @@ class HelloAssoServiceTest extends TestCase
 
         $service->expects(self::once())
             ->method('fetchAccessToken')
-            ->with(null)
+            ->with(null, null)
             ->willReturn($tokensData);
 
         $service->expects(self::once())
             ->method('updateDomain')
-            ->with($tokensData, 'https://*.opentalent.fr');
+            ->with('test-token', 'https://*.opentalent.fr');
 
         $service->setupOpentalentDomain();
     }