tests fix

anzusystems · Dec 11, 2023 · 6bd7c78 · 6bd7c78
1 parent 27a8571
commit 6bd7c78
Show file tree

Hide file tree

Showing 22 changed files with 72 additions and 71 deletions.
diff --git a/tests/Controller/Api/AbstractApiController.php b/tests/Controller/Api/AbstractApiController.php
@@ -17,14 +17,14 @@ abstract class AbstractApiController extends AbstractController
     /** @psalm-var array<string, ApiClient> */
     private array $clients = [];
 
-    public function getClient(?int $userId = null): ApiClient
+    public function getApiClient(?int $newClient = null): ApiClient
     {
-        $key = $userId ?? 'anonymous';
+        $key = $newClient ?? 'anonymous';
         if (false === isset($this->clients[$key])) {
             $this->clients[$key] = new ApiClient(
                 static::$client,
                 $this->serializer,
-                $userId
+                $newClient
             );
         }
         return $this->clients[$key];

diff --git a/tests/Controller/Api/AbstractAssetFileApiController.php b/tests/Controller/Api/AbstractAssetFileApiController.php
@@ -246,7 +246,7 @@ protected function testSlotsSuccess(
         AssetUrlInterface $url,
     ): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $primarySlotName = $firstAssetFile->getSlots()->first()->getName();
         $asset = $firstAssetFile->getAsset();

diff --git a/tests/Controller/Api/Adm/V1/AssetApiControllerTest.php b/tests/Controller/Api/Adm/V1/AssetApiControllerTest.php
@@ -31,7 +31,7 @@ final class AssetApiControllerTest extends AbstractAssetFileApiController
      */
     public function testUpdate(int $statusCode, ?string $categoryId = null): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $video = $this->entityManager->find(VideoFile::class, VideoFixtures::VIDEO_ID_1);
 
         $response = $client->put(
@@ -80,7 +80,7 @@ protected function setUp(): void
      */
     public function testDelete(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $imageUrl = new ImageUrl(AssetLicenceFixtures::DEFAULT_LICENCE_ID);
 
         $image = $this->uploadAsset(
@@ -122,7 +122,7 @@ public function testDelete(): void
      */
     public function testCreate(string $type): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $response = $client->post('/api/adm/v1/asset/licence/'.AssetLicenceFixtures::DEFAULT_LICENCE_ID, ['type' => $type]);
 
         $this->assertEquals(Response::HTTP_CREATED, $response->getStatusCode());

diff --git a/tests/Controller/Api/Adm/V1/AssetCustomFormControllerTest.php b/tests/Controller/Api/Adm/V1/AssetCustomFormControllerTest.php
@@ -28,7 +28,7 @@ final class AssetCustomFormControllerTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $response = $client->get('/api/adm/v1/asset-custom-form/ext-system/1/type/image');
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
 
@@ -46,7 +46,7 @@ public function testGetOneSuccess(): void
      */
     public function testGetElementsSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $response = $client->get('/api/adm/v1/asset-custom-form/ext-system/1/type/image/element');
 
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());

diff --git a/tests/Controller/Api/Adm/V1/AssetLicenceControllerTest.php b/tests/Controller/Api/Adm/V1/AssetLicenceControllerTest.php
@@ -24,7 +24,7 @@ final class AssetLicenceControllerTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(AssetLicenceUrl::getOne(AssetLicenceFixtures::DEFAULT_LICENCE_ID));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -49,7 +49,7 @@ public function testGetOneSuccess(): void
      */
     public function testGetListSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(AssetLicenceUrl::getList());
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -72,7 +72,7 @@ public function testGetListSuccess(): void
      */
     public function testCreateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->post(AssetLicenceUrl::createPath(), $requestJson);
         $this->assertSame($expectedResponseStatusCode, $response->getStatusCode());
@@ -109,7 +109,7 @@ public function createSuccessDataProvider(): array
      */
     public function testCreateFailure(array $requestJson, array $validationErrors): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->post(AssetLicenceUrl::createPath(), $requestJson);
         $this->assertSame(Response::HTTP_UNPROCESSABLE_ENTITY, $response->getStatusCode());
@@ -160,7 +160,7 @@ public function createFailureDataProvider(): array
      */
     public function testUpdateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $id = $requestJson['id'];
         $response = $client->put(AssetLicenceUrl::update($id), $requestJson);

diff --git a/tests/Controller/Api/Adm/V1/AssetSlotControllerTest.php b/tests/Controller/Api/Adm/V1/AssetSlotControllerTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
      */
     public function testGetListSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
 
         $audioFile = $this->audioFileRepository->find(AudioFixtures::AUDIO_ID_1);
@@ -56,7 +56,7 @@ public function testGetListSuccess(): void
      */
     public function testUpdateSlot(array $reqJson): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $audioFile = $this->audioFileRepository->find(AudioFixtures::AUDIO_ID_1);
 
         $response = $client->patch(
@@ -74,7 +74,7 @@ public function testUpdateSlot(array $reqJson): void
      */
     public function testUpdateSlotFailed(array $reqJson): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $audioFile = $this->audioFileRepository->find(AudioFixtures::AUDIO_ID_1);
 
         $response = $client->patch(

diff --git a/tests/Controller/Api/Adm/V1/AudioApiControllerTest.php b/tests/Controller/Api/Adm/V1/AudioApiControllerTest.php
@@ -25,7 +25,7 @@ final class AudioApiControllerTest extends AbstractAssetFileApiController
      */
     public function testUpload(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $audioUrl = new AudioUrl(AssetLicenceFixtures::DEFAULT_LICENCE_ID);
 
         $audio = $this->uploadAsset(

diff --git a/tests/Controller/Api/Adm/V1/AuthorControllerTest.php b/tests/Controller/Api/Adm/V1/AuthorControllerTest.php
@@ -23,7 +23,7 @@ final class AuthorControllerTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(AuthorUrl::getOne(AuthorFixtures::AUTHOR_1));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -47,7 +47,7 @@ public function testGetOneSuccess(): void
      */
     public function testSearchByExtSystemSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(AuthorUrl::searchByExtSystem(ExtSystemFixtures::ID_CMS));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -70,7 +70,7 @@ public function testSearchByExtSystemSuccess(): void
      */
     public function testCreateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->post(AuthorUrl::createPath(), $requestJson);
         $this->assertSame($expectedResponseStatusCode, $response->getStatusCode());
@@ -105,7 +105,7 @@ public function createSuccessDataProvider(): array
      */
     public function testCreateFailure(array $requestJson, array $validationErrors): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->post(AuthorUrl::createPath(), $requestJson);
         $this->assertSame(Response::HTTP_UNPROCESSABLE_ENTITY, $response->getStatusCode());
@@ -156,7 +156,7 @@ public function createFailureDataProvider(): array
      */
     public function testUpdateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $id = $requestJson['id'];
         $response = $client->put(AuthorUrl::update($id), $requestJson);

diff --git a/tests/Controller/Api/Adm/V1/DistributionCategorySelectTest.php b/tests/Controller/Api/Adm/V1/DistributionCategorySelectTest.php
@@ -21,7 +21,7 @@ final class DistributionCategorySelectTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $distributionCategorySelectRepository = self::getContainer()->get(DistributionCategorySelectRepository::class);
         $fromDb = $distributionCategorySelectRepository->findOneBy([]);
@@ -46,7 +46,7 @@ public function testGetOneSuccess(): void
      */
     public function testGetListSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(DistributionCategorySelectUrl::getList(ExtSystemFixtures::ID_CMS));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -64,7 +64,7 @@ public function testGetListSuccess(): void
      */
     public function testUpdateSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $distributionCategorySelectRepository = self::getContainer()->get(DistributionCategorySelectRepository::class);
         $fromDb = $distributionCategorySelectRepository->findOneBy([]);

diff --git a/tests/Controller/Api/Adm/V1/DocumentApiControllerTest.php b/tests/Controller/Api/Adm/V1/DocumentApiControllerTest.php
@@ -27,7 +27,7 @@ final class DocumentApiControllerTest extends AbstractAssetFileApiController
      */
     public function testUpload(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $documentUrl = new DocumentUrl(AssetLicenceFixtures::DEFAULT_LICENCE_ID);
 
         $document = $this->uploadAsset(

diff --git a/tests/Controller/Api/Adm/V1/ExtSystemControllerTest.php b/tests/Controller/Api/Adm/V1/ExtSystemControllerTest.php
@@ -23,7 +23,7 @@ final class ExtSystemControllerTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(ExtSystemUrl::getOne(ExtSystemFixtures::ID_CMS));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -46,7 +46,7 @@ public function testGetOneSuccess(): void
      */
     public function testGetListSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(ExtSystemUrl::getList());
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -66,7 +66,7 @@ public function testGetListSuccess(): void
      */
     public function testUpdateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $id = $requestJson['id'];
         $response = $client->put(ExtSystemUrl::update($id), $requestJson);
@@ -106,7 +106,7 @@ public function updateSuccessDataProvider(): array
      */
     public function testUpdateFailure(array $requestJson, array $validationErrors): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $id = $requestJson['id'];
         $response = $client->put(ExtSystemUrl::update($id), $requestJson);

diff --git a/tests/Controller/Api/Adm/V1/ImageApiControllerTest.php b/tests/Controller/Api/Adm/V1/ImageApiControllerTest.php
@@ -46,7 +46,7 @@ protected function setUp(): void
     public function testUpload(): void
     {
         $rotation = 90;
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $imageUrl = new ImageUrl(AssetLicenceFixtures::DEFAULT_LICENCE_ID);
 
         $image = $this->uploadAsset(
@@ -103,7 +103,7 @@ public function testUpload(): void
 
     public function testCreateToAsset(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $response = $client->post(AssetUrl::createPath(), ['type' => 'image']);
         $this->assertEquals(Response::HTTP_CREATED, $response->getStatusCode());
         $asset = $this->serializer->deserialize($response->getContent(), AssetAdmDetailDto::class);
@@ -135,7 +135,7 @@ public function testSetSlotSuccess(): void
      */
     public function testCreateToAssetFailed(string $imageId, string $slot, string $error): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
         $response = $client->post(AssetUrl::createPath(), ['type' => 'image']);
         $this->assertEquals(Response::HTTP_CREATED, $response->getStatusCode());
         $asset = $this->serializer->deserialize($response->getContent(), AssetAdmDetailDto::class);
@@ -162,7 +162,7 @@ public function createToAssetFailedDataProvider(): array
 
     public function testCreateImageFailed(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $responseData = $this->createAsset(
             $client,
@@ -193,7 +193,7 @@ public function testCreateImageFailed(): void
      */
     public function testAddChunkFailed(array $reqBody, array $validationFieldsBody): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $responseData = $this->uploadChunk(
             $client,
@@ -245,7 +245,7 @@ public function addChunkFailedDataProvider(): array
 
     public function testFinishUploadFailed(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $responseData = $this->finishUpload(
             $client,

diff --git a/tests/Controller/Api/Adm/V1/JwDistributionControllerTest.php b/tests/Controller/Api/Adm/V1/JwDistributionControllerTest.php
@@ -26,7 +26,7 @@ final class JwDistributionControllerTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $payload = [
             'distributionService' => 'jw_cms_main',

diff --git a/tests/Controller/Api/Adm/V1/KeywordControllerTest.php b/tests/Controller/Api/Adm/V1/KeywordControllerTest.php
@@ -23,7 +23,7 @@ final class KeywordControllerTest extends AbstractApiController
      */
     public function testGetOneSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(KeywordUrl::getOne(KeywordFixtures::KEYWORD_1));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -47,7 +47,7 @@ public function testGetOneSuccess(): void
      */
     public function testSearchByExtSystemSuccess(): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->get(KeywordUrl::searchByExtSystem(ExtSystemFixtures::ID_CMS));
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
@@ -70,7 +70,7 @@ public function testSearchByExtSystemSuccess(): void
      */
     public function testCreateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->post(KeywordUrl::createPath(), $requestJson);
         $this->assertSame($expectedResponseStatusCode, $response->getStatusCode());
@@ -105,7 +105,7 @@ public function createSuccessDataProvider(): array
      */
     public function testCreateFailure(array $requestJson, array $validationErrors): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $response = $client->post(KeywordUrl::createPath(), $requestJson);
         $this->assertSame(Response::HTTP_UNPROCESSABLE_ENTITY, $response->getStatusCode());
@@ -156,7 +156,7 @@ public function createFailureDataProvider(): array
      */
     public function testUpdateSuccess(array $requestJson, int $expectedResponseStatusCode): void
     {
-        $client = $this->getClient(User::ID_ADMIN);
+        $client = $this->getApiClient(User::ID_ADMIN);
 
         $id = $requestJson['id'];
         $response = $client->put(KeywordUrl::update($id), $requestJson);