B2B-2155: Use Redis as message queue

- fix ImportExport module integration tests

Author: joanhe

dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/ExportTest.php

@@ -9,9 +9,10 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Envelope;
+use Magento\Framework\MessageQueue\QueueRepository;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\MysqlMq\Model\QueueManagement;
-use Magento\MysqlMq\Model\ResourceModel\Message;
 use Magento\TestFramework\MysqlMq\DeleteTopicRelatedMessages;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
@@ -27,30 +28,33 @@ class ExportTest extends AbstractBackendController
 {
     private const TOPIC_NAME = 'import_export.export';
 
-    /** @var QueueManagement */
-    private $queueManagement;
-
-    /** @var Message */
-    private $queueMessageResource;
-
     /** @var SerializerInterface */
     private $json;
 
     /** @var DeleteTopicRelatedMessages */
     private $deleteTopicRelatedMessages;
 
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
     /**
      * @inheridoc
      */
     protected function setUp(): void
     {
         parent::setUp();
-
-        $this->queueManagement = $this->_objectManager->get(QueueManagement::class);
-        $this->queueMessageResource = $this->_objectManager->get(Message::class);
         $this->json = $this->_objectManager->get(SerializerInterface::class);
         $this->deleteTopicRelatedMessages = $this->_objectManager->get(DeleteTopicRelatedMessages::class);
         $this->deleteTopicRelatedMessages->execute(self::TOPIC_NAME);
+        $this->queueRepository = $this->_objectManager->get(QueueRepository::class);
+        $this->defaultValueProvider = $this->_objectManager->get(DefaultValueProvider::class);
     }
 
     /**
@@ -85,11 +89,11 @@ public function testExecute(): void
         $this->dispatch('backend/admin/export/export');
         $this->assertSessionMessages($this->containsEqual($expectedSessionMessage));
         $this->assertRedirect($this->stringContains('/export/index/key/'));
-        $messages = $this->queueManagement->readMessages('export');
-        $this->assertCount(1, $messages);
-        $message = reset($messages);
-        $this->assertEquals(self::TOPIC_NAME, $message[QueueManagement::MESSAGE_TOPIC]);
-        $body = $this->json->unserialize($message[QueueManagement::MESSAGE_BODY]);
+        $queue = $this->queueRepository->get($this->defaultValueProvider->getConnection(), 'export');
+        /** @var Envelope $message */
+        $message = $queue->dequeue();
+        $this->assertEquals(self::TOPIC_NAME, $message->getProperties()['topic_name']);
+        $body = $this->json->unserialize($message->getBody());
         $this->assertStringContainsString(ProductAttributeInterface::ENTITY_TYPE_CODE, $body['file_name']);
         $this->assertEquals($fileFormat, $body['file_format']);
         $actualFilter = $this->json->unserialize($body['export_filter']);

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

@@ -11,9 +11,10 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
 use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\QueueRepository;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\MysqlMq\Model\Driver\Queue;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -36,15 +37,22 @@ class ConsumerTest extends TestCase
     /** @var Consumer */
     private $consumer;
 
-    /** @var Queue */
-    private $queue;
-
     /** @var WriteInterface */
     private $directory;
 
     /** @var string */
     private $filePath;
 
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
     /**
      * @inheritdoc
      */
@@ -53,11 +61,12 @@ protected function setUp(): void
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->queue = $this->objectManager->create(Queue::class, ['queueName' => 'export']);
         $this->messageEncoder = $this->objectManager->get(MessageEncoder::class);
         $this->consumer = $this->objectManager->get(Consumer::class);
         $filesystem = $this->objectManager->get(Filesystem::class);
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $this->queueRepository = $this->objectManager->get(QueueRepository::class);
+        $this->defaultValueProvider = $this->objectManager->get(DefaultValueProvider::class);
     }
 
     /**
@@ -82,7 +91,8 @@ protected function tearDown(): void
      */
     public function testProcess(): void
     {
-        $envelope = $this->queue->dequeue();
+        $queue = $this->queueRepository->get($this->defaultValueProvider->getConnection(), 'export');
+        $envelope = $queue->dequeue();
         $decodedMessage = $this->messageEncoder->decode('import_export.export', $envelope->getBody());
         $this->consumer->process($decodedMessage);
         $this->filePath = 'export/' . $decodedMessage->getFileName();