Add full registry test suite to acceptance tests

Author: jrhouston

Makefile

@@ -40,7 +40,7 @@ test-e2e:
 
 # Run acceptance tests
 test-acc:
-	$(GO) test -tags 'acceptance' -v ./test/acceptance/...
+	$(GO) test -tags 'acceptance' -v ./test/acceptance/... -run '$(RUN_TESTS)'
 
 # Clean build artifacts
 clean:

test/acceptance/acceptance_helpers.go

@@ -39,10 +39,12 @@ type ToolAcceptanceTest struct {
 	Skip bool
 }
 
+type ToolAcceptanceTestSuite []ToolAcceptanceTest
+
 type ToolTestCheck func(t *testing.T, res *mcp.CallToolResult)
 
 func runAcceptanceTest(t *testing.T, ctx context.Context, at ToolAcceptanceTest, c *client.Client) {
-	t.Run(at.Description, func(t *testing.T) {
+	t.Run(at.Name, func(t *testing.T) {
 		if at.Skip {
 			t.Skip("Skip set to true")
 			return

test/acceptance/acceptance_test.go

@@ -30,33 +30,35 @@ func TestAcceptance(t *testing.T) {
 	logger.SetOutput(&logInterceptor{t: t, suppress: !enableServerLogs})
 	srv := tfmcpserver.NewServer("acc-test", logger)
 
-	sess := &TestSession{
-		id:           srv.GenerateInProcessSessionID(),
-		notifChannel: make(chan mcp.JSONRPCNotification, 10),
+	suites := []ToolAcceptanceTestSuite{
+		RegistryToolTests,
+		TerraformToolTests,
 	}
-	if err := srv.RegisterSession(ctx, sess); err != nil {
-		t.Fatalf("failed to register session: %v", err)
-	}
-	sessionCtx := srv.WithContext(ctx, sess)
-
-	mcpclient, err := client.NewInProcessClient(srv)
-	if err != nil {
-		t.Fatalf("Failed to start MCP client + server: %v", err)
-	}
-	defer mcpclient.Close()
 
-	if _, err = mcpclient.Initialize(ctx, mcp.InitializeRequest{}); err != nil {
-		t.Fatalf("Failed to initialize the MCP client: %v", err)
+	tests := []ToolAcceptanceTest{}
+	for _, suite := range suites {
+		tests = append(tests, suite...)
 	}
 
-	for _, at := range TerraformToolTests {
-		t.Run("terraform", func(t *testing.T) {
-			runAcceptanceTest(t, sessionCtx, at, mcpclient)
-		})
-	}
+	for _, at := range tests {
+		sess := &TestSession{
+			id:           srv.GenerateInProcessSessionID(),
+			notifChannel: make(chan mcp.JSONRPCNotification, 10),
+		}
+		if err := srv.RegisterSession(ctx, sess); err != nil {
+			t.Fatalf("failed to register session: %v", err)
+		}
+		sessionCtx := srv.WithContext(ctx, sess)
+		mcpclient, err := client.NewInProcessClient(srv)
+		if err != nil {
+			t.Fatalf("Failed to start MCP client + server: %v", err)
+		}
+		defer mcpclient.Close()
 
-	for _, at := range RegistryToolTests {
-		t.Run("registry", func(t *testing.T) {
+		if _, err = mcpclient.Initialize(ctx, mcp.InitializeRequest{}); err != nil {
+			t.Fatalf("Failed to initialize the MCP client: %v", err)
+		}
+		t.Run(at.ToolName, func(t *testing.T) {
 			runAcceptanceTest(t, sessionCtx, at, mcpclient)
 		})
 	}

test/acceptance/check_helpers.go

@@ -12,6 +12,16 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func CheckTextContentContains(expr string) ToolTestCheck {
+	return func(t *testing.T, res *mcp.CallToolResult) {
+		content, ok := res.Content[0].(mcp.TextContent)
+		if !ok {
+			t.Fatal("response is not text content")
+		}
+		require.Contains(t, content.Text, expr)
+	}
+}
+
 func CheckJSONContentExists(jsonPath string) ToolTestCheck {
 	return func(t *testing.T, res *mcp.CallToolResult) {
 		content, ok := res.Content[0].(mcp.TextContent)