xiaoe/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui自动化和压力测试bug修改

Browse Source
This commit is contained in:
guocan
2025-05-28 16:31:27 +08:00
parent 66498fd750
commit 080a80d53d
5 changed files with 147 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java
View File

@@ -216,13 +216,16 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
if (1 == uiReport.getStatus()){
uiReport.setStatus(4);
}
if (scenesErrorNumber > 0){
uiReport.setStatus(2);
}
uiReportService.updateUiReport(uiReport);
//修改ui_automation
UiAutomation uiAutomation1 = new UiAutomation();
uiAutomation1.setId(automationId);
uiAutomation1.setExecutionResult("2");
if (!uiAutomation.getExecutionResult().equals("2")) {
if (scenesErrorNumber == 0) {
uiAutomation1.setExecutionResult("3");
}
uiAutomation1.setUpdateTime(DateUtils.getNowDate());
@@ -470,11 +473,15 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
Map<String, Object> stringObjectMap = filterByAssertionQOList(afterSettingList, seleniumUtils);
//断言失败是否终止
String continueExecution1 = (String) stringObjectMap.get("continueExecution");
String isSuccess = (String) stringObjectMap.get("isSuccess");
if (continueExecution1.equals("1")) {
continueExecution = false;
report.setLogInfo("");
report.setExecutionFlag("2");
}
if("0".equals(isSuccess)){
report.setExecutionFlag("2");
}
List<AssertionReportVO> assertionReportVOS = (List<AssertionReportVO>) stringObjectMap.get("assertionReportVOS");
Gson gson = new Gson();
report.setAssertionJson(assertionReportVOS.isEmpty() ? null : gson.toJson(assertionReportVOS));
@@ -514,9 +521,12 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
Map<String, Object> result = new HashMap<>();
String continueExecution = "2";
List<AssertionReportVO> assertionReports = new ArrayList<>();
String isSuccess = "1"; // 默认所有断言成功
result.put("continueExecution", continueExecution);
result.put("assertionReportVOS", assertionReports);
result.put("isSuccess", isSuccess); // 添加整体成功标志
List<UiHighSettingVO> uiHighSettingVOS = settingList.stream()
.filter(setting -> setting.getOperateType().equals("2") && 1 == setting.getIsDisabled())
.toList();
@@ -561,15 +571,20 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
errorDetail = "不支持的断言类型: " + assertionQO.getAssertionType();
report.setErrorInfo(errorDetail);
report.setIsSuccess("0");
isSuccess = "0"; // 设置整体失败标志
}
if (!assertionResult && "1".equals(assertionQO.getIsFailedAbort())) {
continueExecution = "1";
result.put("continueExecution", continueExecution);
if (!assertionResult) {
isSuccess = "0"; // 任何断言失败都设置整体失败标志
if ("1".equals(assertionQO.getIsFailedAbort())) {
continueExecution = "1";
result.put("continueExecution", continueExecution);
}
}
} catch (Exception e) {
report.setErrorInfo("断言执行异常: " + e.getMessage());
report.setIsSuccess("0");
isSuccess = "0"; // 异常也设置整体失败标志
log.error("断言执行异常", e);
}
@@ -578,6 +593,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
}
}
result.put("assertionReportVOS", assertionReports);
result.put("isSuccess", isSuccess); // 更新最终的整体成功标志
return result;
}
@@ -925,7 +941,7 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
*/
public Map<String, Object> filterBydataExtractionQOList(List<UiHighSettingVO> settingList, SeleniumUtils seleniumUtils) {
List<UiHighSettingVO> uiHighSettingVOS = settingList.stream()
.filter(setting -> setting.getOperateType().equals("3") && setting.getIsDisabled() == 0)
.filter(setting -> setting.getOperateType().equals("3") && setting.getIsDisabled() == 1)
.toList();
Map<String, Object> variableStorage = new HashMap<>();
if (CollectionUtils.isEmpty(uiHighSettingVOS)) {