catch InvalidArgumentException, throw correct message, unit test

Author: ArtsiomBruneuski

lib/internal/Magento/Framework/Communication/Config/Validator.php

@@ -13,6 +13,7 @@
  */
 class Validator
 {
+    const INVALID_ANNOTATIONS = 123;
     /**
      * @var TypeProcessor
      */
@@ -47,7 +48,11 @@ public function validateResponseSchemaType($responseSchema, $topicName)
         try {
             $this->validateType($responseSchema);
         } catch (\InvalidArgumentException $e) {
-            throw $e;
+            throw new \LogicException(
+                'Response schema definition has wrong annotations',
+                self::INVALID_ANNOTATIONS,
+                $e
+            );
         } catch (\Exception $e) {
             throw new \LogicException(
                 sprintf(
@@ -70,7 +75,11 @@ public function validateRequestSchemaType($requestSchema, $topicName)
         try {
             $this->validateType($requestSchema);
         } catch (\InvalidArgumentException $e) {
-            throw $e;
+            throw new \LogicException(
+                'Response schema definition has wrong annotations',
+                self::INVALID_ANNOTATIONS,
+                $e
+            );
         } catch (\Exception $e) {
             throw new \LogicException(
                 sprintf(
@@ -94,8 +103,6 @@ public function validateResponseHandlersType($serviceName, $methodName, $handler
     {
         try {
             $this->methodsMap->getMethodParams($serviceName, $methodName);
-        } catch (\InvalidArgumentException $e) {
-            throw $e;
         } catch (\Exception $e) {
             throw new \LogicException(
                 sprintf(
@@ -115,6 +122,7 @@ public function validateResponseHandlersType($serviceName, $methodName, $handler
      * @param string $typeName
      * @return $this
      * @throws \Exception In case when type is invalid
+     * @throws \InvalidArgumentException
      */
     protected function validateType($typeName)
     {

lib/internal/Magento/Framework/Test/Unit/Communication/Config/ValidatorTest.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * m2git
+ */
+
+namespace Magento\Framework\Test\Unit\Communication\Config;
+
+
+use Magento\Framework\Communication\Config\Validator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+
+class ValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    protected $typeProcessor;
+    protected $methodsMap;
+
+    public function setUp()
+    {
+        $this->methodsMap = $this->createMock(MethodsMap::class);
+
+        $this->methodsMap->expects(static::any())
+            ->method('getMethodsMap')
+            ->will($this->throwException(new \InvalidArgumentException()));
+
+
+        $this->typeProcessor = $this->createMock(TypeProcessor::class);
+        $this->typeProcessor->expects(static::any())
+            ->method('isTypeSimple')
+            ->willReturn(false);
+
+        $this->typeProcessor->expects(static::any())
+            ->method('isTypeSimple')
+            ->willReturn(false);
+    }
+
+    /**
+     * @expectedException  \LogicException
+     * @expectedExceptionCode 123
+     */
+    public function testValidateResponseSchemaType()
+    {
+        /** @var Validator $validator */
+        $validator = new Validator($this->typeProcessor, $this->methodsMap);
+        $validator->validateResponseSchemaType('123', '123');
+    }
+
+    /**
+     * @expectedException  \LogicException
+     * @expectedExceptionCode 123
+     */
+    public function testValidateRequestSchemaType()
+    {
+        /** @var Validator $validator */
+        $validator = new Validator($this->typeProcessor, $this->methodsMap);
+        $validator->validateRequestSchemaType('123', '123');
+    }
+}