fixes test

Signed-off-by: ChrisJBurns <[email protected]>

Author: ChrisJBurns

pkg/mcp/server/handler_test.go

@@ -22,32 +22,29 @@ func TestParseRunServerArgs(t *testing.T) {
 	}{
 		{
 			name: "valid args with all fields",
-			request: func() *mcp.CallToolRequest {
-				argsJSON, _ := json.Marshal(map[string]interface{}{
+			request: &mcp.CallToolRequest{
+				Params: &mcp.CallToolParamsRaw{
+					Arguments: json.RawMessage(`{
 					"server": "test-server",
 					"name":   "custom-name",
 					"host":   "192.168.1.1",
-					"env": map[string]interface{}{
+					"env": {
 						"KEY1": "value1",
-						"KEY2": "value2",
+						"KEY2": "value2"
 					},
-					"secrets": []interface{}{
-						map[string]interface{}{
+					"secrets": [
+						{
 							"name":   "github-token",
-							"target": "GITHUB_TOKEN",
+							"target": "GITHUB_TOKEN"
 						},
-						map[string]interface{}{
+						{
 							"name":   "api-key",
-							"target": "API_KEY",
-						},
-					},
-				})
-				return &mcp.CallToolRequest{
-					Params: &mcp.CallToolParamsRaw{
-						Arguments: argsJSON,
-					},
-				}
-			}(),
+							"target": "API_KEY"
+						}
+					]
+					}`),
+				},
+			},
 			expected: &runServerArgs{
 				Server: "test-server",
 				Name:   "custom-name",
@@ -65,16 +62,13 @@ func TestParseRunServerArgs(t *testing.T) {
 		},
 		{
 			name: "minimal args - server only",
-			request: func() *mcp.CallToolRequest {
-				argsJSON, _ := json.Marshal(map[string]interface{}{
-					"server": "test-server",
-				})
-				return &mcp.CallToolRequest{
-					Params: &mcp.CallToolParamsRaw{
-						Arguments: argsJSON,
-					},
-				}
-			}(),
+			request: &mcp.CallToolRequest{
+				Params: &mcp.CallToolParamsRaw{
+					Arguments: json.RawMessage(`{
+						"server": "test-server"
+					}`),
+				},
+			},
 			expected: &runServerArgs{
 				Server:  "test-server",
 				Name:    "test-server", // Should default to server name
@@ -86,17 +80,14 @@ func TestParseRunServerArgs(t *testing.T) {
 		},
 		{
 			name: "empty name defaults to server name",
-			request: func() *mcp.CallToolRequest {
-				argsJSON, _ := json.Marshal(map[string]interface{}{
+			request: &mcp.CallToolRequest{
+				Params: &mcp.CallToolParamsRaw{
+					Arguments: json.RawMessage(`{
 					"server": "my-server",
-					"name":   "",
-				})
-				return &mcp.CallToolRequest{
-					Params: &mcp.CallToolParamsRaw{
-						Arguments: argsJSON,
-					},
-				}
-			}(),
+					"name":   ""
+				}`),
+				},
+			},
 			expected: &runServerArgs{
 				Server:  "my-server",
 				Name:    "my-server",
@@ -108,17 +99,14 @@ func TestParseRunServerArgs(t *testing.T) {
 		},
 		{
 			name: "empty host defaults to 127.0.0.1",
-			request: func() *mcp.CallToolRequest {
-				argsJSON, _ := json.Marshal(map[string]interface{}{
+			request: &mcp.CallToolRequest{
+				Params: &mcp.CallToolParamsRaw{
+					Arguments: json.RawMessage(`{
 					"server": "test-server",
-					"host":   "",
-				})
-				return &mcp.CallToolRequest{
-					Params: &mcp.CallToolParamsRaw{
-						Arguments: argsJSON,
-					},
-				}
-			}(),
+					"host":   ""
+				}`),
+				},
+			},
 			expected: &runServerArgs{
 				Server:  "test-server",
 				Name:    "test-server",