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

fix(测试跟踪): 测试计划关联功能用例没有同步关联接口用例 

--bug=1018696 --user=陈建星 【测试跟踪】测试计划同步添加关联的接口和性能测试后接口用例未同步 https://www.tapd.cn/55049933/s/1273087
This commit is contained in:
chenjianxing 2022-10-23 12:47:06 +08:00 committed by jianxing
parent c10f8d169f
commit d50272d367
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -629,7 +629,7 @@ public class TestPlanService {
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.performance.name())) { if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.performance.name())) {
performanceIds.add(l.getTestId()); performanceIds.add(l.getTestId());
} }
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.api.name())) { if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.testcase.name())) {
apiCaseIds.add(l.getTestId()); apiCaseIds.add(l.getTestId());
} }
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.automation.name())) { if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.automation.name())) {

42
test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
View File

@ -42,6 +42,7 @@ import io.metersphere.service.remote.api.RelevanceApiCaseService;
import io.metersphere.service.remote.performance.RelevanceLoadCaseService; import io.metersphere.service.remote.performance.RelevanceLoadCaseService;
import io.metersphere.service.remote.project.TrackTestCaseTemplateService; import io.metersphere.service.remote.project.TrackTestCaseTemplateService;
import io.metersphere.service.wapper.TrackProjectService; import io.metersphere.service.wapper.TrackProjectService;
import io.metersphere.utils.DiscoveryUtil;
import io.metersphere.xmind.XmindCaseParser; import io.metersphere.xmind.XmindCaseParser;
import io.metersphere.xmind.pojo.TestCaseXmindData; import io.metersphere.xmind.pojo.TestCaseXmindData;
import io.metersphere.xmind.utils.XmindExportUtil; import io.metersphere.xmind.utils.XmindExportUtil;
@ -2587,20 +2588,35 @@ public class TestCaseService {
List<TestCaseTest> testCaseTests = testCaseTestMapper.selectByExample(example); List<TestCaseTest> testCaseTests = testCaseTestMapper.selectByExample(example);
Map<String, TestCaseTest> testCaseTestsMap = testCaseTests.stream() Map<String, TestCaseTest> testCaseTestsMap = testCaseTests.stream()
.collect(Collectors.toMap(TestCaseTest::getTestId, i -> i)); .collect(Collectors.toMap(TestCaseTest::getTestId, i -> i));
List<ApiTestCase> apiCases = relevanceApiCaseService.getApiCaseByIds(
getTestIds(testCaseTests, TestCaseTestType.testcase.name()));
List<ApiScenario> apiScenarios = relevanceApiCaseService.getScenarioCaseByIds(
getTestIds(testCaseTests, TestCaseTestType.automation.name()));
List<LoadTest> apiLoadTests = relevanceLoadCaseService.getLoadCaseByIds(
getTestIds(testCaseTests, TestCaseTestType.performance.name()));
List<String> projectIds = apiCases.stream().map(c -> c.getProjectId()).collect(Collectors.toList());
projectIds.addAll(apiScenarios.stream().map(s -> s.getProjectId()).collect(Collectors.toList()));
projectIds.addAll(apiLoadTests.stream().map(s -> s.getProjectId()).collect(Collectors.toList()));
projectIds = projectIds.stream().distinct().collect(Collectors.toList());
List<String> versionIds = apiCases.stream().map(c -> c.getVersionId()).collect(Collectors.toList()); Set<String> serviceIdSet = DiscoveryUtil.getServiceIdSet();
versionIds.addAll(apiScenarios.stream().map(s -> s.getVersionId()).collect(Collectors.toList()));
versionIds.addAll(apiLoadTests.stream().map(l -> l.getVersionId()).collect(Collectors.toList())); List<String> projectIds = new ArrayList<>();
List<String> versionIds = new ArrayList<>();
List<ApiTestCase> apiCases = new ArrayList<>();
List<ApiScenario> apiScenarios = new ArrayList<>();
List<LoadTest> apiLoadTests = new ArrayList<>();
if (serviceIdSet.contains(MicroServiceName.API_TEST)) {
apiCases = relevanceApiCaseService.getApiCaseByIds(
getTestIds(testCaseTests, TestCaseTestType.testcase.name()));
apiScenarios = relevanceApiCaseService.getScenarioCaseByIds(
getTestIds(testCaseTests, TestCaseTestType.automation.name()));
projectIds.addAll(apiCases.stream().map(s -> s.getProjectId()).collect(Collectors.toList()));
projectIds.addAll(apiScenarios.stream().map(s -> s.getProjectId()).collect(Collectors.toList()));
versionIds.addAll(apiCases.stream().map(s -> s.getVersionId()).collect(Collectors.toList()));
versionIds.addAll(apiScenarios.stream().map(s -> s.getVersionId()).collect(Collectors.toList()));
}
if (serviceIdSet.contains(MicroServiceName.PERFORMANCE_TEST)) {
apiLoadTests = relevanceLoadCaseService.getLoadCaseByIds(
getTestIds(testCaseTests, TestCaseTestType.performance.name()));
projectIds.addAll(apiLoadTests.stream().map(s -> s.getProjectId()).collect(Collectors.toList()));
versionIds.addAll(apiLoadTests.stream().map(l -> l.getVersionId()).collect(Collectors.toList()));
}
projectIds = projectIds.stream().distinct().collect(Collectors.toList());
versionIds = versionIds.stream().distinct().collect(Collectors.toList()); versionIds = versionIds.stream().distinct().collect(Collectors.toList());
ProjectExample projectExample = new ProjectExample(); ProjectExample projectExample = new ProjectExample();