internal/mcp: consolidate list tests

Change-Id: I7bc6cfcd4aae4b10703acbce77a5c93636ff8f49
Reviewed-on: https://go-review.googlesource.com/c/tools/+/680415
Reviewed-by: Robert Findley <rfindley@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Jonathan Amsterdam 2025-06-10 09:18:09 -04:00
commit bd88cac942

View file

@ -15,19 +15,20 @@ import (
"github.com/modelcontextprotocol/go-sdk/jsonschema" "github.com/modelcontextprotocol/go-sdk/jsonschema"
) )
func TestListTools(t *testing.T) { func TestList(t *testing.T) {
toolA := mcp.NewTool("apple", "apple tool", SayHi)
toolB := mcp.NewTool("banana", "banana tool", SayHi)
toolC := mcp.NewTool("cherry", "cherry tool", SayHi)
tools := []*mcp.ServerTool{toolA, toolB, toolC}
wantTools := []*mcp.Tool{toolA.Tool, toolB.Tool, toolC.Tool}
ctx := context.Background() ctx := context.Background()
clientSession, serverSession, server := createSessions(ctx) clientSession, serverSession, server := createSessions(ctx)
defer clientSession.Close() defer clientSession.Close()
defer serverSession.Close() defer serverSession.Close()
t.Run("tools", func(t *testing.T) {
toolA := mcp.NewTool("apple", "apple tool", SayHi)
toolB := mcp.NewTool("banana", "banana tool", SayHi)
toolC := mcp.NewTool("cherry", "cherry tool", SayHi)
tools := []*mcp.ServerTool{toolA, toolB, toolC}
wantTools := []*mcp.Tool{toolA.Tool, toolB.Tool, toolC.Tool}
server.AddTools(tools...) server.AddTools(tools...)
t.Run("ListTools", func(t *testing.T) { t.Run("list", func(t *testing.T) {
res, err := clientSession.ListTools(ctx, nil) res, err := clientSession.ListTools(ctx, nil)
if err != nil { if err != nil {
t.Fatal("ListTools() failed:", err) t.Fatal("ListTools() failed:", err)
@ -36,24 +37,19 @@ func TestListTools(t *testing.T) {
t.Fatalf("ListTools() mismatch (-want +got):\n%s", diff) t.Fatalf("ListTools() mismatch (-want +got):\n%s", diff)
} }
}) })
t.Run("ToolsIterator", func(t *testing.T) { t.Run("iterator", func(t *testing.T) {
testIterator(ctx, t, clientSession.Tools(ctx, nil), wantTools) testIterator(ctx, t, clientSession.Tools(ctx, nil), wantTools)
}) })
} })
func TestListResources(t *testing.T) { t.Run("resources", func(t *testing.T) {
resourceA := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://apple"}} resourceA := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://apple"}}
resourceB := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://banana"}} resourceB := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://banana"}}
resourceC := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://cherry"}} resourceC := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://cherry"}}
wantResources := []*mcp.Resource{resourceA.Resource, resourceB.Resource, resourceC.Resource} wantResources := []*mcp.Resource{resourceA.Resource, resourceB.Resource, resourceC.Resource}
resources := []*mcp.ServerResource{resourceA, resourceB, resourceC} resources := []*mcp.ServerResource{resourceA, resourceB, resourceC}
ctx := context.Background()
clientSession, serverSession, server := createSessions(ctx)
defer clientSession.Close()
defer serverSession.Close()
server.AddResources(resources...) server.AddResources(resources...)
t.Run("ListResources", func(t *testing.T) { t.Run("list", func(t *testing.T) {
res, err := clientSession.ListResources(ctx, nil) res, err := clientSession.ListResources(ctx, nil)
if err != nil { if err != nil {
t.Fatal("ListResources() failed:", err) t.Fatal("ListResources() failed:", err)
@ -62,12 +58,12 @@ func TestListResources(t *testing.T) {
t.Fatalf("ListResources() mismatch (-want +got):\n%s", diff) t.Fatalf("ListResources() mismatch (-want +got):\n%s", diff)
} }
}) })
t.Run("ResourcesIterator", func(t *testing.T) { t.Run("iterator", func(t *testing.T) {
testIterator(ctx, t, clientSession.Resources(ctx, nil), wantResources) testIterator(ctx, t, clientSession.Resources(ctx, nil), wantResources)
}) })
} })
func TestListResourceTemplates(t *testing.T) { t.Run("templates", func(t *testing.T) {
resourceTmplA := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://apple/{x}"}} resourceTmplA := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://apple/{x}"}}
resourceTmplB := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://banana/{x}"}} resourceTmplB := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://banana/{x}"}}
resourceTmplC := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://cherry/{x}"}} resourceTmplC := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://cherry/{x}"}}
@ -76,12 +72,8 @@ func TestListResourceTemplates(t *testing.T) {
resourceTmplC.ResourceTemplate, resourceTmplC.ResourceTemplate,
} }
resourceTemplates := []*mcp.ServerResourceTemplate{resourceTmplA, resourceTmplB, resourceTmplC} resourceTemplates := []*mcp.ServerResourceTemplate{resourceTmplA, resourceTmplB, resourceTmplC}
ctx := context.Background()
clientSession, serverSession, server := createSessions(ctx)
defer clientSession.Close()
defer serverSession.Close()
server.AddResourceTemplates(resourceTemplates...) server.AddResourceTemplates(resourceTemplates...)
t.Run("ListResourceTemplates", func(t *testing.T) { t.Run("list", func(t *testing.T) {
res, err := clientSession.ListResourceTemplates(ctx, nil) res, err := clientSession.ListResourceTemplates(ctx, nil)
if err != nil { if err != nil {
t.Fatal("ListResourceTemplates() failed:", err) t.Fatal("ListResourceTemplates() failed:", err)
@ -93,21 +85,16 @@ func TestListResourceTemplates(t *testing.T) {
t.Run("ResourceTemplatesIterator", func(t *testing.T) { t.Run("ResourceTemplatesIterator", func(t *testing.T) {
testIterator(ctx, t, clientSession.ResourceTemplates(ctx, nil), wantResourceTemplates) testIterator(ctx, t, clientSession.ResourceTemplates(ctx, nil), wantResourceTemplates)
}) })
} })
func TestListPrompts(t *testing.T) { t.Run("prompts", func(t *testing.T) {
promptA := mcp.NewPrompt("apple", "apple prompt", testPromptHandler[struct{}]) promptA := mcp.NewPrompt("apple", "apple prompt", testPromptHandler[struct{}])
promptB := mcp.NewPrompt("banana", "banana prompt", testPromptHandler[struct{}]) promptB := mcp.NewPrompt("banana", "banana prompt", testPromptHandler[struct{}])
promptC := mcp.NewPrompt("cherry", "cherry prompt", testPromptHandler[struct{}]) promptC := mcp.NewPrompt("cherry", "cherry prompt", testPromptHandler[struct{}])
wantPrompts := []*mcp.Prompt{promptA.Prompt, promptB.Prompt, promptC.Prompt} wantPrompts := []*mcp.Prompt{promptA.Prompt, promptB.Prompt, promptC.Prompt}
prompts := []*mcp.ServerPrompt{promptA, promptB, promptC} prompts := []*mcp.ServerPrompt{promptA, promptB, promptC}
ctx := context.Background()
clientSession, serverSession, server := createSessions(ctx)
defer clientSession.Close()
defer serverSession.Close()
server.AddPrompts(prompts...) server.AddPrompts(prompts...)
t.Run("ListPrompts", func(t *testing.T) { t.Run("list", func(t *testing.T) {
res, err := clientSession.ListPrompts(ctx, nil) res, err := clientSession.ListPrompts(ctx, nil)
if err != nil { if err != nil {
t.Fatal("ListPrompts() failed:", err) t.Fatal("ListPrompts() failed:", err)
@ -116,9 +103,10 @@ func TestListPrompts(t *testing.T) {
t.Fatalf("ListPrompts() mismatch (-want +got):\n%s", diff) t.Fatalf("ListPrompts() mismatch (-want +got):\n%s", diff)
} }
}) })
t.Run("PromptsIterator", func(t *testing.T) { t.Run("iterator", func(t *testing.T) {
testIterator(ctx, t, clientSession.Prompts(ctx, nil), wantPrompts) testIterator(ctx, t, clientSession.Prompts(ctx, nil), wantPrompts)
}) })
})
} }
func testIterator[T any](ctx context.Context, t *testing.T, seq iter.Seq2[*T, error], want []*T) { func testIterator[T any](ctx context.Context, t *testing.T, seq iter.Seq2[*T, error], want []*T) {