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

refactor(接口测试): 优化mock执行

This commit is contained in:
wxg0103 2024-05-10 19:31:51 +08:00 committed by Craftsman
parent 457d709102
commit 83062061c9
3 changed files with 45 additions and 25 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/dto/mockserver/HttpRequestParam.java
View File

@ -17,6 +17,8 @@ public class HttpRequestParam {
//form-data的kv类型参数也存储在queryParamObj中 //form-data的kv类型参数也存储在queryParamObj中
private LinkedHashMap<String, String> queryParamsObj; private LinkedHashMap<String, String> queryParamsObj;
private LinkedHashMap<String, String> bodyParamsObj;
private String paramType; private String paramType;
//JSONArray 或 JSONObject //JSONArray 或 JSONObject

10
backend/services/api-test/src/main/java/io/metersphere/api/dto/mockserver/MockMatchRule.java
View File

@ -42,6 +42,9 @@ public class MockMatchRule implements Serializable {
if (!this.keyValueMatch("rest", httpRequestParam.getRestParams())) { if (!this.keyValueMatch("rest", httpRequestParam.getRestParams())) {
return false; return false;
} }
if (!this.keyValueMatch("query", httpRequestParam.getQueryParamsObj())) {
return false;
}
if (httpRequestParam.isPost()) { if (httpRequestParam.isPost()) {
switch (Body.BodyType.valueOf(body.getBodyType())) { switch (Body.BodyType.valueOf(body.getBodyType())) {
case XML: case XML:
@ -67,16 +70,15 @@ public class MockMatchRule implements Serializable {
formDataBodyRule.getMatchRules().add(keyValueInfo); formDataBodyRule.getMatchRules().add(keyValueInfo);
}); });
} }
return formDataBodyRule.match(httpRequestParam.getQueryParamsObj()); return formDataBodyRule.match(httpRequestParam.getBodyParamsObj());
case RAW: case RAW:
return StringUtils.contains(body.getRawBody().getValue(), httpRequestParam.getRaw()); return StringUtils.contains(body.getRawBody().getValue(), httpRequestParam.getRaw());
case WWW_FORM: case WWW_FORM:
return body.getWwwFormBody().match(httpRequestParam.getQueryParamsObj()); return body.getWwwFormBody().match(httpRequestParam.getBodyParamsObj());
default: default:
return true; return true;
} }
} else {
return this.keyValueMatch("query", httpRequestParam.getQueryParamsObj());
} }
return true;
} }
} }

30
backend/services/api-test/src/main/java/io/metersphere/api/utils/MockServerUtils.java
View File

@ -10,6 +10,7 @@ import jakarta.servlet.http.Part;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.web.servlet.ShiroHttpServletRequest; import org.apache.shiro.web.servlet.ShiroHttpServletRequest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -44,33 +45,48 @@ public class MockServerUtils {
try { try {
if (request instanceof ShiroHttpServletRequest shiroHttpServletRequest) { if (request instanceof ShiroHttpServletRequest shiroHttpServletRequest) {
InputStream inputStream = shiroHttpServletRequest.getRequest().getInputStream(); InputStream inputStream = shiroHttpServletRequest.getRequest().getInputStream();
if (inputStream != null) { if (inputStream != null && inputStream.available() > 0) {
queryParamsMap.put("binaryFile", new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).readLine()); queryParamsMap.put("binaryFile", new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).readLine());
} }
} }
Collection<Part> parts = request.getParts(); String queryString = request.getQueryString();
if (StringUtils.isNotEmpty(queryString)) {
String[] queryParamArr = queryString.split("&");
for (String queryParam : queryParamArr) {
String[] queryParamKV = queryParam.split("=");
if (queryParamKV.length == 2) {
queryParamsMap.put(queryParamKV[0], queryParamKV[1]);
}
}
}
requestParam.setQueryParamsObj(queryParamsMap);
if (request instanceof StandardMultipartHttpServletRequest standardMultipartHttpServletRequest) {
LinkedHashMap<String, String> bodyParams = new LinkedHashMap<>();
Collection<Part> parts = standardMultipartHttpServletRequest.getParts();
for (Part part : parts) { for (Part part : parts) {
String name = part.getName(); String name = part.getName();
String fileName = part.getSubmittedFileName(); String fileName = part.getSubmittedFileName();
String value = new BufferedReader(new InputStreamReader(part.getInputStream(), StandardCharsets.UTF_8)).readLine(); String value = new BufferedReader(new InputStreamReader(part.getInputStream(), StandardCharsets.UTF_8)).readLine();
if (StringUtils.isBlank(fileName)) { if (StringUtils.isBlank(fileName)) {
queryParamsMap.put(name, value); bodyParams.put(name, value);
} }
if (StringUtils.isNotEmpty(fileName)) { if (StringUtils.isNotEmpty(fileName)) {
queryParamsMap.computeIfPresent(name, (key, currentValue) -> { bodyParams.computeIfPresent(name, (key, currentValue) -> {
List<String> current = JSON.parseArray(currentValue, String.class); List<String> current = JSON.parseArray(currentValue, String.class);
current.add(fileName); current.add(fileName);
return JSON.toJSONString(current); return JSON.toJSONString(current);
}); });
if (!queryParamsMap.containsKey(name)) { if (!bodyParams.containsKey(name)) {
List<String> current = new ArrayList<>(); List<String> current = new ArrayList<>();
current.add(fileName); current.add(fileName);
queryParamsMap.put(name, JSON.toJSONString(current)); bodyParams.put(name, JSON.toJSONString(current));
} }
} }
requestParam.setBodyParamsObj(bodyParams);
} }
}catch (Exception e){ }
} catch (Exception e) {
LogUtils.error(e.getMessage()); LogUtils.error(e.getMessage());
} }