Add new test cases and fix validation/schema logic

Added test cases for message handling with invalid params, missing methods, and exception scenarios. Updated ToolParamsValidatorTest to fix argument type checks in schemas. Also updated composer dependencies to include symfony/routing for expanded functionality.

Author: klapaudius

composer.json

@@ -11,7 +11,8 @@
         "psr/log": "^3.0",
         "symfony/console": "~7.0",
         "symfony/dependency-injection": "~7.0",
-        "symfony/http-foundation": "~7.0"
+        "symfony/http-foundation": "~7.0",
+        "symfony/routing": "^7.2"
     },
     "require-dev": {
         "phpunit/phpunit": "~11.0",

tests/Protocol/MCPProtocolTest.php

@@ -2,6 +2,8 @@
 
 namespace KLP\KlpMcpServer\Tests\Protocol;
 
+use KLP\KlpMcpServer\Exceptions\ToolParamsValidatorException;
+use KLP\KlpMcpServer\Protocol\Handlers\NotificationHandler;
 use KLP\KlpMcpServer\Protocol\MCPProtocol;
 use KLP\KlpMcpServer\Transports\TransportInterface;
 use PHPUnit\Framework\Attributes\Small;
@@ -202,7 +204,7 @@ public function test_handle_message_handles_valid_notification(): void
         $clientId = 'client_1';
         $validNotificationMessage = ['jsonrpc' => '2.0', 'method' => 'notify.method', 'params' => ['param1' => 'value1']];
 
-        $mockHandler = $this->createMock(\KLP\KlpMcpServer\Protocol\Handlers\NotificationHandler::class);
+        $mockHandler = $this->createMock(NotificationHandler::class);
         $mockHandler->method('isHandle')->with('notify.method')->willReturn(true);
         $mockHandler->expects($this->once())->method('execute')->with(['param1' => 'value1']);
         $this->mcpProtocol->registerNotificationHandler($mockHandler);
@@ -262,4 +264,108 @@ public function test_handle_message_handles_unknown_notification(): void
 
         $this->mcpProtocol->handleMessage($clientId, $unknownNotificationMessage);
     }
