@@ -22,32 +22,29 @@ func TestParseRunServerArgs(t *testing.T) {
2222 }{
2323 {
2424 name : "valid args with all fields" ,
25- request : func () * mcp.CallToolRequest {
26- argsJSON , _ := json .Marshal (map [string ]interface {}{
25+ request : & mcp.CallToolRequest {
26+ Params : & mcp.CallToolParamsRaw {
27+ Arguments : json .RawMessage (`{
2728 "server": "test-server",
2829 "name": "custom-name",
2930 "host": "192.168.1.1",
30- "env" : map [ string ] interface {} {
31+ "env": {
3132 "KEY1": "value1",
32- "KEY2" : "value2" ,
33+ "KEY2": "value2"
3334 },
34- "secrets" : [] interface {}{
35- map [ string ] interface {} {
35+ "secrets": [
36+ {
3637 "name": "github-token",
37- "target" : "GITHUB_TOKEN" ,
38+ "target": "GITHUB_TOKEN"
3839 },
39- map [ string ] interface {} {
40+ {
4041 "name": "api-key",
41- "target" : "API_KEY" ,
42- },
43- },
44- })
45- return & mcp.CallToolRequest {
46- Params : & mcp.CallToolParamsRaw {
47- Arguments : argsJSON ,
48- },
49- }
50- }(),
42+ "target": "API_KEY"
43+ }
44+ ]
45+ }` ),
46+ },
47+ },
5148 expected : & runServerArgs {
5249 Server : "test-server" ,
5350 Name : "custom-name" ,
@@ -65,16 +62,13 @@ func TestParseRunServerArgs(t *testing.T) {
6562 },
6663 {
6764 name : "minimal args - server only" ,
68- request : func () * mcp.CallToolRequest {
69- argsJSON , _ := json .Marshal (map [string ]interface {}{
70- "server" : "test-server" ,
71- })
72- return & mcp.CallToolRequest {
73- Params : & mcp.CallToolParamsRaw {
74- Arguments : argsJSON ,
75- },
76- }
77- }(),
65+ request : & mcp.CallToolRequest {
66+ Params : & mcp.CallToolParamsRaw {
67+ Arguments : json .RawMessage (`{
68+ "server": "test-server"
69+ }` ),
70+ },
71+ },
7872 expected : & runServerArgs {
7973 Server : "test-server" ,
8074 Name : "test-server" , // Should default to server name
@@ -86,17 +80,14 @@ func TestParseRunServerArgs(t *testing.T) {
8680 },
8781 {
8882 name : "empty name defaults to server name" ,
89- request : func () * mcp.CallToolRequest {
90- argsJSON , _ := json .Marshal (map [string ]interface {}{
83+ request : & mcp.CallToolRequest {
84+ Params : & mcp.CallToolParamsRaw {
85+ Arguments : json .RawMessage (`{
9186 "server": "my-server",
92- "name" : "" ,
93- })
94- return & mcp.CallToolRequest {
95- Params : & mcp.CallToolParamsRaw {
96- Arguments : argsJSON ,
97- },
98- }
99- }(),
87+ "name": ""
88+ }` ),
89+ },
90+ },
10091 expected : & runServerArgs {
10192 Server : "my-server" ,
10293 Name : "my-server" ,
@@ -108,17 +99,14 @@ func TestParseRunServerArgs(t *testing.T) {
10899 },
109100 {
110101 name : "empty host defaults to 127.0.0.1" ,
111- request : func () * mcp.CallToolRequest {
112- argsJSON , _ := json .Marshal (map [string ]interface {}{
102+ request : & mcp.CallToolRequest {
103+ Params : & mcp.CallToolParamsRaw {
104+ Arguments : json .RawMessage (`{
113105 "server": "test-server",
114- "host" : "" ,
115- })
116- return & mcp.CallToolRequest {
117- Params : & mcp.CallToolParamsRaw {
118- Arguments : argsJSON ,
119- },
120- }
121- }(),
106+ "host": ""
107+ }` ),
108+ },
109+ },
122110 expected : & runServerArgs {
123111 Server : "test-server" ,
124112 Name : "test-server" ,
0 commit comments