B2B-2155: Use Redis as message queue

- fix MessageQueue framework integration tests

Author: joanhe

dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml

@@ -16,7 +16,7 @@
     <broker topic="deprecated.config.sync.bool.topic" type="db" exchange="customExchange">
         <queue consumer="deprecatedConfigSyncBoolConsumer" name="deprecated.config.queue.4"/>
     </broker>
-    <broker topic="overlapping.topic.declaration" type="db" exchange="overlappingDeprecatedExchange">
+    <broker topic="overlapping.topic.declaration" exchange="overlappingDeprecatedExchange">
         <queue consumer="overlappingConsumerDeclaration" name="consumer.config.queue" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" maxMessages="222" handler="Magento\TestModuleMessageQueueConfiguration\AsyncHandler::methodWithMixedParam"/>
     </broker>
 </config>

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Framework\MessageQueue\Consumer;
 
 use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
 
 /**
  * Test access to consumer configuration declared in deprecated queue.xml configs using Consumer\ConfigInterface.
@@ -19,9 +20,15 @@ class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->defaultValueProvider = $this->objectManager->get(DefaultValueProvider::class);
     }
 
     public function testGetConsumerMultipleHandlersFromCommunicationConfig()
@@ -53,7 +60,7 @@ public function testGetConsumerCustomHandler()
 
         $this->assertEquals('deprecatedConfigAsyncMixedConsumer', $consumer->getName());
         $this->assertEquals('deprecated.config.queue.3', $consumer->getQueue());
-        $this->assertEquals('db', $consumer->getConnection());
+        $this->assertEquals($this->defaultValueProvider->getConnection(), $consumer->getConnection());
         $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
         $this->assertNull($consumer->getMaxMessages());
 
@@ -91,7 +98,7 @@ public function testGetConsumerCustomConsumerAndMaxMessages()
 
         $this->assertEquals('deprecatedConfigAsyncStringConsumer', $consumer->getName());
         $this->assertEquals('deprecated.config.queue.1', $consumer->getQueue());
-        $this->assertEquals('db', $consumer->getConnection());
+        $this->assertEquals($this->defaultValueProvider->getConnection(), $consumer->getConnection());
         $this->assertEquals(\Magento\Framework\MessageQueue\BatchConsumer::class, $consumer->getConsumerInstance());
         $this->assertEquals(200, $consumer->getMaxMessages());
 

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\MessageQueue\Publisher;
 
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
 /**
  * Test access to publisher configuration declared in deprecated queue.xml configs using Publisher\ConfigInterface.
  *
@@ -17,9 +19,15 @@ class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->defaultValueProvider = $this->objectManager->get(DefaultValueProvider::class);
     }
 
     public function testGetPublisher()
@@ -31,7 +39,7 @@ public function testGetPublisher()
         $this->assertFalse($publisher->isDisabled());
 
         $connection = $publisher->getConnection();
-        $this->assertEquals('db', $connection->getName());
+        $this->assertEquals($this->defaultValueProvider->getConnection(), $connection->getName());
         $this->assertEquals('magento', $connection->getExchange());
         $this->assertFalse($connection->isDisabled());
     }
@@ -59,7 +67,7 @@ public function testGetOverlapWithQueueConfig()
         $this->assertFalse($publisher->isDisabled());
 
         $connection = $publisher->getConnection();
-        $this->assertEquals('db', $connection->getName());
+        $this->assertEquals($this->defaultValueProvider->getConnection(), $connection->getName());
         $this->assertEquals('magento', $connection->getExchange());
         $this->assertFalse($connection->isDisabled());
     }

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\MessageQueue\Topology;
 
+use Magento\Framework\MessageQueue\DefaultValueProvider;
 use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding\Iterator as BindingIterator;
 
 /**
@@ -19,9 +20,15 @@ class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->defaultValueProvider = $this->objectManager->get(DefaultValueProvider::class);
     }
 
     public function testGetTopology()
@@ -62,10 +69,10 @@ public function testGetTopologyOverlapWithQueueConfig()
     {
         /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
         $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
-        $topology = $config->getExchange('overlappingDeprecatedExchange', 'db');
+        $topology = $config->getExchange('overlappingDeprecatedExchange', $this->defaultValueProvider->getConnection());
         $this->assertEquals('overlappingDeprecatedExchange', $topology->getName());
         $this->assertEquals('topic', $topology->getType());
-        $this->assertEquals('db', $topology->getConnection());
+        $this->assertEquals($this->defaultValueProvider->getConnection(), $topology->getConnection());
         $this->assertTrue($topology->isDurable());
         $this->assertFalse($topology->isAutoDelete());
         $this->assertFalse($topology->isInternal());