magento/adobe-stock-integration#1724: Support batches processing for synchronization queue messages - updated PR with requested changes and fixed failed integration test

Author: yolouiese

app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/SynchronizeIdentitiesCatalogTest.php renamed to app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/SynchronizeIdentitiesTest.php

@@ -13,14 +13,13 @@
 use Magento\MediaContentApi\Api\GetAssetIdsByContentIdentityInterface;
 use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaContentSynchronizationApi\Api\SynchronizeIdentitiesInterface;
-use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Test for catalog SynchronizeIdentities.
  */
-class SynchronizeIdentitiesCatalogTest extends TestCase
+class SynchronizeIdentitiesTest extends TestCase
 {
     private const ENTITY_TYPE = 'entityType';
     private const ENTITY_ID = 'entityId';
@@ -46,17 +45,11 @@ class SynchronizeIdentitiesCatalogTest extends TestCase
      */
     private $synchronizeIdentities;
 
-    /**
-     * @var SynchronizeInterface
-     */
-    private $synchronize;
-
     protected function setUp(): void
     {
         $this->contentIdentityFactory = Bootstrap::getObjectManager()->get(ContentIdentityInterfaceFactory::class);
         $this->getAssetIds = Bootstrap::getObjectManager()->get(GetAssetIdsByContentIdentityInterface::class);
         $this->synchronizeIdentities = Bootstrap::getObjectManager()->get(SynchronizeIdentitiesInterface::class);
-        $this->synchronize = Bootstrap::getObjectManager()->get(SynchronizeInterface::class);
         $this->getContentIdentities = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
     }
 
@@ -70,6 +63,8 @@ protected function setUp(): void
      */
     public function testExecute(array $mediaContentIdentities): void
     {
+        $assetId = 2020;
+
         $contentIdentities = [];
         foreach ($mediaContentIdentities as $mediaContentIdentity) {
             $contentIdentities[] = $this->contentIdentityFactory->create(
@@ -82,9 +77,9 @@ public function testExecute(array $mediaContentIdentities): void
         }
 
         $this->assertNotEmpty($contentIdentities);
+        $this->assertEmpty($this->getContentIdentities->execute([$assetId]));
         $this->synchronizeIdentities->execute($contentIdentities);
 
-        $assetId = 2020;
         $entityIds = [];
         foreach ($contentIdentities as $contentIdentity) {
             $this->assertEquals([$assetId], $this->getAssetIds->execute($contentIdentity));

app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/SynchronizeIdentitiesCmsTest.php renamed to app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/SynchronizeIdentitiesTest.php

@@ -13,14 +13,13 @@
 use Magento\MediaContentApi\Api\GetAssetIdsByContentIdentityInterface;
 use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaContentSynchronizationApi\Api\SynchronizeIdentitiesInterface;
-use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Test for CMS SynchronizeIdentities.
  */
-class SynchronizeIdentitiesCmsTest extends TestCase
+class SynchronizeIdentitiesTest extends TestCase
 {
     private const ENTITY_TYPE = 'entityType';
     private const ENTITY_ID = 'entityId';
@@ -46,17 +45,11 @@ class SynchronizeIdentitiesCmsTest extends TestCase
      */
     private $synchronizeIdentities;
 
-    /**
-     * @var SynchronizeInterface
-     */
-    private $synchronize;
-
     protected function setUp(): void
     {
         $this->contentIdentityFactory = Bootstrap::getObjectManager()->get(ContentIdentityInterfaceFactory::class);
         $this->getAssetIds = Bootstrap::getObjectManager()->get(GetAssetIdsByContentIdentityInterface::class);
         $this->synchronizeIdentities = Bootstrap::getObjectManager()->get(SynchronizeIdentitiesInterface::class);
-        $this->synchronize = Bootstrap::getObjectManager()->get(SynchronizeInterface::class);
         $this->getContentIdentities = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
     }
 
@@ -70,6 +63,8 @@ protected function setUp(): void
      */
     public function testExecute(array $mediaContentIdentities): void
     {
+        $assetId = 2020;
+
         $contentIdentities = [];
         foreach ($mediaContentIdentities as $mediaContentIdentity) {
             $contentIdentities[] = $this->contentIdentityFactory->create(
@@ -82,12 +77,11 @@ public function testExecute(array $mediaContentIdentities): void
         }
 
         $this->assertNotEmpty($contentIdentities);
+        $this->assertEmpty($this->getContentIdentities->execute([$assetId]));
         $this->synchronizeIdentities->execute($contentIdentities);
 
-        $assetId = 2020;
         $entityIds = [];
         foreach ($contentIdentities as $contentIdentity) {
-            $this->assertEquals([$assetId], $this->getAssetIds->execute($contentIdentity));
             $entityIds[] = $contentIdentity->getEntityId();
         }