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

场景新增bug修改

Browse Source
This commit is contained in:
guocan
2025-05-08 13:12:49 +08:00
parent 898fc59b50
commit 09c9c4eaec
2 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test-test/src/main/java/com/test/test/controller/UiAutomationController.java
View File

@@ -36,8 +36,6 @@ public class UiAutomationController extends BaseController
private IUiAutomationService uiAutomationService; private IUiAutomationService uiAutomationService;
@Autowired @Autowired
private IUiSceneStepsService uiSceneStepsService; private IUiSceneStepsService uiSceneStepsService;
@Value("${test.selenium.chrome-driver-path}")
private String chromeDriverPath;
/** /**
* 查询ui自动化列表 * 查询ui自动化列表
@@ -120,11 +118,6 @@ public class UiAutomationController extends BaseController
log.info("执行完成!"); log.info("执行完成!");
return success(uiSceneStepsService.executeStep(id,triggerMode)); return success(uiSceneStepsService.executeStep(id,triggerMode));
} catch (Exception e) { } catch (Exception e) {
System.setProperty("webdriver.chrome.driver", chromeDriverPath);
WebDriver driver = new ChromeDriver();
SeleniumUtils seleniumUtils = new SeleniumUtils(driver);
//关闭浏览器
seleniumUtils.quit();
log.error("执行错误!",e); log.error("执行错误!",e);
return error("执行错误!"+e.getMessage()); return error("执行错误!"+e.getMessage());
} }

64
test-test/src/main/java/com/test/test/service/impl/UiAutomationServiceImpl.java
View File

@@ -85,9 +85,9 @@ public class UiAutomationServiceImpl implements IUiAutomationService {
popupTexts.add(extractionQO); popupTexts.add(extractionQO);
} else if ("2".equals(extractionQO.getAssertionType())) { } else if ("2".equals(extractionQO.getAssertionType())) {
elementAssertions.add(extractionQO); elementAssertions.add(extractionQO);
}else if ("3".equals(extractionQO.getAssertionType())) { } else if ("3".equals(extractionQO.getAssertionType())) {
dropdownBoxes.add(extractionQO); dropdownBoxes.add(extractionQO);
}else if ("4".equals(extractionQO.getAssertionType())) { } else if ("4".equals(extractionQO.getAssertionType())) {
webTitles.add(extractionQO); webTitles.add(extractionQO);
} }
} }
@@ -159,9 +159,9 @@ public class UiAutomationServiceImpl implements IUiAutomationService {
popupTexts.add(extractionQO); popupTexts.add(extractionQO);
} else if ("2".equals(extractionQO.getAssertionType())) { } else if ("2".equals(extractionQO.getAssertionType())) {
elementAssertions.add(extractionQO); elementAssertions.add(extractionQO);
}else if ("3".equals(extractionQO.getAssertionType())) { } else if ("3".equals(extractionQO.getAssertionType())) {
dropdownBoxes.add(extractionQO); dropdownBoxes.add(extractionQO);
}else if ("4".equals(extractionQO.getAssertionType())) { } else if ("4".equals(extractionQO.getAssertionType())) {
webTitles.add(extractionQO); webTitles.add(extractionQO);
} }
} }
@@ -206,6 +206,7 @@ public class UiAutomationServiceImpl implements IUiAutomationService {
} }
return uiHighSettingVOList; return uiHighSettingVOList;
} }
/** /**
* 查询ui自动化列表 * 查询ui自动化列表
* *
@@ -274,25 +275,48 @@ public class UiAutomationServiceImpl implements IUiAutomationService {
uiHighSetting.setCreateTime(DateUtils.getNowDate()); uiHighSetting.setCreateTime(DateUtils.getNowDate());
try { try {
List<DataExtractionQO> combinedList1 = new ArrayList<>(); List<DataExtractionQO> combinedList1 = new ArrayList<>();
// 安全添加 windowExtractions
if (uiHighSettingQO.getDataExtractionQOList() != null &&
uiHighSettingQO.getDataExtractionQOList().getWindowExtractions() != null) {
combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getWindowExtractions()); combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getWindowExtractions());
}
// 安全添加 elementExtractions
if (uiHighSettingQO.getDataExtractionQOList() != null &&
uiHighSettingQO.getDataExtractionQOList().getElementExtractions() != null) {
combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getElementExtractions()); combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getElementExtractions());
}
//数据提取 //数据提取
String jsonStr = objectMapper.writeValueAsString(combinedList1); String jsonStr = objectMapper.writeValueAsString(combinedList1);
if (jsonStr != null) { if (jsonStr != null) {
uiHighSetting.setExtractionDataJson(jsonStr); uiHighSetting.setExtractionDataJson(jsonStr);
} }
//断言
List<AssertionQO> combinedList2 = new ArrayList<>(); List<AssertionQO> combinedList2 = new ArrayList<>();
// 安全添加 popupTexts
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getPopupTexts() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getPopupTexts()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getPopupTexts());
}
// 安全添加 elementAssertions
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getElementAssertions() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getElementAssertions()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getElementAssertions());
}
// 安全添加 dropdownBoxes
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getDropdownBoxes() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getDropdownBoxes()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getDropdownBoxes());
}
// 安全添加 webTitles
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getWebTitles() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getWebTitles()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getWebTitles());
}
jsonStr = objectMapper.writeValueAsString(combinedList2); jsonStr = objectMapper.writeValueAsString(combinedList2);
if (jsonStr != null) { if (jsonStr != null) {
uiHighSetting.setAssertionJson(jsonStr); uiHighSetting.setAssertionJson(jsonStr);
} }
//其他设置 //其他设置
if (uiHighSettingQO.getOtherSettingsQO()!=null) { if (uiHighSettingQO.getOtherSettingsQO() != null) {
jsonStr = objectMapper.writeValueAsString(uiHighSettingQO.getOtherSettingsQO()); jsonStr = objectMapper.writeValueAsString(uiHighSettingQO.getOtherSettingsQO());
uiHighSetting.setOtherSetting(jsonStr); uiHighSetting.setOtherSetting(jsonStr);
} }
@@ -358,25 +382,49 @@ public class UiAutomationServiceImpl implements IUiAutomationService {
uiHighSetting.setCreateTime(DateUtils.getNowDate()); uiHighSetting.setCreateTime(DateUtils.getNowDate());
try { try {
List<DataExtractionQO> combinedList1 = new ArrayList<>(); List<DataExtractionQO> combinedList1 = new ArrayList<>();
// 安全添加 windowExtractions
if (uiHighSettingQO.getDataExtractionQOList() != null &&
uiHighSettingQO.getDataExtractionQOList().getWindowExtractions() != null) {
combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getWindowExtractions()); combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getWindowExtractions());
}
// 安全添加 elementExtractions
if (uiHighSettingQO.getDataExtractionQOList() != null &&
uiHighSettingQO.getDataExtractionQOList().getElementExtractions() != null) {
combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getElementExtractions()); combinedList1.addAll(uiHighSettingQO.getDataExtractionQOList().getElementExtractions());
}
//数据提取 //数据提取
String jsonStr = objectMapper.writeValueAsString(combinedList1); String jsonStr = objectMapper.writeValueAsString(combinedList1);
if (jsonStr != null) { if (jsonStr != null) {
uiHighSetting.setExtractionDataJson(jsonStr); uiHighSetting.setExtractionDataJson(jsonStr);
} }
//断言 // 断言
List<AssertionQO> combinedList2 = new ArrayList<>(); List<AssertionQO> combinedList2 = new ArrayList<>();
// 安全添加 popupTexts
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getPopupTexts() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getPopupTexts()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getPopupTexts());
}
// 安全添加 elementAssertions
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getElementAssertions() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getElementAssertions()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getElementAssertions());
}
// 安全添加 dropdownBoxes
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getDropdownBoxes() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getDropdownBoxes()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getDropdownBoxes());
}
// 安全添加 webTitles
if (uiHighSettingQO.getAssertionQOList() != null &&
uiHighSettingQO.getAssertionQOList().getWebTitles() != null) {
combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getWebTitles()); combinedList2.addAll(uiHighSettingQO.getAssertionQOList().getWebTitles());
}
jsonStr = objectMapper.writeValueAsString(combinedList2); jsonStr = objectMapper.writeValueAsString(combinedList2);
if (jsonStr != null) { if (jsonStr != null) {
uiHighSetting.setAssertionJson(jsonStr); uiHighSetting.setAssertionJson(jsonStr);
} }
//其他设置 //其他设置
if (uiHighSettingQO.getOtherSettingsQO()!=null) { if (uiHighSettingQO.getOtherSettingsQO() != null) {
jsonStr = objectMapper.writeValueAsString(uiHighSettingQO.getOtherSettingsQO()); jsonStr = objectMapper.writeValueAsString(uiHighSettingQO.getOtherSettingsQO());
uiHighSetting.setOtherSetting(jsonStr); uiHighSetting.setOtherSetting(jsonStr);
} }