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

fix(接口测试): 修复场景复制自定义请求时会造成接口覆盖率不准确的问题

This commit is contained in:
Jianguo-Genius 2024-11-29 15:12:53 +08:00 committed by 建国
parent 633e540b30
commit 28afcbf901
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api-test/backend/src/main/java/io/metersphere/controller/home/ApiHomeController.java
View File

@ -140,8 +140,8 @@ public class ApiHomeController {
List<ApiDefinition> apiDefinitionHasCase = apiDefinitionService.selectBaseInfoByProjectIdAndHasCase(projectId, versionId);
//没有case的接口
List<ApiDefinition> apiNoCaseList = apiDefinitionService.getAPiNotInCollection(protocolAllDefinitionMap, apiDefinitionHasCase);
Map<String, Map<String, String>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(projectId, null);
List<String> apiIdInScenario = apiAutomationService.getApiIdInScenario(projectId, scenarioUrlList, apiNoCaseList);
Map<String, Map<String, List<String>>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(projectId, null);
List<String> apiIdInScenario = apiAutomationService.getApiIdInScenario(scenarioUrlList, apiNoCaseList);
Map<String, List<ApiDefinition>> unCoverageApiMap = apiDefinitionService.getUnCoverageApiMap(apiNoCaseList, apiIdInScenario);
Map<String, List<ApiDefinition>> coverageApiMap = apiDefinitionService.filterMap(protocolAllDefinitionMap, unCoverageApiMap);
@ -213,7 +213,7 @@ public class ApiHomeController {
ApiDataCountDTO apiCountResult = new ApiDataCountDTO();
//统计覆盖率
CoveredDTO coveredDTO = new CoveredDTO();
Map<String, Map<String, String>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(projectId, versionId);
Map<String, Map<String, List<String>>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(projectId, versionId);
List<ApiDefinition> allEffectiveApiIdList = apiDefinitionService.selectEffectiveIdByProjectId(projectId, versionId);
try {
coveredDTO = apiAutomationService.countInterfaceCoverage(projectId, scenarioUrlList, allEffectiveApiIdList);

4
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
View File

@ -431,8 +431,8 @@ public class ApiDefinitionService {
}
if (CollectionUtils.isNotEmpty(definitionList)) {
//如果查询条件中有未覆盖/已覆盖， 则需要解析出没有用例的接口中，有多少是符合场景覆盖规律的。然后将这些接口的id作为查询参数. 这里不根据版本筛选覆盖的url。
Map<String, Map<String, String>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(request.getProjectId(), null);
List<String> apiIdInScenario = apiAutomationService.getApiIdInScenario(request.getProjectId(), scenarioUrlList, definitionList);
Map<String, Map<String, List<String>>> scenarioUrlList = apiAutomationService.selectScenarioUseUrlByProjectId(request.getProjectId(), null);
List<String> apiIdInScenario = apiAutomationService.getApiIdInScenario(scenarioUrlList, definitionList);
if (CollectionUtils.isNotEmpty(apiIdInScenario)) {
request.setCoverageIds(apiIdInScenario);
}

31
api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioService.java
View File

@ -1877,12 +1877,12 @@ public class ApiScenarioService {
* @param apiList 接口集合（id / path 必须有数据）
* @return
*/
public CoveredDTO countInterfaceCoverage(String projectId, Map<String, Map<String, String>> scenarioUrlMap, List<ApiDefinition> apiList) {
public CoveredDTO countInterfaceCoverage(String projectId, Map<String, Map<String, List<String>>> scenarioUrlMap, List<ApiDefinition> apiList) {
CoveredDTO coverage = new CoveredDTO();
if (CollectionUtils.isEmpty(apiList)) {
return coverage;
}
int urlContainsCount = this.getApiIdInScenario(projectId, scenarioUrlMap, apiList).size();
int urlContainsCount = this.getApiIdInScenario(scenarioUrlMap, apiList).size();
coverage.setCovered(urlContainsCount);
coverage.setNotCovered(apiList.size() - urlContainsCount);
float coverageRageNumber = (float) urlContainsCount * 100 / apiList.size();
@ -1891,21 +1891,22 @@ public class ApiScenarioService {
return coverage;
}
public List<String> getApiIdInScenario(String projectId, Map<String, Map<String, String>> scenarioUrlMap, List<ApiDefinition> apiList) {
public List<String> getApiIdInScenario(Map<String, Map<String, List<String>>> scenarioUrlMap, List<ApiDefinition> apiList) {
List<String> apiIdList = new ArrayList<>();
if (MapUtils.isNotEmpty(scenarioUrlMap) && CollectionUtils.isNotEmpty(apiList)) {
for (ApiDefinition model : apiList) {
if (StringUtils.equalsIgnoreCase(model.getProtocol(), "http")) {
Map<String, String> stepIdAndUrlMap = scenarioUrlMap.get(model.getMethod());
Map<String, List<String>> stepIdAndUrlMap = scenarioUrlMap.get(model.getMethod());
if (stepIdAndUrlMap != null) {
Collection<String> scenarioUrlList = scenarioUrlMap.get(model.getMethod()).values();
Collection<String> scenarioUrlList = scenarioUrlMap.get(model.getMethod()).values()
.stream().flatMap(Collection::stream).collect(Collectors.toList());
boolean matchedUrl = MockApiUtils.isUrlInList(model.getPath(), scenarioUrlList);
if (matchedUrl) {
apiIdList.add(model.getId());
}
}
} else {
Map<String, String> stepIdAndUrlMap = scenarioUrlMap.get("MS_NOT_HTTP");
Map<String, List<String>> stepIdAndUrlMap = scenarioUrlMap.get("MS_NOT_HTTP");
if (stepIdAndUrlMap != null && stepIdAndUrlMap.containsKey(model.getId())) {
apiIdList.add(model.getId());
}
@ -2325,17 +2326,25 @@ public class ApiScenarioService {
* @param projectId
* @return <get/post, <step-id,url>>
*/
public Map<String, Map<String, String>> selectScenarioUseUrlByProjectId(String projectId, String versionId) {
public Map<String, Map<String, List<String>>> selectScenarioUseUrlByProjectId(String projectId, String versionId) {
List<ApiScenarioReferenceId> list = apiScenarioReferenceIdService.selectUrlByProjectId(projectId, versionId);
Map<String, Map<String, String>> returnMap = new HashMap<>();
Map<String, Map<String, List<String>>> returnMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {
String method = item.getMethod() == null ? "MS_NOT_HTTP" : item.getMethod();
if (returnMap.containsKey(method)) {
returnMap.get(method).put(item.getReferenceId(), StringUtils.trim(item.getUrl()));
if (returnMap.get(method).containsKey(item.getReferenceId())) {
returnMap.get(method).get(item.getReferenceId()).add(StringUtils.trim(item.getUrl()));
} else {
returnMap.get(method).put(item.getReferenceId(), new ArrayList<>() {{
this.add(StringUtils.trim(item.getUrl()));
}});
}
} else {
Map<String, String> urlMap = new HashMap<>() {{
this.put(item.getReferenceId(), StringUtils.trim(item.getUrl()));
Map<String, List<String>> urlMap = new HashMap<>() {{
this.put(item.getReferenceId(), new ArrayList<>() {{
this.add(StringUtils.trim(item.getUrl()));
}});
}};
returnMap.put(method, urlMap);
}