test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(UI 自动化): 代码风格优化

This commit is contained in:
zhangdahai112 2022-08-16 18:15:02 +08:00 committed by 刘瑞斌
parent f95c590cf5
commit 817ce00546
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
View File

@ -478,7 +478,7 @@ public class ApiScenarioReportService {
if (StringUtils.equalsAnyIgnoreCase(status, ExecuteResult.ERROR_REPORT_RESULT.toString())) {
scenario.setLastResult(status);
} else {
scenario.setLastResult(errorSize > 0 ? "Fail" : ScenarioStatus.Success.name());
scenario.setLastResult(errorSize > 0 ? ScenarioStatus.Fail.name() : ScenarioStatus.Success.name());
}
long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count();
@ -884,13 +884,13 @@ public class ApiScenarioReportService {
long errorReportResultSize = dto.getRequestResults().stream().filter(requestResult ->
StringUtils.equalsIgnoreCase(requestResult.getStatus(), ExecuteResult.ERROR_REPORT_RESULT.toString())).count();
//类型为ui时的统计
if (StringUtils.isNotEmpty(dto.getRunMode()) && dto.getRunMode().startsWith("UI")) {
if (StringUtils.isNotEmpty(dto.getRunMode()) && dto.getRunMode().startsWith(ReportTypeConstants.UI.name())) {
try {
errorSize = dto.getRequestResults().stream().filter(requestResult ->
StringUtils.isNotEmpty(requestResult.getResponseResult().getHeaders())
&& JSONArray.parseArray(requestResult.getResponseResult().getHeaders()).stream().filter(
r -> ((JSONObject) r).containsKey("success") && !((JSONObject) r).getBoolean("success")
).count() > 0)
).anyMatch())
.count();
} catch (Exception e) {
// UI 返回的结果在 headers 里面，格式不符合规范的直接认定结果为失败

1
backend/src/main/java/io/metersphere/commons/constants/ReportTypeConstants.java
View File

@ -9,6 +9,7 @@ public enum ReportTypeConstants {
* 所有接口类型，包括接口、接口用例
*/
API,
UI,
SCENARIO_INTEGRATED,
SCENARIO_INDEPENDENT,
API_INTEGRATED,