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

fix(接口测试): 修复因更换json解析包导致的解析误报内容出错的问题 

--bug=1017901 --user=宋天阳 【接口测试】开启误报-执行接口case和场景后误报设置不生效
https://www.tapd.cn/55049933/s/1265938
This commit is contained in:
song-tianyang 2022-10-18 15:15:55 +08:00 committed by 建国
parent 09da402c26
commit 43a96032b9
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api-test/backend/src/main/java/io/metersphere/service/ExtErrorReportLibraryService.java
View File

@ -1,13 +1,13 @@
package io.metersphere.service;
import io.metersphere.api.dto.definition.request.assertions.MsAssertionDuration;
import io.metersphere.api.dto.definition.request.assertions.MsAssertionRegex;
import io.metersphere.api.dto.definition.request.assertions.MsAssertions;
import io.metersphere.api.dto.definition.request.assertions.document.MsAssertionDocument;
import io.metersphere.base.domain.ErrorReportLibraryExample;
import io.metersphere.base.domain.ErrorReportLibraryWithBLOBs;
import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.ErrorReportLibraryUtil;
import io.metersphere.commons.utils.JSONUtil;
import io.metersphere.commons.utils.*;
import io.metersphere.xpack.fake.error.ErrorReportLibraryService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author song.tianyang
@ -33,7 +34,16 @@ public class ExtErrorReportLibraryService {
bloBs.forEach(item -> {
if (StringUtils.isNotEmpty(item.getContent())) {
try {
MsAssertions assertions = JSONUtil.parseObject(item.getContent(), MsAssertions.class);
MsAssertions assertions = new MsAssertions();
Map<String, Object> assertionMap = JSON.parseObject(item.getContent(), Map.class);
if (assertionMap != null) {
MsAssertionDuration duration = JSONUtil.parseObject(JSONUtil.toJSONString(assertionMap.get("duration")), MsAssertionDuration.class);
List<MsAssertionRegex> regexList = JSON.parseArray(JSONUtil.toJSONString(assertionMap.get("regex")), MsAssertionRegex.class);
MsAssertionDocument document = JSONUtil.parseObject(JSONUtil.toJSONString(assertionMap.get("document")), MsAssertionDocument.class);
assertions.setDuration(duration);
assertions.setRegex(regexList);
assertions.setDocument(document);
}
if (assertions != null && CollectionUtils.isNotEmpty(assertions.getRegex())) {
if (StringUtils.isEmpty(assertions.getRegex().get(0).getDescription())) {
String desc = assertions.getRegex().get(0).getSubject() + ":" + assertions.getRegex().get(0).getExpression()