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

fix(UI 自动化): idea 插件导入保存报错，无response内容修复

This commit is contained in:
zhangdahai112 2022-05-12 17:35:57 +08:00 committed by 刘瑞斌
parent f84d86b3ff
commit d8908db912
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/dto/definition/parse/PostmanDefinitionParser.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
import io.metersphere.api.dto.ApiTestImportRequest;
import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
import io.metersphere.api.dto.definition.response.HttpResponse;
import io.metersphere.api.dto.parse.postman.PostmanCollection;
import io.metersphere.api.dto.parse.postman.PostmanItem;
import io.metersphere.api.dto.parse.postman.PostmanKeyValue;
@ -69,7 +70,7 @@ public class PostmanDefinitionParser extends PostmanAbstractParserParser<ApiDefi
parseItem(childItems, variables, results, module, path + "/" + module.getName(), cases, repeatMap, repeatable);
} else {
MsHTTPSamplerProxy msHTTPSamplerProxy = parsePostman(item);
MsHTTPSamplerProxy response = parsePostmanResponse(item);
HttpResponse response = parsePostmanResponse(item);
ApiDefinitionWithBLOBs request = buildApiDefinition(msHTTPSamplerProxy.getId(), msHTTPSamplerProxy.getName(),
msHTTPSamplerProxy.getPath(), msHTTPSamplerProxy.getMethod(), new ApiTestImportRequest());
request.setPath(msHTTPSamplerProxy.getPath());

14
backend/src/main/java/io/metersphere/api/parse/PostmanAbstractParserParser.java
View File

@ -4,11 +4,13 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
import io.metersphere.api.dto.definition.response.HttpResponse;
import io.metersphere.api.dto.parse.postman.*;
import io.metersphere.api.dto.scenario.Body;
import io.metersphere.api.dto.scenario.KeyValue;
import io.metersphere.commons.constants.MsRequestBodyType;
import io.metersphere.commons.constants.PostmanRequestBodyMode;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.plugin.core.MsTestElement;
import org.apache.commons.collections.CollectionUtils;
@ -49,10 +51,10 @@ public abstract class PostmanAbstractParserParser<T> extends ApiImportAbstractPa
return request;
}
protected MsHTTPSamplerProxy parsePostmanResponse(PostmanItem requestItem) {
protected HttpResponse parsePostmanResponse(PostmanItem requestItem) {
List<PostmanResponse> requestList = requestItem.getResponse();
if (CollectionUtils.isEmpty(requestList)) {
return new MsHTTPSamplerProxy();
return new HttpResponse();
}
PostmanResponse requestDesc = requestItem.getResponse().get(0);
if (requestDesc == null) {
@ -61,6 +63,9 @@ public abstract class PostmanAbstractParserParser<T> extends ApiImportAbstractPa
PostmanUrl url = requestDesc.getOriginalRequest().getUrl();
MsHTTPSamplerProxy request = buildRequest(requestItem.getName(), null, null, requestDesc.getJsonSchema());
request.setRest(parseKeyValue(requestDesc.getOriginalRequest().getUrl().getVariable()));
if (StringUtils.isNotBlank(requestDesc.getBody())) {
request.getBody().setRaw(requestDesc.getBody());
}
if (StringUtils.isNotBlank(request.getPath())) {
String path = request.getPath().split("\\?")[0];
path = parseVariable(path);
@ -73,7 +78,10 @@ public abstract class PostmanAbstractParserParser<T> extends ApiImportAbstractPa
request.setArguments(parseKeyValue(url == null ? new ArrayList<>() : url.getQuery()));
request.setHeaders(parseKeyValue(requestDesc.getHeader()));
addBodyHeader(request);
return request;
HttpResponse response = new HttpResponse();
BeanUtils.copyBean(response, request);
response.setType("HTTP");
return response;
}