fix tests

Author: dishaprakash

tests/bigquery/bigquery_mcp_test.go

@@ -171,30 +171,46 @@ func invokeMCPToolForTest(t *testing.T, info ToolTestInfo) (string, bool) {
 		t.Fatalf("native error executing %s: %s", toolName, err)
 	}
 
+	var blocks []string
+	for _, content := range mcpResp.Result.Content {
+		if content.Type == "text" {
+			blocks = append(blocks, strings.TrimSpace(content.Text))
+		}
+	}
+
+	got := strings.Join(blocks, "")
+
+	isActualErr := statusCode != http.StatusOK || (mcpResp != nil && (mcpResp.Result.IsError || mcpResp.Error != nil))
+	
 	if info.IsErr {
-		if statusCode != http.StatusOK || mcpResp.Result.IsError {
-			return "", true
+		if isActualErr {
+			// Extract error message for comparison
+			errMsg := got
+			if mcpResp != nil && mcpResp.Error != nil {
+				errMsg = mcpResp.Error.Message
+			}
+			if info.Want == "" || strings.Contains(errMsg, info.Want) {
+				return errMsg, true
+			}
 		}
-		t.Fatal("expected error result but got success")
-		return "", false
+		t.Fatalf("expected error result containing %q but got success or non-matching error. Status: %d, Result.IsError: %v, Error: %+v", info.Want, statusCode, mcpResp.Result.IsError, mcpResp.Error)
+		return got, false
 	}
 
 	if statusCode != http.StatusOK {
 		t.Fatalf("expected status 200, got %d", statusCode)
 	}
 
-	if mcpResp.Result.IsError {
-		t.Fatalf("%s returned error result: %v", toolName, mcpResp.Result)
+	if mcpResp != nil && mcpResp.Result.IsError {
+		t.Fatalf("%s returned error result: %v. Response: %s", toolName, mcpResp.Result, got)
 	}
 
-	var blocks []string
-	for _, content := range mcpResp.Result.Content {
-		if content.Type == "text" {
-			blocks = append(blocks, strings.TrimSpace(content.Text))
-		}
+	result := strings.Join(blocks, ",")
+	if strings.HasPrefix(info.Want, "[") && !strings.HasPrefix(result, "[") {
+		result = "[" + result + "]"
 	}
 
-	return strings.Join(blocks, ""), false
+	return result, false
 }
 
 func runBigQueryExecuteSqlToolInvokeTestMCP(t *testing.T, select1Want, invokeParamWant, tableNameParam, ddlWant string) {