Merge pull request magento#1841 from engcom-Golf/asi-1839

Fix Adobe Stock Integration SOAP WebAPI tests

Author: sivaschenko

AdobeStockAsset/Model/Asset.php

@@ -112,7 +112,7 @@ public function getCreationDate(): string
     /**
      * @inheritdoc
      */
-    public function getExtensionAttributes(): AssetExtensionInterface
+    public function getExtensionAttributes(): ?AssetExtensionInterface
     {
         return $this->_getExtensionAttributes();
     }

AdobeStockAsset/Test/Api/AssetRepository/DeleteByIdTest.php

@@ -73,7 +73,7 @@ private function verifyAssetDeleted(): void
                     $e,
                     $expectedMessage,
                     'env:Sender',
-                    [1 => self::FIXTURE_ASSET_ID]
+                    ['id' => self::FIXTURE_ASSET_ID]
                 );
             } else {
                 throw $e;

AdobeStockAsset/Test/Api/AssetRepository/GetByIdTest.php

@@ -58,7 +58,7 @@ public function testGetNoSuchEntityException(): void
                 self::assertEquals(Exception::HTTP_NOT_FOUND, $e->getCode());
             } elseif (constant('TESTS_WEB_API_ADAPTER') === self::ADAPTER_SOAP) {
                 $this->assertInstanceOf('SoapFault', $e);
-                $this->checkSoapFault($e, $expectedMessage, 'env:Sender', [1 => $notExistedAssetId]);
+                $this->checkSoapFault($e, $expectedMessage, 'env:Sender', ['id' => $notExistedAssetId]);
             } else {
                 throw $e;
             }

AdobeStockAsset/Test/Api/AssetRepository/GetListTest.php

@@ -22,7 +22,7 @@
 class GetListTest extends WebapiAbstract
 {
     private const RESOURCE_PATH = '/V1/adobestock/asset/search';
-    private const SERVICE_NAME = 'adobeStockAssetApiGetAssetListV1';
+    private const SERVICE_NAME = 'adobeStockAssetApiAssetRepositoryV1';
 
     /**
      * Test getting the Adobe Stock image by search criteria.
@@ -74,7 +74,7 @@ public function testGetList(): void
             ],
         ];
 
-        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+        $response = $this->_webApiCall($serviceInfo, $requestData);
 
         $this->assertArrayHasKey('search_criteria', $response);
         $this->assertArrayHasKey('total_count', $response);

AdobeStockAsset/Test/Api/SearchAdobeStockTest.php

@@ -25,18 +25,26 @@ class SearchAdobeStockTest extends WebapiAbstract
     private const SERVICE_NAME = 'adobeStockAssetApiGetAssetListV1';
     private const REQUEST_NAME = 'search_adobe_stock_content';
 
+    /**
+     * @inheridoc
+     */
+    protected function setUp(): void
+    {
+        $this->markTestSkipped("The test requires adobe stock credentials and cannot be currently executed on CICD");
+    }
+
     /**
      * Test get list WEB API method.
      *
      * @return void
      */
     public function testGetList(): void
     {
-        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-        $searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+        /** @var SearchCriteriaBuilder $criteriaBuilder */
+        $criteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
 
-        $searchCriteriaBuilder->setPageSize(32);
-        $searchCriteriaBuilder->setCurrentPage(1);
+        $criteriaBuilder->setPageSize(32);
+        $criteriaBuilder->setCurrentPage(1);
 
         /** @var FilterBuilder $filterBuilder */
         $filterBuilder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
@@ -60,22 +68,22 @@ public function testGetList(): void
             ->setConditionType('eq')
             ->create();
 
-        /** @var FilterGroupBuilder $filterGroupBuilder */
-        $filterGroupBuilder = Bootstrap::getObjectManager()->create(FilterGroupBuilder::class);
-        $wordsFilterGroup = $filterGroupBuilder->setFilters([$wordsFilter])->create();
-        $contentTypeFilterGroup = $filterGroupBuilder->setFilters([$illustrationFilter, $photoFilter])->create();
-        $premiumPriceFilterGroup = $filterGroupBuilder->setFilters([$premiumPriceFilter])->create();
+        /** @var FilterGroupBuilder $groupBuilder */
+        $groupBuilder = Bootstrap::getObjectManager()->create(FilterGroupBuilder::class);
+        $wordsFilterGroup = $groupBuilder->setFilters([$wordsFilter])->create();
+        $contentFilterGroup = $groupBuilder->setFilters([$illustrationFilter, $photoFilter])->create();
+        $priceFilterGroup = $groupBuilder->setFilters([$premiumPriceFilter])->create();
 
         /** @var SortOrderBuilder $sortOrderBuilder */
         $sortOrderBuilder = Bootstrap::getObjectManager()->create(SortOrderBuilder::class);
         $sortOrder = $sortOrderBuilder->setField('id')
             ->setDirection(SortOrder::SORT_DESC)
             ->create();
 
-        $searchCriteria = $searchCriteriaBuilder->create();
+        $searchCriteria = $criteriaBuilder->create();
         $searchCriteria->setSortOrders([$sortOrder]);
         $searchCriteria->setRequestName(self::REQUEST_NAME);
-        $searchCriteria->setFilterGroups([$wordsFilterGroup, $contentTypeFilterGroup, $premiumPriceFilterGroup]);
+        $searchCriteria->setFilterGroups([$wordsFilterGroup, $contentFilterGroup, $priceFilterGroup]);
 
         $requestData = ['search_criteria' => $searchCriteria->__toArray()];
 
@@ -86,11 +94,11 @@ public function testGetList(): void
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
-                'operation' => self::SERVICE_NAME . 'GetList',
+                'operation' => self::SERVICE_NAME . 'Execute',
             ],
         ];
 
-        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+        $response = $this->_webApiCall($serviceInfo, $requestData);
 
         $this->assertArrayHasKey('search_criteria', $response);
         $this->assertArrayHasKey('total_count', $response);

AdobeStockAssetApi/Api/Data/AssetInterface.php

@@ -75,9 +75,9 @@ public function getCreationDate(): string;
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
-     * @return \Magento\AdobeStockAssetApi\Api\Data\AssetExtensionInterface
+     * @return \Magento\AdobeStockAssetApi\Api\Data\AssetExtensionInterface|null
      */
-    public function getExtensionAttributes(): AssetExtensionInterface;
+    public function getExtensionAttributes(): ?AssetExtensionInterface;
 
     /**
      * Set an extension attributes object.

AdobeStockImage/Test/Api/SearchExecuteTest.php

@@ -24,6 +24,19 @@ class SearchExecuteTest extends WebapiAbstract
     private const RESOURCE_PATH = '/V1/adobestock/search';
     private const SERVICE_NAME = 'adobeStockImageApiGetImageListV1';
 
+    /**
+     * @inheridoc
+     */
+    protected function setUp(): void
+    {
+        $this->markTestSkipped("The test requires adobe stock credentials and cannot be currently executed on CICD");
+    }
+
+    /**
+     * Test search WEB API method.
+     *
+     * @return void
+     */
     public function testSearchExecute(): void
     {
         /** @var SearchCriteriaBuilder $searchCriteriaBuilder */