Merge remote-tracking branch '34232/improving-message-queue-error-message' into comm_78764_31355

Author: Indraniks

lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php

@@ -14,6 +14,7 @@
 use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
 use Magento\Framework\MessageQueue\Topology\Config\Data;
 use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem\DataMapper;
+use Magento\Framework\Phrase;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -289,4 +290,46 @@ public function testGetMappedDataForWildcard(): void
         ];
         $this->assertEquals($expectedResult, $actualResult);
     }
+
+    /**
+     * @return void
+     */
+    public function testTopicIsSynchronousException(): void
+    {
+        $topicName = 'topic01';
+        $data = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => $topicName,
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->communicationConfigMock->expects($this->exactly(1))
+            ->method('getTopic')
+            ->willThrowException(new LocalizedException(
+                new Phrase('Topic "%topic" is not configured.', ['topic' => $topicName])
+            ));
+
+        $this->configDataMock->expects($this->once())->method('get')->willReturn($data);
+
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage(sprintf('Error while checking if topic "%s" is synchronous', $topicName));
+
+        $this->model->getMappedData();
+    }
 }

lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php

@@ -145,7 +145,9 @@ private function isSynchronousTopic(string $topicName): bool
             $topic = $this->communicationConfig->getTopic($topicName);
             return (bool)$topic[CommunicationConfig::TOPIC_IS_SYNCHRONOUS];
         } catch (LocalizedException $exception) {
-            throw new LocalizedException(new Phrase('Error while checking if topic is synchronous'));
+            throw new LocalizedException(
+                new Phrase('Error while checking if topic "%topic" is synchronous', ['topic' => $topicName])
+            );
         }
     }