B2B-2155: Use Redis as message queue

- fix integration test failures, add clear queue

Author: joanhe

dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssignTest.php

@@ -19,7 +19,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -35,8 +35,8 @@ class ConsumerWebsiteAssignTest extends TestCase
 {
     private const TOPIC_NAME = 'product_action_attribute.website.update';
 
-    /** @var DeleteTopicRelatedMessages */
-    private static $deleteTopicRelatedMessages;
+    /** @var ClearQueueProcessor */
+    private static $clearQueueProcessor;
 
     /** @var ObjectManagerInterface */
     private $objectManager;
@@ -67,8 +67,8 @@ public static function setUpBeforeClass(): void
         parent::setUpBeforeClass();
 
         $objectManager = Bootstrap::getObjectManager();
-        self::$deleteTopicRelatedMessages = $objectManager->get(DeleteTopicRelatedMessages::class);
-        self::$deleteTopicRelatedMessages->execute(self::TOPIC_NAME);
+        self::$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+        self::$clearQueueProcessor->execute('product_action_attribute.website.update');
     }
 
     /**
@@ -93,7 +93,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->objectManager->removeSharedInstance(Action::class);
-        self::$deleteTopicRelatedMessages->execute(self::TOPIC_NAME);
+        self::$clearQueueProcessor->execute('product_action_attribute.website.update');
 
         parent::tearDown();
     }

dev/tests/integration/testsuite/Magento/Catalog/_files/detach_product_website_quene_data_rollback.php

@@ -5,13 +5,13 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var DeleteTopicRelatedMessages $deleteTopicRelatedMessages */
-$deleteTopicRelatedMessages = $objectManager->get(DeleteTopicRelatedMessages::class);
-$deleteTopicRelatedMessages->execute('product_action_attribute.website.update');
+/** @var ClearQueueProcessor $clearQueueProcessor */
+$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+$clearQueueProcessor->execute('product_action_attribute.website.update');
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_with_two_websites_rollback.php');

dev/tests/integration/testsuite/Magento/Catalog/_files/update_product_website_quene_data_rollback.php

@@ -5,14 +5,14 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var DeleteTopicRelatedMessages $deleteTopicRelatedMessages */
-$deleteTopicRelatedMessages = $objectManager->get(DeleteTopicRelatedMessages::class);
-$deleteTopicRelatedMessages->execute('product_action_attribute.website.update');
+/** @var ClearQueueProcessor $clearQueueProcessor */
+$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+$clearQueueProcessor->execute('product_action_attribute.website.update');
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores_rollback.php');

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithNotExistImagesTest.php

@@ -25,7 +25,7 @@
 use Magento\ImportExport\Model\Import\Source\Csv as CsvSource;
 use Magento\ImportExport\Model\Import\Source\CsvFactory;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -73,9 +73,9 @@ public static function setUpBeforeClass(): void
         parent::setUpBeforeClass();
 
         $objectManager = Bootstrap::getObjectManager();
-        /** @var  DeleteTopicRelatedMessages $deleteMessages */
-        $deleteMessages = $objectManager->get(DeleteTopicRelatedMessages::class);
-        $deleteMessages->execute(self::TOPIC);
+        /** @var  ClearQueueProcessor $clearQueueProcessor */
+        $clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+        $clearQueueProcessor->execute('exportProcessor');
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/export_queue_product_with_images_rollback.php

@@ -5,13 +5,13 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var DeleteTopicRelatedMessages $deleteTopicRelatedMessages */
-$deleteTopicRelatedMessages = $objectManager->get(DeleteTopicRelatedMessages::class);
-$deleteTopicRelatedMessages->execute('import_export.export');
+/** @var ClearQueueProcessor $clearQueueProcessor */
+$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+$clearQueueProcessor->execute('exportProcessor');
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_with_image_rollback.php');

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/ConsumerTest.php

@@ -20,6 +20,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\ImportExport\Model\Export\Entity\ExportInfoFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -101,6 +102,7 @@ protected function tearDown(): void
     public function testProcess(): void
     {
         $objectManager = Bootstrap::getObjectManager();
+        $objectManager->get(ClearQueueProcessor::class)->execute('exportProcessor');
         /** @var ExportInfoFactory $exportInfoFactory */
         $exportInfoFactory = $objectManager->get(ExportInfoFactory::class);
         /** @var PublisherInterface $messagePublisher */

dev/tests/integration/testsuite/Magento/ImportExport/_files/export_queue_data_rollback.php

@@ -5,13 +5,13 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var DeleteTopicRelatedMessages $deleteTopicRelatedMessages */
-$deleteTopicRelatedMessages = $objectManager->get(DeleteTopicRelatedMessages::class);
-$deleteTopicRelatedMessages->execute('import_export.export');
+/** @var ClearQueueProcessor $clearQueueProcessor */
+$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+$clearQueueProcessor->execute('exportProcessor');
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');