This is an automated email from the ASF dual-hosted git repository.
terrymanu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 83500a0f6fd Strengthen MCP startup log assertions and simplify TABLE
test fixtures (#40051)
83500a0f6fd is described below
commit 83500a0f6fd0134a77f0491e578bdcf92b3890c2
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Oct 4 20:34:41 2026 +0800
Strengthen MCP startup log assertions and simplify TABLE test fixtures
(#40051)
---
.../apache/shardingsphere/mcp/bootstrap/MCPRuntimeLauncherTest.java | 2 ++
.../mcp/core/completion/handler/MetadataCompletionHandlerTest.java | 3 +--
.../encrypt/tool/service/EncryptWorkflowPlanningServiceTest.java | 5 ++---
.../feature/mask/tool/service/MaskWorkflowPlanningServiceTest.java | 5 ++---
.../workflow/service/WorkflowPlanningContextValidatorTest.java | 3 +--
.../mcp/support/workflow/service/WorkflowPlanningSupportTest.java | 3 +--
6 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/mcp/bootstrap/src/test/java/org/apache/shardingsphere/mcp/bootstrap/MCPRuntimeLauncherTest.java
b/mcp/bootstrap/src/test/java/org/apache/shardingsphere/mcp/bootstrap/MCPRuntimeLauncherTest.java
index f09017bf533..e5994f57c7c 100644
---
a/mcp/bootstrap/src/test/java/org/apache/shardingsphere/mcp/bootstrap/MCPRuntimeLauncherTest.java
+++
b/mcp/bootstrap/src/test/java/org/apache/shardingsphere/mcp/bootstrap/MCPRuntimeLauncherTest.java
@@ -92,6 +92,7 @@ class MCPRuntimeLauncherTest {
assertThat(mockedStdioServer.constructed().size(), is(0));
verify(actual).start();
assertThat(appender.list.size(), is(1));
+ assertThat(appender.list.getFirst().getLevel(), is(Level.INFO));
assertThat(appender.list.getFirst().getFormattedMessage(),
is("ShardingSphere MCP Server started, transport=http,
config=conf/mcp-http.yaml, databases=1, "
+ "endpoint=http://127.0.0.1:19090/mcp,
session_attribution=disabled, logs=logs/mcp.log."));
}
@@ -112,6 +113,7 @@ class MCPRuntimeLauncherTest {
assertThat(mockedStdioServer.constructed().size(), is(1));
verify(actual).start();
assertThat(appender.list.size(), is(1));
+ assertThat(appender.list.getFirst().getLevel(), is(Level.INFO));
assertThat(appender.list.getFirst().getFormattedMessage(),
is("ShardingSphere MCP Server started, transport=stdio,
config=conf/mcp-http.yaml, databases=1, "
+ "logs=logs/mcp.log. Stdout is reserved for MCP protocol
frames."));
}
diff --git
a/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/completion/handler/MetadataCompletionHandlerTest.java
b/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/completion/handler/MetadataCompletionHandlerTest.java
index 5e6fd0cbc60..6d2a33744aa 100644
---
a/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/completion/handler/MetadataCompletionHandlerTest.java
+++
b/mcp/core/src/test/java/org/apache/shardingsphere/mcp/core/completion/handler/MetadataCompletionHandlerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mcp.core.completion.handler;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.TableType;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyFactory;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereIndex;
@@ -274,7 +273,7 @@ class MetadataCompletionHandlerTest {
}
private ShardingSphereTable createTableMetadata() {
- return new ShardingSphereTable("t_order", List.of(), List.of(),
List.of(), TableType.TABLE);
+ return new ShardingSphereTable("t_order", List.of(), List.of(),
List.of());
}
private void assertCandidate(final MCPCompletionHandlerResult actual,
final String expectedValue) {
diff --git
a/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowPlanningServiceTest.java
b/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowPlanningServiceTest.java
index c14a568436a..605bad63d5f 100644
---
a/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowPlanningServiceTest.java
+++
b/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowPlanningServiceTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mcp.feature.encrypt.tool.service;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.TableType;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyFactory;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierScope;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -110,7 +109,7 @@ class EncryptWorkflowPlanningServiceTest {
void assertPlanRejectsMissingLogicalColumn() {
MCPMetadataQueryFacade metadataQueryFacade =
createMetadataQueryFacade();
when(metadataQueryFacade.querySchemas(any())).thenReturn(List.of(
- new ShardingSphereSchema("public", mock(DatabaseType.class),
List.of(new ShardingSphereTable("orders", List.of(), List.of(), List.of(),
TableType.TABLE)), List.of())));
+ new ShardingSphereSchema("public", mock(DatabaseType.class),
List.of(new ShardingSphereTable("orders", List.of(), List.of(), List.of())),
List.of())));
when(metadataQueryFacade.queryTableColumns(any(), any(),
any())).thenReturn(List.of());
EncryptWorkflowPlanningService service =
createService(mock(EncryptRuleInspectionService.class),
mock(EncryptAlgorithmRecommendationService.class),
mock(EncryptAlgorithmPropertyTemplateService.class),
mock(EncryptRuleDistSQLPlanningService.class));
@@ -393,7 +392,7 @@ class EncryptWorkflowPlanningServiceTest {
}
private ShardingSphereTable createTableMetadata(final String tableName) {
- return new ShardingSphereTable(tableName, List.of(), List.of(),
List.of(), TableType.TABLE);
+ return new ShardingSphereTable(tableName, List.of(), List.of(),
List.of());
}
private MCPColumnMetadata createColumnMetadata(final String tableName,
final String columnName) {
diff --git
a/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowPlanningServiceTest.java
b/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowPlanningServiceTest.java
index c4e35e97e75..d782b66b040 100644
---
a/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowPlanningServiceTest.java
+++
b/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowPlanningServiceTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mcp.feature.mask.tool.service;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.TableType;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyFactory;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierScope;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -110,7 +109,7 @@ class MaskWorkflowPlanningServiceTest {
void assertPlanRejectsMissingLogicalColumn() {
MCPMetadataQueryFacade metadataQueryFacade =
createMetadataQueryFacade();
when(metadataQueryFacade.querySchemas(any())).thenReturn(List.of(
- new ShardingSphereSchema("public", mock(DatabaseType.class),
List.of(new ShardingSphereTable("orders", List.of(), List.of(), List.of(),
TableType.TABLE)), List.of())));
+ new ShardingSphereSchema("public", mock(DatabaseType.class),
List.of(new ShardingSphereTable("orders", List.of(), List.of(), List.of())),
List.of())));
when(metadataQueryFacade.queryTableColumns(any(), any(),
any())).thenReturn(List.of());
WorkflowContextSnapshot actual =
createService(mock(MaskRuleInspectionService.class),
mock(MaskAlgorithmRecommendationService.class),
mock(MaskAlgorithmPropertyTemplateService.class),
mock(MaskRuleDistSQLPlanningService.class))
@@ -301,7 +300,7 @@ class MaskWorkflowPlanningServiceTest {
}
private ShardingSphereTable createTableMetadata() {
- return new ShardingSphereTable("orders", List.of(), List.of(),
List.of(), TableType.TABLE);
+ return new ShardingSphereTable("orders", List.of(), List.of(),
List.of());
}
private MCPColumnMetadata createColumnMetadata(final String columnName) {
diff --git
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningContextValidatorTest.java
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningContextValidatorTest.java
index 5849b6c4109..92e7553d1fb 100644
---
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningContextValidatorTest.java
+++
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningContextValidatorTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mcp.support.workflow.service;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.TableType;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyFactory;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierScope;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -201,7 +200,7 @@ class WorkflowPlanningContextValidatorTest {
}
private ShardingSphereTable createTableMetadata() {
- return new ShardingSphereTable("orders", List.of(), List.of(),
List.of(), TableType.TABLE);
+ return new ShardingSphereTable("orders", List.of(), List.of(),
List.of());
}
private MCPColumnMetadata createColumnMetadata() {
diff --git
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningSupportTest.java
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningSupportTest.java
index 98c73bc3c0f..a772fa4433f 100644
---
a/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningSupportTest.java
+++
b/mcp/support/src/test/java/org/apache/shardingsphere/mcp/support/workflow/service/WorkflowPlanningSupportTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mcp.support.workflow.service;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.TableType;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyFactory;
import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierScope;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -410,7 +409,7 @@ class WorkflowPlanningSupportTest {
}
private ShardingSphereTable createTableMetadata(final String tableName) {
- return new ShardingSphereTable(tableName, List.of(), List.of(),
List.of(), TableType.TABLE);
+ return new ShardingSphereTable(tableName, List.of(), List.of(),
List.of());
}
private MCPColumnMetadata createColumnMetadata(final String tableName,
final String columnName) {
