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

refactor(接口测试): 优化json中包含mock数据的处理逻辑

This commit is contained in:
wxg0103 2023-03-13 19:06:09 +08:00 committed by wxg0103
parent 191f15491c
commit 458e68d61a
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
api-test/backend/src/main/java/io/metersphere/api/dto/scenario/Body.java
View File

@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Data @Data
@ -90,37 +92,39 @@ public class Body {
private void parseMock() { private void parseMock() {
if (StringUtils.isNotEmpty(this.getRaw())) { if (StringUtils.isNotEmpty(this.getRaw())) {
String value = StringUtils.chomp(this.getRaw().trim()); String value = StringUtils.chomp(this.getRaw().trim());
if (StringUtils.startsWith(value, "[") && StringUtils.endsWith(value, "]")) { try {
List list = JSON.parseArray(this.getRaw()); if (StringUtils.startsWith(value, "[") && StringUtils.endsWith(value, "]")) {
if (!this.getRaw().contains(ElementConstants.REF)) { List list = JSON.parseArray(this.getRaw());
jsonMockParse(list); if (!this.getRaw().contains(ElementConstants.REF)) {
jsonMockParse(list);
}
this.raw = JSONUtil.parserArray(JSONUtil.toJSONString(list));
} else {
Map<String, Object> map = JSON.parseObject(this.getRaw(), Map.class);
if (!this.getRaw().contains(ElementConstants.REF)) {
jsonMockParse(map);
}
this.raw = JSONUtil.parserObject(JSONUtil.toJSONString(map));
} }
this.raw = JSONUtil.toJSONString(list); } catch (Exception e) {
} else { String pattern = "@[a-zA-Z]*";
Map<String, Object> map = JSON.parseObject(this.getRaw(), Map.class); Pattern regex = Pattern.compile(pattern);
if (!this.getRaw().contains(ElementConstants.REF)) { Matcher matcher = regex.matcher(this.raw);
jsonMockParse(map); while (matcher.find()) {
this.raw = this.raw.replace(matcher.group(), "${__Mock(" + matcher.group() + ")}");
} }
this.raw = JSONUtil.toJSONString(map);
} }
} }
} }
private void analyticalData() { private void analyticalData() {
try { try {
boolean isArray = false;
if (StringUtils.isNotBlank(this.type) && StringUtils.equals(this.type, JSON_STR)) { if (StringUtils.isNotBlank(this.type) && StringUtils.equals(this.type, JSON_STR)) {
if (StringUtils.isNotEmpty(this.format) && this.getJsonSchema() != null && JSON_SCHEMA.equals(this.format)) { if (StringUtils.isNotEmpty(this.format) && this.getJsonSchema() != null && JSON_SCHEMA.equals(this.format)) {
this.raw = StringEscapeUtils.unescapeJava(JSONSchemaBuilder.generator(JSONUtil.toJSONString(this.getJsonSchema()))); this.raw = StringEscapeUtils.unescapeJava(JSONSchemaBuilder.generator(JSONUtil.toJSONString(this.getJsonSchema())));
} else { } else {
parseMock(); parseMock();
} }
// 格式化处理
if (isArray) {
this.raw = JSONUtil.parserArray(this.raw);
} else {
this.raw = JSONUtil.parserObject(this.raw);
}
} }
} catch (Exception e) { } catch (Exception e) {
LoggerUtil.error("json mock value is abnormal", e); LoggerUtil.error("json mock value is abnormal", e);

3
api-test/backend/src/main/java/io/metersphere/api/exec/generator/JSONSchemaBuilder.java
View File

@ -61,6 +61,7 @@ public class JSONSchemaBuilder {
String str = ScriptEngineUtils.calculate(evlValue); String str = ScriptEngineUtils.calculate(evlValue);
switch (evlValue) { switch (evlValue) {
case "@integer": case "@integer":
case "@natural":
concept.put(propertyName, NumberUtils.parseNumber(str, Long.class)); concept.put(propertyName, NumberUtils.parseNumber(str, Long.class));
break; break;
case "@boolean": case "@boolean":
@ -169,7 +170,7 @@ public class JSONSchemaBuilder {
} }
public static void processArrayValue(Map<String, String> map, String value) { public static void processArrayValue(Map<String, String> map, String value) {
String key = StringUtils.join("\"",value, "\""); String key = StringUtils.join("\"", value, "\"");
String targetValue = StringUtils.join(value); String targetValue = StringUtils.join(value);
map.put(key, targetValue); map.put(key, targetValue);
} }