refactor: enhance test assertions for improved clarity and consistency

Author: pushpak1300

tests/Feature/Mcp/Tools/BrowserLogsTest.php

@@ -205,8 +205,8 @@
     $content = $result->getContent();
     expect($content)->toContain('browser-logger-active')
         ->and($content)->toContain('</head>')
+        // Should not inject twice
         ->and(substr_count($content, 'browser-logger-active'))->toBe(1);
-    // Should not inject twice
 });
 
 test('InjectBoost middleware does not inject into non-HTML responses', function () {

tests/Feature/Mcp/Tools/DatabaseSchemaTest.php

@@ -40,36 +40,30 @@
     $response = $tool->handle([]);
 
     expect($response)->isToolResult()
-        ->toolHasNoError();
-
-    $responseArray = $response->toArray();
-
-    $schemaArray = json_decode($responseArray['content'][0]['text'], true);
-
-    expect($schemaArray)->toHaveKey('engine');
-    expect($schemaArray['engine'])->toBe('sqlite');
-
-    expect($schemaArray)->toHaveKey('tables');
-    expect($schemaArray['tables'])->toHaveKey('examples');
-
-    $exampleTable = $schemaArray['tables']['examples'];
-    expect($exampleTable)->toHaveKey('columns');
-    expect($exampleTable['columns'])->toHaveKey('id');
-    expect($exampleTable['columns'])->toHaveKey('name');
-
-    expect($exampleTable['columns']['id']['type'])->toBe('integer');
-    expect($exampleTable['columns']['name']['type'])->toBe('varchar');
-
-    expect($exampleTable)->toHaveKey('indexes');
-    expect($exampleTable)->toHaveKey('foreign_keys');
-    expect($exampleTable)->toHaveKey('triggers');
-    expect($exampleTable)->toHaveKey('check_constraints');
-
-    expect($schemaArray)->toHaveKey('global');
-    expect($schemaArray['global'])->toHaveKey('views');
-    expect($schemaArray['global'])->toHaveKey('stored_procedures');
-    expect($schemaArray['global'])->toHaveKey('functions');
-    expect($schemaArray['global'])->toHaveKey('sequences');
+        ->toolHasNoError()
+        ->toolJsonContent(function ($schemaArray) {
+            expect($schemaArray)->toHaveKey('engine')
+                ->and($schemaArray['engine'])->toBe('sqlite')
+                ->and($schemaArray)->toHaveKey('tables')
+                ->and($schemaArray['tables'])->toHaveKey('examples');
+
+            $exampleTable = $schemaArray['tables']['examples'];
+            expect($exampleTable)->toHaveKey('columns')
+                ->and($exampleTable['columns'])->toHaveKey('id')
+                ->and($exampleTable['columns'])->toHaveKey('name')
+                ->and($exampleTable['columns']['id']['type'])->toBe('integer')
+                ->and($exampleTable['columns']['name']['type'])->toBe('varchar')
+                ->and($exampleTable)->toHaveKey('indexes')
+                ->and($exampleTable)->toHaveKey('foreign_keys')
+                ->and($exampleTable)->toHaveKey('triggers')
+                ->and($exampleTable)->toHaveKey('check_constraints');
+
+            expect($schemaArray)->toHaveKey('global')
+                ->and($schemaArray['global'])->toHaveKey('views')
+                ->and($schemaArray['global'])->toHaveKey('stored_procedures')
+                ->and($schemaArray['global'])->toHaveKey('functions')
+                ->and($schemaArray['global'])->toHaveKey('sequences');
+        });
 });
 
 test('it filters tables by name', function () {
@@ -83,17 +77,19 @@
 
     // Test filtering for 'example'
     $response = $tool->handle(['filter' => 'example']);
-    $responseArray = $response->toArray();
-    $schemaArray = json_decode($responseArray['content'][0]['text'], true);
-
-    expect($schemaArray['tables'])->toHaveKey('examples');
-    expect($schemaArray['tables'])->not->toHaveKey('users');
+    expect($response)->isToolResult()
+        ->toolHasNoError()
+        ->toolJsonContent(function ($schemaArray) {
+            expect($schemaArray['tables'])->toHaveKey('examples')
+                ->and($schemaArray['tables'])->not->toHaveKey('users');
+        });
 
     // Test filtering for 'user'
     $response = $tool->handle(['filter' => 'user']);
-    $responseArray = $response->toArray();
-    $schemaArray = json_decode($responseArray['content'][0]['text'], true);
-
-    expect($schemaArray['tables'])->toHaveKey('users');
-    expect($schemaArray['tables'])->not->toHaveKey('examples');
+    expect($response)->isToolResult()
+        ->toolHasNoError()
+        ->toolJsonContent(function ($schemaArray) {
+            expect($schemaArray['tables'])->toHaveKey('users')
+                ->and($schemaArray['tables'])->not->toHaveKey('examples');
+        });
 });

tests/Feature/Mcp/Tools/TinkerTest.php

@@ -3,111 +3,99 @@
 declare(strict_types=1);
 
 use Laravel\Boost\Mcp\Tools\Tinker;
-use Laravel\Mcp\Server\Tools\ToolResult;
-
-function getToolResultData(ToolResult $result): array
-{
-    $data = $result->toArray();
-
-    return json_decode($data['content'][0]['text'], true);
-}
 
 test('executes simple php code', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'return 2 + 2;']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBe(4)
