test(gateway+auth): T1.6 评审收口(I-1 胶水测试/M-2 空 userId/M-1 时效性注释)

- I-1(合 main 前必须):ProcessModelerControllerTest 补 4 个 MockMvc 胶水测试
  (standaloneSetup + setControllerAdvice(FlowGatewayExceptionHandler) + 自定义超管参数解析器)——
  by-id/by-key 各:①引擎不可达经既有 handler 出 503 通用信封(FlowGatewayExceptionHandler 全仓首测)
  ②正常路径 200 透传 ③MVC 层把 percent 编码中文 path variable(含冒号 procDefId)正确解码回原串交控制器。
- M-2:EngineContextBinderAdminTest 补「userId 空串/空白/null 且 account 非 admin → false」用例。
- M-1:EngineContextBinder.isSystemAdmin javadoc 补时效性说明(userId/account 取自 JWT claim 签发快照,
  非实时查库;token 有效期内 admin 改名/停用/降权不即时生效,由 TTL/吊销兜底)。

测试(mvn -pl platform-flow-gateway,platform-auth -am test 全绿,既有零修改):
ProcessModelerControllerTest 6→10 / EngineContextBinderAdminTest 8→9 / FlowableClientTest 12 不变。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-07-02 11:03:59 +08:00
parent 9cfef7e931
commit ddaf536419
3 changed files with 95 additions and 0 deletions

View File

@@ -7,17 +7,28 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
import com.eip4.platform.auth.security.AuthPrincipal;
import com.eip4.platform.flowgateway.client.FlowServiceUnavailableException;
import com.eip4.platform.flowgateway.client.FlowableClient;
import com.eip4.platform.flowgateway.web.FlowGatewayExceptionHandler;
import com.eip4.platform.flowgateway.web.ProcessModelerController;
/**
@@ -108,4 +119,76 @@ class ProcessModelerControllerTest {
assertThat(resp.getBody()).containsEntry("status", 1).containsEntry("msg", "仅系统管理员可用");
verify(flowableClient, never()).procDefSourceByKey(anyString());
}
// ---- 胶水层(MockMvc + FlowGatewayExceptionHandler):I-1 ----
// 覆盖三件此前直调单测碰不到的真实 MVC 行为:①引擎不可达经既有 handler 出 503 通用信封
// (FlowGatewayExceptionHandler 全仓首个测试) ②正常路径 200 透传 ③MVC 层把 percent 编码中文 path
// variable 正确解码回原串交给控制器。@AuthenticationPrincipal 在 standalone 无 Security 上下文,
// 用自定义参数解析器恒注入超管(门控通过与否由直调单测覆盖,这里只验 MVC 编码/异常映射管道)。
private MockMvc glueMvc() {
HandlerMethodArgumentResolver adminPrincipal = new HandlerMethodArgumentResolver() {
@Override
public boolean supportsParameter(MethodParameter parameter) {
return AuthPrincipal.class.equals(parameter.getParameterType());
}
@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mav,
NativeWebRequest req, WebDataBinderFactory bf) {
return admin();
}
};
return MockMvcBuilders.standaloneSetup(controller)
.setControllerAdvice(new FlowGatewayExceptionHandler())
.setCustomArgumentResolvers(adminPrincipal)
.build();
}
@Test
void 胶水_byId_MVC解码percent中文pathVar并200透传() throws Exception {
Map<String, Object> downstream = Map.of("found", true, "procDefKey", "总包合同交底", "version", 3);
when(flowableClient.procDefSource(CN_PROCDEF)).thenReturn(downstream);
glueMvc().perform(get("/api/workflow/process-definitions/{procDefId}/source", CN_PROCDEF))
.andExpect(status().isOk())
.andExpect(jsonPath("$.found").value(true))
.andExpect(jsonPath("$.procDefKey").value("总包合同交底"));
// 关键:MVC 层把 %E6.. / %3A 解码回「总包合同交底:3:abc123」原串交给控制器(③编码提取正确)
verify(flowableClient).procDefSource(CN_PROCDEF);
}
@Test
void 胶水_byId_引擎不可达经handler出503通用信封() throws Exception {
when(flowableClient.procDefSource(CN_PROCDEF))
.thenThrow(new FlowServiceUnavailableException("flowable-service 不可达", null));
glueMvc().perform(get("/api/workflow/process-definitions/{procDefId}/source", CN_PROCDEF))
.andExpect(status().isServiceUnavailable())
.andExpect(jsonPath("$.status").value(503))
.andExpect(jsonPath("$.error").value("FLOW_SERVICE_UNAVAILABLE"));
}
@Test
void 胶水_byKey_MVC解码percent中文pathVar并200透传() throws Exception {
Map<String, Object> downstream = Map.of("found", true, "procDefKey", "总包合同交底", "version", 2);
when(flowableClient.procDefSourceByKey(CN_KEY)).thenReturn(downstream);
glueMvc().perform(get("/api/workflow/process-definitions/by-key/{key}/source", CN_KEY))
.andExpect(status().isOk())
.andExpect(jsonPath("$.found").value(true));
verify(flowableClient).procDefSourceByKey(CN_KEY);
}
@Test
void 胶水_byKey_引擎不可达经handler出503通用信封() throws Exception {
when(flowableClient.procDefSourceByKey(CN_KEY))
.thenThrow(new FlowServiceUnavailableException("flowable-service 不可达", null));
glueMvc().perform(get("/api/workflow/process-definitions/by-key/{key}/source", CN_KEY))
.andExpect(status().isServiceUnavailable())
.andExpect(jsonPath("$.error").value("FLOW_SERVICE_UNAVAILABLE"));
}
}