AC-14558::Migration form RabbitMQ to Apache ActiveMQ

Author: djadobe16

dev/tests/integration/testsuite/Magento/Framework/Stomp/TopologyTest.php

@@ -34,27 +34,32 @@ class TopologyTest extends TestCase
      */
     private $objectManager;
 
+
+    /**
+     * @var string
+     */
+    private $connectionType;
+
     /**
      * @return void
      */
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        
-        // Check if AMQP connection is available - skip STOMP test if AMQP is working
-        try {
-            $stompConfig = $this->objectManager->get(Config::class);
-            $stompConfig->getConnection();
-        } catch (\Throwable $e) {
-            $this->markTestSkipped('STOMP test skipped because AMQP connection is available. This test is STOMP-specific.');
-        }
 
-        $this->helper = $this->objectManager->create(Stomp::class);
+        // Check if STOMP is configured as the queue connection
+        /** @var \Magento\Framework\MessageQueue\DefaultValueProvider $defaultValueProvider */
+        $defaultValueProvider = $this->objectManager->get(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->connectionType = $defaultValueProvider->getConnection();
+
+        if($this->connectionType === 'stomp') {
+            $this->helper = $this->objectManager->create(Stomp::class);
 
-        if (!$this->helper->isAvailable()) {
-            $this->fail('This test relies on ActiveMq JMX/Jalokia.');
+            if (!$this->helper->isAvailable()) {
+                $this->fail('This test relies on ActiveMq JMX/Jalokia.');
+            }
+            $this->declaredQueues = $this->helper->getQueues();
         }
-        $this->declaredQueues = $this->helper->getQueues();
     }
 
     /**
@@ -63,6 +68,10 @@ protected function setUp(): void
      */
     public function testTopologyInstallation(array $expectedConfig): void
     {
+        if($this->connectionType !== 'stomp') {
+            $this->markTestSkipped('STOMP test skipped because AMQP connection is available. This test is STOMP-specific.');
+        }
+
         $name = $expectedConfig['name'];
         $this->assertArrayHasKey($name, $this->declaredQueues);
 

dev/tests/integration/testsuite/Magento/Framework/Stomp/WaitAndNotWaitMessagesTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Filesystem;
 use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestModuleAsyncStomp\Model\AsyncTestData;
 
 class WaitAndNotWaitMessagesTest extends QueueTestCaseAbstract
@@ -49,24 +50,28 @@ class WaitAndNotWaitMessagesTest extends QueueTestCaseAbstract
      */
     protected $maxMessages = 4;
 
+    /**
+     * @var string
+     */
+    private $connectionType;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        // Check if STOMP connection is available
-        try {
-            $stompConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                ->get(\Magento\Framework\Stomp\Config::class);
-            $stompConfig->getConnection();
-        } catch (\Exception $e) {
-            $this->markTestSkipped('STOMP test skipped because AMQP connection is available. This test is STOMP-specific');
+        $this->objectManager = Bootstrap::getObjectManager();
+        // Check if STOMP is configured as the queue connection
+        /** @var \Magento\Framework\MessageQueue\DefaultValueProvider $defaultValueProvider */
+        $defaultValueProvider = $this->objectManager->get(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->connectionType = $defaultValueProvider->getConnection();
+
+        if ($this->connectionType === 'stomp') {
+            parent::setUp();
+            $this->reader = $this->objectManager->get(FileReader::class);
+            $this->filesystem = $this->objectManager->get(Filesystem::class);
+            $this->config = $this->loadConfig();
         }
-
-        parent::setUp();
-        $this->reader = $this->objectManager->get(FileReader::class);
-        $this->filesystem = $this->objectManager->get(Filesystem::class);
-        $this->config = $this->loadConfig();
     }
 
     /**
@@ -88,6 +93,10 @@ private function getMsgObject(): AsyncTestData
      */
     public function testWaitForMessages()
     {
+        if ($this->connectionType !== 'stomp'){
+            $this->markTestSkipped('STOMP test skipped because AMQP connection is available. This test is STOMP-specific.');
+        }
+
         $this->publisherConsumerController->stopConsumers();
 
         $config = $this->config;
@@ -119,6 +128,10 @@ public function testWaitForMessages()
      */
     public function testNotWaitForMessages(): void
     {
+        if ($this->connectionType !== 'stomp'){
+            $this->markTestSkipped('STOMP test skipped because AMQP connection is available. This test is STOMP-specific.');
+        }
+
         $this->publisherConsumerController->stopConsumers();
 
         $config = $this->config;