-        ->and($data['type'])->toBe('integer');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBe(4)
+                ->and($data['type'])->toBe('integer');
+        });
 });
 
 test('executes code with output', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'echo "Hello World"; return "test";']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBe('test')
-        ->and($data['output'])->toBe('Hello World')
-        ->and($data['type'])->toBe('string');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBe('test')
+                ->and($data['output'])->toBe('Hello World')
+                ->and($data['type'])->toBe('string');
+        });
 });
 
 test('accesses laravel facades', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'return config("app.name");']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBeString()
-        ->and($data['result'])->toBe(config('app.name'))
-        ->and($data['type'])->toBe('string');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBeString()
+                ->and($data['result'])->toBe(config('app.name'))
+                ->and($data['type'])->toBe('string');
+        });
 });
 
 test('creates objects', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'return new stdClass();']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['type'])->toBe('object')
-        ->and($data['class'])->toBe('stdClass');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['type'])->toBe('object')
+                ->and($data['class'])->toBe('stdClass');
+        });
 });
 
 test('handles syntax errors', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'invalid syntax here']);
 
-    expect($result)->isToolResult();
-
-    $resultArray = $result->toArray();
-    expect($resultArray['isError'])->toBeFalse();
-
-    $data = getToolResultData($result);
-    expect($data)->toHaveKey('error')
-        ->and($data)->toHaveKey('type')
-        ->and($data['type'])->toBe('ParseError');
+    expect($result)->isToolResult()
+        ->toolHasNoError()
+        ->toolJsonContent(function ($data) {
+            expect($data)->toHaveKey('error')
+                ->and($data)->toHaveKey('type')
+                ->and($data['type'])->toBe('ParseError');
+        });
 });
 
 test('handles runtime errors', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'throw new Exception("Test error");']);
 
-    expect($result)->isToolResult();
-
-    $resultArray = $result->toArray();
-    expect($resultArray['isError'])->toBeFalse();
-
-    $data = getToolResultData($result);
-    expect($data)->toHaveKey('error')
-        ->and($data['type'])->toBe('Exception')
-        ->and($data['error'])->toBe('Test error');
+    expect($result)->isToolResult()
+        ->toolHasNoError()
+        ->toolJsonContent(function ($data) {
+            expect($data)->toHaveKey('error')
+                ->and($data['type'])->toBe('Exception')
+                ->and($data['error'])->toBe('Test error');
+        });
 });
 
 test('captures multiple outputs', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'echo "First"; echo "Second"; return "done";']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBe('done')
-        ->and($data['output'])->toBe('FirstSecond');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBe('done')
+                ->and($data['output'])->toBe('FirstSecond');
+        });
 });
 
 test('executes code with different return types', function (string $code, mixed $expectedResult, string $expectedType) {
     $tool = new Tinker;
     $result = $tool->handle(['code' => $code]);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBe($expectedResult)
-        ->and($data['type'])->toBe($expectedType);
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) use ($expectedResult, $expectedType) {
+            expect($data['result'])->toBe($expectedResult)
+                ->and($data['type'])->toBe($expectedType);
+        });
 })->with([
     'integer' => ['return 42;', 42, 'integer'],
     'string' => ['return "hello";', 'hello', 'string'],
@@ -122,22 +110,22 @@ function getToolResultData(ToolResult $result): array
     $tool = new Tinker;
     $result = $tool->handle(['code' => '']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBeFalse()
-        ->and($data['type'])->toBe('boolean');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBeFalse()
+                ->and($data['type'])->toBe('boolean');
+        });
 });
 
 test('handles code with no return statement', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => '$x = 5;']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBeNull()
-        ->and($data['type'])->toBe('NULL');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBeNull()
+                ->and($data['type'])->toBe('NULL');
+        });
 });
 
 test('should register only in local environment', function () {
@@ -155,22 +143,22 @@ function getToolResultData(ToolResult $result): array
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'return 2 + 2;', 'timeout' => 10]);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBe(4)
-        ->and($data['type'])->toBe('integer');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBe(4)
+                ->and($data['type'])->toBe('integer');
+        });
 });
 
 test('uses default timeout when not specified', function () {
     $tool = new Tinker;
     $result = $tool->handle(['code' => 'return 2 + 2;']);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data['result'])->toBe(4)
-        ->and($data['type'])->toBe('integer');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data['result'])->toBe(4)
+                ->and($data['type'])->toBe('integer');
+        });
 });
 
 test('times out when code takes too long', function () {
@@ -187,9 +175,9 @@ function getToolResultData(ToolResult $result): array
 
     $result = $tool->handle(['code' => $slowCode, 'timeout' => 1]);
 
-    expect($result)->isToolResult();
-
-    $data = getToolResultData($result);
-    expect($data)->toHaveKey('error')
-        ->and($data['error'])->toMatch('/(Maximum execution time|Code execution timed out)/');
+    expect($result)->isToolResult()
+        ->toolJsonContent(function ($data) {
+            expect($data)->toHaveKey('error')
+                ->and($data['error'])->toMatch('/(Maximum execution time|Code execution timed out)/');
+        });
 });