+
+    public function test_handle_message_handles_no_method(): void
+    {
+        $clientId = 'client_1';
+        $noMethodMessage = ['jsonrpc' => '2.0', 'id' => 1];
+
+        $this->mockTransport
+            ->expects($this->once())
+            ->method('pushMessage')
+            ->with($this->callback(function (...$args) use ($clientId) {
+                $data = $args[1];
+                $this->assertEquals($clientId, $args[0]);
+                $this->assertEquals('2.0', $data['jsonrpc']);
+                $this->assertEquals(1, $data['id']);
+                $this->assertEquals(-32600, $data['error']['code']);
+                $this->assertEquals('Invalid Request: Message format not recognized', $data['error']['message']);
+                return true;
+            }));
+
+        $this->mcpProtocol->handleMessage($clientId, $noMethodMessage);
+    }
+
+    public function test_handle_message_handles_invalid_params(): void
+    {
+        $clientId = 'client_1';
+        $invalidParamsMessage = ['jsonrpc' => '2.0', 'id' => 1, 'method' => 'test.method', 'params' => ['param1' => 'invalid']];
+
+        $mockHandler = $this->createMock(\KLP\KlpMcpServer\Protocol\Handlers\RequestHandler::class);
+        $mockHandler->method('isHandle')->with('test.method')->willReturn(true);
+        $mockHandler->method('execute')->with('test.method', ['param1' => 'invalid'])
+            ->willThrowException(new ToolParamsValidatorException('An error occurred.', ['Invalid params param1']));
+
+        $this->mockTransport
+            ->expects($this->once())
+            ->method('pushMessage')
+            ->with($this->callback(function (...$args) use ($clientId) {
+                $data = $args[1];
+                $this->assertEquals($clientId, $args[0]);
+                $this->assertEquals('2.0', $data['jsonrpc']);
+                $this->assertEquals(1, $data['id']);
+                $this->assertEquals(-32602, $data['error']['code']);
+
+                $this->assertEquals('An error occurred. Invalid params param1', $data['error']['message']);
+                return true;
+            }));
+
+        $this->mcpProtocol->registerRequestHandler($mockHandler);
+        $this->mcpProtocol->handleMessage($clientId, $invalidParamsMessage);
+    }
+
+    public function test_handle_message_handles_handler_throw_exception(): void
+    {
+        // Arrange
+        $clientId = 'client_1';
+        $invalidParamsMessage = ['jsonrpc' => '2.0', 'id' => 1, 'method' => 'test.method', 'params' => ['param1' => 'invalid']];
+        $mockHandler = $this->createMock(\KLP\KlpMcpServer\Protocol\Handlers\RequestHandler::class);
+        $mockHandler->method('isHandle')->with('test.method')->willReturn(true);
+        $mockHandler->method('execute')->with('test.method', ['param1' => 'invalid'])
+            ->willThrowException(new \Exception('An error occurred.'));
+
+        $this->mockTransport
+            ->expects($this->once())
+            ->method('pushMessage')
+            ->with($this->callback(function (...$args) use ($clientId) {
+                $data = $args[1];
+                $this->assertEquals($clientId, $args[0]);
+                $this->assertEquals('2.0', $data['jsonrpc']);
+                $this->assertEquals(1, $data['id']);
+                $this->assertEquals(-32603, $data['error']['code']);
+                $this->assertEquals('An error occurred.', $data['error']['message']);
+                return true;
+            }));
+        $this->mcpProtocol->registerRequestHandler($mockHandler);
+
+        // Act
+        $this->mcpProtocol->handleMessage($clientId, $invalidParamsMessage);
+    }
+
+    public function test_handle_message_handles_notification_handler_throw_exception(): void
+    {
+        $clientId = 'client_1';
+        $validNotificationMessage = ['jsonrpc' => '2.0', 'method' => 'notify.method', 'params' => ['param1' => 'value1']];
+
+        $mockHandler = $this->createMock(NotificationHandler::class);
+        $mockHandler->method('isHandle')->with('notify.method')->willReturn(true);
+        $mockHandler->expects($this->once())->method('execute')
+            ->with(['param1' => 'value1'])
+        ->willThrowException(new \Exception('An error occurred.'));;
+        $this->mcpProtocol->registerNotificationHandler($mockHandler);
+
+        $this->mockTransport
+            ->expects($this->once())
+            ->method('pushMessage')
+            ->with($this->callback(function (...$args) use ($clientId) {
+                $data = $args[1];
+                $this->assertEquals($clientId, $args[0]);
+                $this->assertEquals('2.0', $data['jsonrpc']);
+                $this->assertEquals(-32603, $data['error']['code']);
+                $this->assertEquals('An error occurred.', $data['error']['message']);
+                return true;
+            }));
+
+        $this->mcpProtocol->handleMessage($clientId, $validNotificationMessage);
+    }
 }

tests/Services/ToolService/ToolParamsValidatorTest.php

@@ -75,13 +75,13 @@ public function test_validate_with_invalid_argument_not_in_schema(): void
     {
         $toolSchema = [
             'arguments' => [
-                'arg1' => ['type' => 'string'],
+                'arg1' => ['type' => 'array'],
             ],
             'required' => ['arg1'],
         ];
 
         $arguments = [
-            'arg1' => 'validString',
+            'arg1' => ['validArray'],
             'arg2' => 'extra',
         ];
 
@@ -101,7 +101,7 @@ public function test_validate_with_invalid_argument_type(): void
         $toolSchema = [
             'arguments' => [
                 'arg1' => ['type' => 'string'],
-                'arg2' => ['type' => 'integer'],
+                'arg2' => ['type' => 'boolean'],
             ],
             'required' => ['arg1', 'arg2'],
         ];
@@ -117,7 +117,7 @@ public function test_validate_with_invalid_argument_type(): void
         try {
             ToolParamsValidator::validate($toolSchema, $arguments);
         } catch (ToolParamsValidatorException $exception) {
-            $this->assertContains('Invalid argument type for: arg2. Expected: integer, got: string', $exception->getErrors());
+            $this->assertContains('Invalid argument type for: arg2. Expected: boolean, got: string', $exception->getErrors());
             throw $exception;
         }
     }