Skip to content

Fix missing MCP test #2925

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Fix missing MCP test #2925

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
52b53ef
Add missing test
RubenCerna2079 Oct 14, 2025
de28682
Add MCP tests
RubenCerna2079 Oct 27, 2025
80e6b2e
Fix formatting error
RubenCerna2079 Oct 27, 2025
8fae2b8
Add missing header
RubenCerna2079 Oct 27, 2025
ccab7f1
Add messages to allow for easier identification of failures
RubenCerna2079 Oct 28, 2025
edd0943
Add request header in hydration section
RubenCerna2079 Oct 28, 2025
5db169f
Fix error messages
RubenCerna2079 Oct 28, 2025
adc89d2
Add status code to repeat in case post fails after hydration
RubenCerna2079 Oct 28, 2025
39647da
Add delay in hydration
RubenCerna2079 Oct 28, 2025
676d70c
Changes based on comments
RubenCerna2079 Nov 13, 2025
98a18af
Merge branch 'main' into dev/rubencerna/mcp-fix-tests
RubenCerna2079 Nov 13, 2025
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
92 changes: 82 additions & 10 deletions src/Service.Tests/Configuration/ConfigurationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2528,26 +2528,37 @@ public async Task TestRuntimeBaseRouteInNextLinkForPaginatedRestResponse()
/// <param name="expectedStatusCodeForGraphQL">Expected HTTP status code code for the GraphQL request</param>
[DataTestMethod]
[TestCategory(TestCategory.MSSQL)]
[DataRow(true, true, HttpStatusCode.OK, HttpStatusCode.OK, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Both Rest and GraphQL endpoints enabled globally")]
[DataRow(true, false, HttpStatusCode.OK, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest enabled and GraphQL endpoints disabled globally")]
[DataRow(false, true, HttpStatusCode.NotFound, HttpStatusCode.OK, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest disabled and GraphQL endpoints enabled globally")]
[DataRow(true, true, HttpStatusCode.OK, HttpStatusCode.OK, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Both Rest and GraphQL endpoints enabled globally")]
[DataRow(true, false, HttpStatusCode.OK, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest enabled and GraphQL endpoints disabled globally")]
[DataRow(false, true, HttpStatusCode.NotFound, HttpStatusCode.OK, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest disabled and GraphQL endpoints enabled globally")]
public async Task TestGlobalFlagToEnableRestAndGraphQLForHostedAndNonHostedEnvironment(
[DataRow(true, true, true, HttpStatusCode.OK, HttpStatusCode.OK, HttpStatusCode.OK, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest, GraphQL, and MCP enabled globally")]
[DataRow(true, true, false, HttpStatusCode.OK, HttpStatusCode.OK, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest and GraphQL enabled, MCP disabled globally")]
[DataRow(true, false, true, HttpStatusCode.OK, HttpStatusCode.NotFound, HttpStatusCode.OK, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest enabled, GraphQL disabled, and MCP enabled globally")]
[DataRow(true, false, false, HttpStatusCode.OK, HttpStatusCode.NotFound, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest enabled, GraphQL and MCP enabled globally")]
[DataRow(false, true, true, HttpStatusCode.NotFound, HttpStatusCode.OK, HttpStatusCode.OK, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest disabled, GraphQL and MCP enabled globally")]
[DataRow(false, true, false, HttpStatusCode.NotFound, HttpStatusCode.OK, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest disabled, GraphQL enabled, and MCP disabled globally")]
[DataRow(false, false, true, HttpStatusCode.NotFound, HttpStatusCode.NotFound, HttpStatusCode.OK, CONFIGURATION_ENDPOINT, DisplayName = "V1 - Rest and GraphQL disabled, MCP enabled globally")]
[DataRow(true, true, true, HttpStatusCode.OK, HttpStatusCode.OK, HttpStatusCode.OK, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest, GraphQL, and MCP enabled globally")]
[DataRow(true, true, false, HttpStatusCode.OK, HttpStatusCode.OK, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest and GraphQL enabled, MCP disabled globally")]
[DataRow(true, false, true, HttpStatusCode.OK, HttpStatusCode.NotFound, HttpStatusCode.OK, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest enabled, GraphQL disabled, and MCP enabled globally")]
[DataRow(true, false, false, HttpStatusCode.OK, HttpStatusCode.NotFound, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest enabled, GraphQL and MCP enabled globally")]
[DataRow(false, true, true, HttpStatusCode.NotFound, HttpStatusCode.OK, HttpStatusCode.OK, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest disabled, GraphQL and MCP enabled globally")]
[DataRow(false, true, false, HttpStatusCode.NotFound, HttpStatusCode.OK, HttpStatusCode.NotFound, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest disabled, GraphQL enabled, and MCP disabled globally")]
[DataRow(false, false, true, HttpStatusCode.NotFound, HttpStatusCode.NotFound, HttpStatusCode.OK, CONFIGURATION_ENDPOINT_V2, DisplayName = "V2 - Rest and GraphQL disabled, MCP enabled globally")]
public async Task TestGlobalFlagToEnableRestGraphQLAndMcpForHostedAndNonHostedEnvironment(
bool isRestEnabled,
bool isGraphQLEnabled,
bool isMcpEnabled,
HttpStatusCode expectedStatusCodeForREST,
HttpStatusCode expectedStatusCodeForGraphQL,
HttpStatusCode expectedStatusCodeForMcp,
string configurationEndpoint)
{
GraphQLRuntimeOptions graphqlOptions = new(Enabled: isGraphQLEnabled);
RestRuntimeOptions restRuntimeOptions = new(Enabled: isRestEnabled);
McpRuntimeOptions mcpRuntimeOptions = new(Enabled: isMcpEnabled);

DataSource dataSource = new(DatabaseType.MSSQL,
GetConnectionStringFromEnvironmentConfig(environment: TestCategory.MSSQL), Options: null);

RuntimeConfig configuration = InitMinimalRuntimeConfig(dataSource, graphqlOptions, restRuntimeOptions, null);
RuntimeConfig configuration = InitMinimalRuntimeConfig(dataSource, graphqlOptions, restRuntimeOptions, mcpRuntimeOptions);
const string CUSTOM_CONFIG = "custom-config.json";
File.WriteAllText(CUSTOM_CONFIG, configuration.ToJson());

Expand All @@ -2570,6 +2581,7 @@ public async Task TestGlobalFlagToEnableRestAndGraphQLForHostedAndNonHostedEnvir

object payload = new { query };

// GraphQL request
HttpRequestMessage graphQLRequest = new(HttpMethod.Post, "/graphql")
{
Content = JsonContent.Create(payload)
Expand All @@ -2578,9 +2590,25 @@ public async Task TestGlobalFlagToEnableRestAndGraphQLForHostedAndNonHostedEnvir
HttpResponseMessage graphQLResponse = await client.SendAsync(graphQLRequest);
Assert.AreEqual(expectedStatusCodeForGraphQL, graphQLResponse.StatusCode);

// REST request
HttpRequestMessage restRequest = new(HttpMethod.Get, "/api/Book");
HttpResponseMessage restResponse = await client.SendAsync(restRequest);
Assert.AreEqual(expectedStatusCodeForREST, restResponse.StatusCode);

// MCP request
await Task.Delay(2000);
object mcpPayload = new
{
jsonrpc = "2.0",
id = 1,
method = "tools/call"
};
HttpRequestMessage mcpRequest = new(HttpMethod.Post, "/mcp")
{
Content = JsonContent.Create(mcpPayload)
};
HttpResponseMessage mcpResponse = await client.SendAsync(mcpRequest);
Copy link
Collaborator

@Aniruddh25 Aniruddh25 Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why cant we use the same GetMcpResponsePostConfigHydration method here to account for the retry logic?

Assert.AreEqual(expectedStatusCodeForMcp, mcpResponse.StatusCode);
}

// Hosted Scenario
Expand All @@ -2590,8 +2618,7 @@ public async Task TestGlobalFlagToEnableRestAndGraphQLForHostedAndNonHostedEnvir
{
JsonContent content = GetPostStartupConfigParams(MSSQL_ENVIRONMENT, configuration, configurationEndpoint);

HttpResponseMessage postResult =
await client.PostAsync(configurationEndpoint, content);
HttpResponseMessage postResult = await client.PostAsync(configurationEndpoint, content);
Assert.AreEqual(HttpStatusCode.OK, postResult.StatusCode);

HttpStatusCode restResponseCode = await GetRestResponsePostConfigHydration(client);
Expand All @@ -2602,6 +2629,8 @@ public async Task TestGlobalFlagToEnableRestAndGraphQLForHostedAndNonHostedEnvir

Assert.AreEqual(expected: expectedStatusCodeForGraphQL, actual: graphqlResponseCode);

HttpStatusCode mcpResponseCode = await GetMcpResponsePostConfigHydration(client);
Assert.AreEqual(expected: expectedStatusCodeForMcp, actual: mcpResponseCode);
}
}

Expand Down Expand Up @@ -5330,6 +5359,49 @@ private static async Task<HttpStatusCode> GetGraphQLResponsePostConfigHydration(
return responseCode;
}

/// <summary>
/// Executing MCP POST requests against the engine until a non-503 error is received.
/// </summary>
/// <param name="httpClient">Client used for request execution.</param>
/// <returns>ServiceUnavailable if service is not successfully hydrated with config,
/// else the response code from the MCP request</returns>
private static async Task<HttpStatusCode> GetMcpResponsePostConfigHydration(HttpClient httpClient)
{
// Retry request RETRY_COUNT times in 1 second increments to allow required services
// time to instantiate and hydrate permissions.
int retryCount = RETRY_COUNT;
HttpStatusCode responseCode = HttpStatusCode.ServiceUnavailable;
while (retryCount > 0)
{
// Minimal MCP request (list tools) – valid JSON-RPC request
object payload = new
{
jsonrpc = "2.0",
id = 1,
method = "tools/call"
};

HttpRequestMessage mcpRequest = new(HttpMethod.Post, "/mcp")
{
Content = JsonContent.Create(payload)
};

HttpResponseMessage mcpResponse = await httpClient.SendAsync(mcpRequest);
responseCode = mcpResponse.StatusCode;

if (responseCode == HttpStatusCode.ServiceUnavailable)
{
retryCount--;
Thread.Sleep(TimeSpan.FromSeconds(RETRY_WAIT_SECONDS));
continue;
Comment on lines +5395 to +5396
Copy link
Contributor

@souvikghosh04 souvikghosh04 Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function is asynchronous but using Thread.Sleep() you can block the current thread. Instead use Task.Await(). Additionally, please check if there is a deterministic way to wait for /mcp endpoint within a given limit, instead of a hard-coded value which might vary in different envrionments (ADO pipelines) or scenarios.

}

break;
}

return responseCode;
}

/// <summary>
/// Helper method to instantiate RuntimeConfig object needed for multiple create tests.
/// </summary>
Expand Down
Loading