MCP-826: Use RabbitMQ for all consumers if AMQP is set in deployment config

- Fix static tests;

Author: aa-kashk

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

@@ -6,14 +6,11 @@
 namespace Magento\Framework\MessageQueue\Consumer;
 
 use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
-use Magento\TestModuleMessageQueueConfiguration\AsyncHandler;
-use Magento\TestModuleMessageQueueConfiguration\SyncHandler;
 
 /**
  * Test access to consumer configuration declared in deprecated queue.xml configs using Consumer\ConfigInterface.
  *
  * @magentoCache config disabled
- * @SuppressWarnings(PHPMD)
  */
 class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
 {
@@ -43,9 +40,9 @@ public function testGetConsumerMultipleHandlersFromCommunicationConfig()
         $this->assertInstanceOf(HandlerIterator::class, $handlers);
         $this->assertCount(2, $handlers);
         $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
-        $this->assertEquals(AsyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals('Magento\TestModuleMessageQueueConfiguration\AsyncHandler', $handlers[0]->getType());
         $this->assertEquals('methodWithMixedParam', $handlers[1]->getMethod());
-        $this->assertEquals(AsyncHandler::class, $handlers[1]->getType());
+        $this->assertEquals('Magento\TestModuleMessageQueueConfiguration\AsyncHandler', $handlers[1]->getType());
     }
 
     public function testGetConsumerCustomHandler()
@@ -64,7 +61,7 @@ public function testGetConsumerCustomHandler()
         $this->assertInstanceOf(HandlerIterator::class, $handlers);
         $this->assertCount(1, $handlers);
         $this->assertEquals('methodWithMixedParam', $handlers[0]->getMethod());
-        $this->assertEquals(AsyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals('Magento\TestModuleMessageQueueConfiguration\AsyncHandler', $handlers[0]->getType());
     }
 
     public function testGetConsumerCustomConnectionSync()
@@ -83,7 +80,7 @@ public function testGetConsumerCustomConnectionSync()
         $this->assertInstanceOf(HandlerIterator::class, $handlers);
         $this->assertCount(1, $handlers);
         $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
-        $this->assertEquals(SyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals('Magento\TestModuleMessageQueueConfiguration\SyncHandler', $handlers[0]->getType());
     }
 
     public function testGetConsumerCustomConsumerAndMaxMessages()

lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php

@@ -164,7 +164,6 @@ private function buildConsumers($topics)
      *
      * @param array $topics
      * @return array
-     * @SuppressWarnings(PHPMD)
      */
     private function processWildcard($topics)
     {

lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php

@@ -58,7 +58,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function convert($source)
     {