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 0b8dcbb8920 Refine MCP workflow test database fixtures (#39046)
0b8dcbb8920 is described below
commit 0b8dcbb89202b87d6b981a28c1438c8178eb431c
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jul 8 10:29:59 2026 +0800
Refine MCP workflow test database fixtures (#39046)
---
.../encrypt/tool/service/EncryptWorkflowPlanningServiceTest.java | 7 ++-----
.../encrypt/tool/service/EncryptWorkflowValidationServiceTest.java | 3 +--
.../feature/mask/tool/service/MaskWorkflowPlanningServiceTest.java | 7 +++----
.../mask/tool/service/MaskWorkflowValidationServiceTest.java | 3 +--
4 files changed, 7 insertions(+), 13 deletions(-)
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 d8351f7a9e9..f8fc9c57942 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
@@ -91,13 +91,10 @@ class EncryptWorkflowPlanningServiceTest {
void assertPlanRejectsLifecycleMismatchForCreate() throws
ReflectiveOperationException {
EncryptRuleInspectionService ruleInspectionService =
mock(EncryptRuleInspectionService.class);
when(ruleInspectionService.queryEncryptRules(any(), any(),
any())).thenReturn(List.of(Map.of("logic_column", "phone")));
- MCPFeatureQueryFacade queryFacade = mock(MCPFeatureQueryFacade.class);
- when(queryFacade.getDatabaseType("logic_db")).thenReturn("MySQL");
EncryptWorkflowPlanningService service =
createService(ruleInspectionService,
mock(EncryptAlgorithmRecommendationService.class),
mock(EncryptAlgorithmPropertyTemplateService.class),
mock(EncryptRuleDistSQLPlanningService.class));
EncryptWorkflowRequest request = createRequest("create");
- request.setColumn("Phone");
- WorkflowContextSnapshot actual = service.plan(new
TestWorkflowSessionContext(), createMetadataQueryFacade(), queryFacade,
"session-1", request);
+ WorkflowContextSnapshot actual = service.plan(new
TestWorkflowSessionContext(), createMetadataQueryFacade(),
mock(MCPFeatureQueryFacade.class), "session-1", request);
assertThat(actual.getStatus(), is("failed"));
assertThat(actual.getIssues().getFirst().getCode(),
is(WorkflowIssueCode.RULE_STATE_MISMATCH));
}
@@ -342,7 +339,7 @@ class EncryptWorkflowPlanningServiceTest {
}
private MCPDatabaseMetadata createDatabaseMetadata() {
- return new MCPDatabaseMetadata("logic_db", "MySQL", "8.0", List.of(new
MCPSchemaMetadata("logic_db", "public", List.of(createTableMetadata()),
List.of(), List.of())));
+ return new MCPDatabaseMetadata("logic_db", "FixtureDB", "1.0",
List.of(new MCPSchemaMetadata("logic_db", "public",
List.of(createTableMetadata()), List.of(), List.of())));
}
private MCPTableMetadata createTableMetadata() {
diff --git
a/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowValidationServiceTest.java
b/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowValidationServiceTest.java
index f729356b1a2..c5df084706b 100644
---
a/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowValidationServiceTest.java
+++
b/mcp/features/encrypt/src/test/java/org/apache/shardingsphere/mcp/feature/encrypt/tool/service/EncryptWorkflowValidationServiceTest.java
@@ -74,12 +74,11 @@ class EncryptWorkflowValidationServiceTest {
void assertValidateHappyPath() throws ReflectiveOperationException {
WorkflowSessionContext workflowSessionContext = new
TestWorkflowSessionContext();
WorkflowContextSnapshot snapshot = createSnapshot("plan-1",
"session-1", "executed", "create");
- snapshot.getRequest().setColumn("Phone");
workflowSessionContext.save(snapshot);
EncryptRuleInspectionService ruleInspectionService =
mock(EncryptRuleInspectionService.class);
when(ruleInspectionService.queryEncryptRules(any(), any(),
any())).thenReturn(List.of(createRuleRow()));
MCPFeatureQueryFacade queryFacade = mock(MCPFeatureQueryFacade.class);
- when(queryFacade.getDatabaseType("logic_db")).thenReturn("PostgreSQL");
+ when(queryFacade.getDatabaseType("logic_db")).thenReturn("FixtureDB");
MCPMetadataQueryFacade metadataQueryFacade =
mock(MCPMetadataQueryFacade.class);
MCPFeatureExecutionFacade executionFacade =
mock(MCPFeatureExecutionFacade.class);
Map<String, Object> actual = createService(ruleInspectionService)
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 d16995ff71e..66f4aad08ba 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
@@ -93,9 +93,8 @@ class MaskWorkflowPlanningServiceTest {
MaskRuleInspectionService ruleInspectionService =
mock(MaskRuleInspectionService.class);
when(ruleInspectionService.queryMaskRules(any(), any(),
any())).thenReturn(List.of(Map.of("column", "phone")));
MCPFeatureQueryFacade queryFacade = mock(MCPFeatureQueryFacade.class);
- when(queryFacade.getDatabaseType("logic_db")).thenReturn("MySQL");
+ when(queryFacade.getDatabaseType("logic_db")).thenReturn("FixtureDB");
WorkflowRequest request = createRequest("create");
- request.setColumn("Phone");
WorkflowContextSnapshot actual = createService(ruleInspectionService,
mock(MaskAlgorithmRecommendationService.class),
mock(MaskAlgorithmPropertyTemplateService.class),
mock(MaskRuleDistSQLPlanningService.class))
.plan(new TestWorkflowSessionContext(),
createMetadataQueryFacade(), queryFacade, "session-1", request);
@@ -151,7 +150,7 @@ class MaskWorkflowPlanningServiceTest {
MaskRuleInspectionService ruleInspectionService =
mock(MaskRuleInspectionService.class);
when(ruleInspectionService.queryMaskRules(any(), any(),
any())).thenReturn(List.of(Map.of("column", "phone"), Map.of("column",
"email")));
MCPFeatureQueryFacade queryFacade = mock(MCPFeatureQueryFacade.class);
- when(queryFacade.getDatabaseType("logic_db")).thenReturn("MySQL");
+ when(queryFacade.getDatabaseType("logic_db")).thenReturn("FixtureDB");
WorkflowContextSnapshot actual = createService(ruleInspectionService,
mock(MaskAlgorithmRecommendationService.class),
mock(MaskAlgorithmPropertyTemplateService.class),
mock(MaskRuleDistSQLPlanningService.class))
.plan(new TestWorkflowSessionContext(),
createMetadataQueryFacade(), queryFacade, "session-1", createRequest("drop"));
@@ -264,7 +263,7 @@ class MaskWorkflowPlanningServiceTest {
}
private MCPDatabaseMetadata createDatabaseMetadata() {
- return new MCPDatabaseMetadata("logic_db", "MySQL", "8.0", List.of(new
MCPSchemaMetadata("logic_db", "public", List.of(createTableMetadata()),
List.of(), List.of())));
+ return new MCPDatabaseMetadata("logic_db", "FixtureDB", "1.0",
List.of(new MCPSchemaMetadata("logic_db", "public",
List.of(createTableMetadata()), List.of(), List.of())));
}
private MCPTableMetadata createTableMetadata() {
diff --git
a/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowValidationServiceTest.java
b/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowValidationServiceTest.java
index 04f9e2aa5f3..178cf9f447d 100644
---
a/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowValidationServiceTest.java
+++
b/mcp/features/mask/src/test/java/org/apache/shardingsphere/mcp/feature/mask/tool/service/MaskWorkflowValidationServiceTest.java
@@ -73,12 +73,11 @@ class MaskWorkflowValidationServiceTest {
WorkflowSessionContext workflowSessionContext = new
TestWorkflowSessionContext();
WorkflowContextSnapshot snapshot = createSnapshot("plan-1",
"session-1", "executed", "create");
snapshot.getRequest().setAlgorithmType("MASK_FROM_X_TO_Y");
- snapshot.getRequest().setColumn("Phone");
workflowSessionContext.save(snapshot);
MaskRuleInspectionService ruleInspectionService =
mock(MaskRuleInspectionService.class);
when(ruleInspectionService.queryMaskRules(any(), any(),
any())).thenReturn(List.of(Map.of("column", "phone", "algorithm_type",
"MASK_FROM_X_TO_Y")));
MCPFeatureQueryFacade queryFacade = mock(MCPFeatureQueryFacade.class);
- when(queryFacade.getDatabaseType("logic_db")).thenReturn("PostgreSQL");
+ when(queryFacade.getDatabaseType("logic_db")).thenReturn("FixtureDB");
MCPMetadataQueryFacade metadataQueryFacade =
mock(MCPMetadataQueryFacade.class);
MCPFeatureExecutionFacade executionFacade =
mock(MCPFeatureExecutionFacade.class);
Map<String, Object> actual = createService(ruleInspectionService)
