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

test(接口测试): 调整接口覆盖率计算的单元测试

This commit is contained in:
Jianguo-Genius 2024-11-26 14:49:29 +08:00 committed by 刘瑞斌
parent bde39eb0c5
commit f6daf2fe8d
4 changed files with 59 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioStepMapper.xml
View File

@ -45,6 +45,6 @@
where scenario.project_id = #{0} where scenario.project_id = #{0}
AND scenario.deleted IS FALSE AND scenario.deleted IS FALSE
AND step.step_type IN ('API', 'API_CASE', 'CUSTOM_REQUEST') AND step.step_type IN ('API', 'API_CASE', 'CUSTOM_REQUEST')
AND JSON_EXTRACT(step.config, '$.protocol') = 'http' AND JSON_UNQUOTE(JSON_EXTRACT(LOWER(step.config), '$.protocol')) = 'http'
</select> </select>
</mapper> </mapper>

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

@ -2635,7 +2635,6 @@ public class ApiScenarioService extends MoveNodeService {
return Collections.emptyList(); return Collections.emptyList();
} }
// 分批处理配置请求 ID 列表 // 分批处理配置请求 ID 列表
Map<String, Set<String>> methodPathMap = new HashMap<>(); Map<String, Set<String>> methodPathMap = new HashMap<>();
SubListUtils.dealForSubList(requestIdList, 200, batchIds -> { SubListUtils.dealForSubList(requestIdList, 200, batchIds -> {

85
backend/services/api-test/src/main/java/io/metersphere/api/utils/ApiDefinitionUtils.java
View File

@ -25,49 +25,43 @@ public class ApiDefinitionUtils {
if (StringUtils.isEmpty(customRequestUrl)) { if (StringUtils.isEmpty(customRequestUrl)) {
continue; continue;
} }
if (customRequestUrl.startsWith("/")) {
customRequestUrl = customRequestUrl.substring(1); customRequestUrl = pretreatmentUrl(customRequestUrl);
}
if (StringUtils.isNotEmpty(customRequestUrl)) { String[] customUrlArr = customRequestUrl.split("/");
if (customRequestUrl.contains("?")) {
customRequestUrl = customRequestUrl.substring(0, customRequestUrl.indexOf("?")); if (StringUtils.startsWithAny(customRequestUrl.toLowerCase(), "https://", "http://")
&& customUrlArr.length >= urlParams.length) {
boolean isFetch = true;
for (int urlIndex = 0; urlIndex < urlParams.length; urlIndex++) {
String urlItem = urlParams[urlIndex];
String customUrlItem = customUrlArr[customUrlArr.length - urlParams.length + urlIndex];
// 不为rest参数的要进行全匹配。 而且忽略大小写
if (isRestUrlParam(customUrlItem) && isRestUrlParam(urlItem)) {
if (!StringUtils.equalsIgnoreCase(customUrlItem, urlItem)) {
isFetch = false;
break;
}
}
} }
String[] customUrlArr = customRequestUrl.split("/"); if (isFetch) {
return true;
if (StringUtils.startsWithAny(customRequestUrl.toLowerCase(), "https://", "http://") }
&& customUrlArr.length >= urlParams.length) { } else if (customUrlArr.length == urlParams.length) {
boolean isFetch = true; boolean isFetch = true;
for (int urlIndex = 0; urlIndex < urlParams.length; urlIndex++) { for (int urlIndex = 0; urlIndex < urlParams.length; urlIndex++) {
String urlItem = urlParams[urlIndex]; String urlItem = urlParams[urlIndex];
String customUrlItem = customUrlArr[customUrlArr.length - urlParams.length + urlIndex]; String customUrlItem = customUrlArr[urlIndex];
// 不为rest参数的要进行全匹配。 而且忽略大小写 // 不为rest参数的要进行全匹配。 而且忽略大小写
if (isRestUrlParam(customUrlItem) && isRestUrlParam(urlItem)) { if (isRestUrlParam(customUrlItem) && isRestUrlParam(urlItem)) {
if (!StringUtils.equalsIgnoreCase(customUrlItem, urlItem)) { if (!StringUtils.equalsIgnoreCase(customUrlItem, urlItem)) {
isFetch = false; isFetch = false;
break; break;
}
} }
} }
if (isFetch) { }
return true; if (isFetch) {
} return true;
} else if (customUrlArr.length == urlParams.length) {
boolean isFetch = true;
for (int urlIndex = 0; urlIndex < urlParams.length; urlIndex++) {
String urlItem = urlParams[urlIndex];
String customUrlItem = customUrlArr[urlIndex];
// 不为rest参数的要进行全匹配。 而且忽略大小写
if (isRestUrlParam(customUrlItem) && isRestUrlParam(urlItem)) {
if (!StringUtils.equalsIgnoreCase(customUrlItem, urlItem)) {
isFetch = false;
break;
}
}
}
if (isFetch) {
return true;
}
} }
} }
} }
@ -75,6 +69,17 @@ public class ApiDefinitionUtils {
return false; return false;
} }
private static String pretreatmentUrl(String customRequestUrl) {
if (customRequestUrl.startsWith("/")) {
customRequestUrl = customRequestUrl.substring(1);
}
if (customRequestUrl.contains("?")) {
customRequestUrl = customRequestUrl.substring(0, customRequestUrl.indexOf("?"));
}
return customRequestUrl;
}
private static boolean isRestUrlParam(String urlParam) { private static boolean isRestUrlParam(String urlParam) {
return !StringUtils.startsWith(urlParam, "{") || !StringUtils.endsWith(urlParam, "}") || StringUtils.equals(urlParam, "{}"); return !StringUtils.startsWith(urlParam, "{") || !StringUtils.endsWith(urlParam, "}") || StringUtils.equals(urlParam, "{}");
} }

17
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiCalculateTest.java
View File

@ -165,6 +165,9 @@ public class ApiCalculateTest extends BaseTest {
stepRequest.setName(apiTestCase.getName() + "_step"); stepRequest.setName(apiTestCase.getName() + "_step");
stepRequest.setRefType(ApiScenarioStepRefType.REF.name()); stepRequest.setRefType(ApiScenarioStepRefType.REF.name());
stepRequest.setProjectId(project.getId()); stepRequest.setProjectId(project.getId());
stepRequest.setConfig(new HashMap<>() {{
this.put("protocol", "http");
}});
steps.add(stepRequest); steps.add(stepRequest);
steptDetailMap.put(stepRequest.getId(), JSON.parseObject(ApiDataUtils.toJSONString(msHttpElement))); steptDetailMap.put(stepRequest.getId(), JSON.parseObject(ApiDataUtils.toJSONString(msHttpElement)));
} }
@ -179,6 +182,9 @@ public class ApiCalculateTest extends BaseTest {
stepRequest.setName("custom_step"); stepRequest.setName("custom_step");
stepRequest.setRefType(ApiScenarioStepRefType.DIRECT.name()); stepRequest.setRefType(ApiScenarioStepRefType.DIRECT.name());
stepRequest.setProjectId(project.getId()); stepRequest.setProjectId(project.getId());
stepRequest.setConfig(new HashMap<>() {{
this.put("protocol", "http");
}});
steps.add(stepRequest); steps.add(stepRequest);
MsHTTPElement customElement = MsHTTPElementTest.getMsHttpElement(); MsHTTPElement customElement = MsHTTPElementTest.getMsHttpElement();
@ -197,6 +203,9 @@ public class ApiCalculateTest extends BaseTest {
stepRequest.setName(resultData.getName() + "_step"); stepRequest.setName(resultData.getName() + "_step");
stepRequest.setRefType(ApiScenarioStepRefType.REF.name()); stepRequest.setRefType(ApiScenarioStepRefType.REF.name());
stepRequest.setProjectId(project.getId()); stepRequest.setProjectId(project.getId());
stepRequest.setConfig(new HashMap<>() {{
this.put("protocol", "http");
}});
steps.add(stepRequest); steps.add(stepRequest);
steptDetailMap.put(stepRequest.getId(), JSON.parseObject(ApiDataUtils.toJSONString(msHttpElement))); steptDetailMap.put(stepRequest.getId(), JSON.parseObject(ApiDataUtils.toJSONString(msHttpElement)));
} }
@ -226,12 +235,12 @@ public class ApiCalculateTest extends BaseTest {
Assertions.assertEquals(16, apiCoverageDTO.getUnCoverWithApiCase()); Assertions.assertEquals(16, apiCoverageDTO.getUnCoverWithApiCase());
Assertions.assertEquals(apiCoverageDTO.getApiCaseCoverage(), CalculateUtils.reportPercentage(apiCoverageDTO.getCoverWithApiCase(), apiCoverageDTO.getAllApiCount())); Assertions.assertEquals(apiCoverageDTO.getApiCaseCoverage(), CalculateUtils.reportPercentage(apiCoverageDTO.getCoverWithApiCase(), apiCoverageDTO.getAllApiCount()));
Assertions.assertEquals(4, apiCoverageDTO.getCoverWithApiScenario()); Assertions.assertEquals(8, apiCoverageDTO.getCoverWithApiScenario());
Assertions.assertEquals(16, apiCoverageDTO.getUnCoverWithApiScenario()); Assertions.assertEquals(12, apiCoverageDTO.getUnCoverWithApiScenario());
Assertions.assertEquals(apiCoverageDTO.getScenarioCoverage(), CalculateUtils.reportPercentage(apiCoverageDTO.getCoverWithApiScenario(), apiCoverageDTO.getAllApiCount())); Assertions.assertEquals(apiCoverageDTO.getScenarioCoverage(), CalculateUtils.reportPercentage(apiCoverageDTO.getCoverWithApiScenario(), apiCoverageDTO.getAllApiCount()));
Assertions.assertEquals(6, apiCoverageDTO.getCoverWithApiDefinition()); Assertions.assertEquals(10, apiCoverageDTO.getCoverWithApiDefinition());
Assertions.assertEquals(14, apiCoverageDTO.getUnCoverWithApiDefinition()); Assertions.assertEquals(10, apiCoverageDTO.getUnCoverWithApiDefinition());
Assertions.assertEquals(apiCoverageDTO.getApiCoverage(), CalculateUtils.reportPercentage(apiCoverageDTO.getCoverWithApiDefinition(), apiCoverageDTO.getAllApiCount())); Assertions.assertEquals(apiCoverageDTO.getApiCoverage(), CalculateUtils.reportPercentage(apiCoverageDTO.getCoverWithApiDefinition(), apiCoverageDTO.getAllApiCount()));
Assertions.assertEquals("0.00%", CalculateUtils.reportPercentage(0, 0)); Assertions.assertEquals("0.00%", CalculateUtils.reportPercentage(0, 0));