Skip to content

test(alloydbpg,cloudsqlpg): achieve full parity with legacy tests for custom tools #3014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
anubhav756 wants to merge 4 commits into
base: anubhav-mcp-cloudsqlpg
Choose a base branch
from
Draft

test(alloydbpg,cloudsqlpg): achieve full parity with legacy tests for custom tools #3014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27d2f73
test(alloydbpg,cloudsqlpg): achieve full parity with legacy tests for…
anubhav756 Apr 9, 2026
8a02f35
fix: fix assertions
anubhav756 Apr 13, 2026
35e664c
fix(tests): skip nil items in GetMCPResultText to return empty array
anubhav756 Apr 13, 2026
2e66927
fix: fix nil error assertion in tests
anubhav756 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 47 additions & 6 deletions tests/alloydbpg/alloydb_pg_mcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@

package alloydbpg

// TODO: We may want to add tests for custom tools defined in alloydb-postgres.yaml
// in the future, rather than just testing the prebuilt tools.

import (
"context"
"fmt"
Expand Down Expand Up @@ -149,7 +146,7 @@ func TestAlloyDBPgListTools(t *testing.T) {
}

func TestAlloyDBPgCallTool(t *testing.T) {
getAlloyDBPgVars(t)
sourceConfig := getAlloyDBPgVars(t)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
defer cancel()

Expand All @@ -162,9 +159,40 @@ func TestAlloyDBPgCallTool(t *testing.T) {

uniqueID := strings.ReplaceAll(uuid.New().String(), "-", "")

args := []string{"--prebuilt", "alloydb-postgres"}
t.Cleanup(func() {
tests.CleanupPostgresTables(t, context.Background(), pool, uniqueID)
})

cmd, cleanup, err := tests.StartCmd(ctx, map[string]any{}, args...)
tableNameParam := "param_table_" + uniqueID
tableNameAuth := "auth_table_" + uniqueID

// set up data for param tool
createParamTableStmt, insertParamTableStmt, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, paramTestParams := tests.GetPostgresSQLParamToolInfo(tableNameParam)
teardownTable1 := tests.SetupPostgresSQLTable(t, ctx, pool, createParamTableStmt, insertParamTableStmt, tableNameParam, paramTestParams)
defer teardownTable1(t)

// set up data for auth tool
createAuthTableStmt, insertAuthTableStmt, authToolStmt, authTestParams := tests.GetPostgresSQLAuthToolInfo(tableNameAuth)
teardownTable2 := tests.SetupPostgresSQLTable(t, ctx, pool, createAuthTableStmt, insertAuthTableStmt, tableNameAuth, authTestParams)
defer teardownTable2(t)

// Set up table for semantic search
vectorTableName, tearDownVectorTable := tests.SetupPostgresVectorTable(t, ctx, pool)
defer tearDownVectorTable(t)

// Write config into a file and pass it to command
toolsFile := tests.GetToolsConfig(sourceConfig, AlloyDBPostgresToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
toolsFile = tests.AddExecuteSqlConfig(t, toolsFile, "postgres-execute-sql")
tmplSelectCombined, tmplSelectFilterCombined := tests.GetPostgresSQLTmplToolStatement()
toolsFile = tests.AddTemplateParamConfig(t, toolsFile, AlloyDBPostgresToolType, tmplSelectCombined, tmplSelectFilterCombined, "")

// Add semantic search tool config
insertStmt, searchStmt := tests.GetPostgresVectorSearchStmts(vectorTableName)
toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, AlloyDBPostgresToolType, insertStmt, searchStmt)

toolsFile = tests.AddPostgresPrebuiltConfig(t, toolsFile)

cmd, cleanup, err := tests.StartCmd(ctx, toolsFile)
if err != nil {
t.Fatalf("command initialization returned an error: %v", err)
}
Expand All @@ -178,6 +206,19 @@ func TestAlloyDBPgCallTool(t *testing.T) {
t.Fatalf("toolbox didn't start successfully: %v", err)
}

// Get configs for tests
select1Want, _, createTableStatement, _ := tests.GetPostgresWants()

// Run custom tool tests via MCP
tests.RunMCPToolInvokeTest(t, ctx, select1Want)

// Run execute-sql tool tests via MCP
tests.RunMCPExecuteSqlToolInvokeTest(t, ctx, createTableStatement, select1Want)

// Run template parameters tool tests via MCP
tableNameTemplateParam := "template_param_table_" + uniqueID
tests.RunMCPToolInvokeWithTemplateParameters(t, ctx, tableNameTemplateParam)

// Run shared Postgres tests
tests.RunMCPPostgresListViewsTest(t, ctx, pool)
tests.RunMCPPostgresListSchemasTest(t, ctx, pool, AlloyDBPostgresUser, uniqueID)
Expand Down
53 changes: 47 additions & 6 deletions tests/cloudsqlpg/cloud_sql_pg_mcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@

package cloudsqlpg

// TODO: We may want to add tests for custom tools defined in cloud-sql-postgres.yaml
// in the future, rather than just testing the prebuilt tools.

import (
"context"
"fmt"
Expand Down Expand Up @@ -136,7 +133,7 @@ func TestCloudSQLPgListTools(t *testing.T) {
}

func TestCloudSQLPgCallTool(t *testing.T) {
getCloudSQLPgVars(t)
sourceConfig := getCloudSQLPgVars(t)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
defer cancel()

Expand All @@ -149,9 +146,40 @@ func TestCloudSQLPgCallTool(t *testing.T) {

uniqueID := strings.ReplaceAll(uuid.New().String(), "-", "")

args := []string{"--prebuilt", "cloud-sql-postgres"}
t.Cleanup(func() {
tests.CleanupPostgresTables(t, context.Background(), pool, uniqueID)
})

cmd, cleanup, err := tests.StartCmd(ctx, map[string]any{}, args...)
tableNameParam := "param_table_" + uniqueID
tableNameAuth := "auth_table_" + uniqueID

// set up data for param tool
createParamTableStmt, insertParamTableStmt, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, paramTestParams := tests.GetPostgresSQLParamToolInfo(tableNameParam)
teardownTable1 := tests.SetupPostgresSQLTable(t, ctx, pool, createParamTableStmt, insertParamTableStmt, tableNameParam, paramTestParams)
defer teardownTable1(t)

// set up data for auth tool
createAuthTableStmt, insertAuthTableStmt, authToolStmt, authTestParams := tests.GetPostgresSQLAuthToolInfo(tableNameAuth)
teardownTable2 := tests.SetupPostgresSQLTable(t, ctx, pool, createAuthTableStmt, insertAuthTableStmt, tableNameAuth, authTestParams)
defer teardownTable2(t)

// Set up table for semantic search
vectorTableName, tearDownVectorTable := tests.SetupPostgresVectorTable(t, ctx, pool)
defer tearDownVectorTable(t)

// Write config into a file and pass it to command
toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLPostgresToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
toolsFile = tests.AddExecuteSqlConfig(t, toolsFile, "postgres-execute-sql")
tmplSelectCombined, tmplSelectFilterCombined := tests.GetPostgresSQLTmplToolStatement()
toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLPostgresToolType, tmplSelectCombined, tmplSelectFilterCombined, "")

// Add semantic search tool config
insertStmt, searchStmt := tests.GetPostgresVectorSearchStmts(vectorTableName)
toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, CloudSQLPostgresToolType, insertStmt, searchStmt)

toolsFile = tests.AddPostgresPrebuiltConfig(t, toolsFile)

cmd, cleanup, err := tests.StartCmd(ctx, toolsFile)
if err != nil {
t.Fatalf("command initialization returned an error: %v", err)
}
Expand All @@ -165,6 +193,19 @@ func TestCloudSQLPgCallTool(t *testing.T) {
t.Fatalf("toolbox didn't start successfully: %v", err)
}

// Get configs for tests
select1Want, _, createTableStatement, _ := tests.GetPostgresWants()

// Run custom tool tests via MCP
tests.RunMCPToolInvokeTest(t, ctx, select1Want)

// Run execute-sql tool tests via MCP
tests.RunMCPExecuteSqlToolInvokeTest(t, ctx, createTableStatement, select1Want)

// Run template parameters tool tests via MCP
tableNameTemplateParam := "template_param_table_" + uniqueID
tests.RunMCPToolInvokeWithTemplateParameters(t, ctx, tableNameTemplateParam)

// Run shared Postgres tests
tests.RunMCPPostgresListViewsTest(t, ctx, pool)
tests.RunMCPPostgresListSchemasTest(t, ctx, pool, CloudSQLPostgresUser, uniqueID)
Expand Down
Loading
Loading