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-11 16:01:22 +08:00 committed by Craftsman
parent f49e05df1a
commit 2b8486732d
3 changed files with 64 additions and 11 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/service/ApiCommonService.java
View File

@ -103,7 +103,7 @@ public class ApiCommonService {
setLinkFileInfo(resourceId, getApiBodyFiles(responseBody));
}
private void setLinkFileInfo(String resourceId, List<ApiFile> apiFiles) {
public void setLinkFileInfo(String resourceId, List<ApiFile> apiFiles) {
List<ApiFile> linkFiles = apiFiles.stream()
.filter(file -> {
if (file.getLocal()) {

44
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionMockService.java
View File

@ -3,6 +3,7 @@ package io.metersphere.api.service.definition;
import io.metersphere.api.constants.ApiResourceType;
import io.metersphere.api.controller.result.ApiResultCode;
import io.metersphere.api.domain.*;
import io.metersphere.api.dto.ApiFile;
import io.metersphere.api.dto.debug.ApiFileResourceUpdateRequest;
import io.metersphere.api.dto.definition.ApiDefinitionMockDTO;
import io.metersphere.api.dto.definition.ApiMockBatchEditRequest;
@ -11,12 +12,13 @@ import io.metersphere.api.dto.definition.request.ApiDefinitionMockAddRequest;
import io.metersphere.api.dto.definition.request.ApiDefinitionMockPageRequest;
import io.metersphere.api.dto.definition.request.ApiDefinitionMockRequest;
import io.metersphere.api.dto.definition.request.ApiDefinitionMockUpdateRequest;
import io.metersphere.api.dto.mockserver.MockMatchRule;
import io.metersphere.api.dto.mockserver.MockResponse;
import io.metersphere.api.dto.mockserver.*;
import io.metersphere.api.dto.request.http.body.BinaryBody;
import io.metersphere.api.mapper.ApiDefinitionMapper;
import io.metersphere.api.mapper.ApiDefinitionMockConfigMapper;
import io.metersphere.api.mapper.ApiDefinitionMockMapper;
import io.metersphere.api.mapper.ExtApiDefinitionMockMapper;
import io.metersphere.api.service.ApiCommonService;
import io.metersphere.api.service.ApiFileResourceService;
import io.metersphere.api.utils.ApiDataUtils;
import io.metersphere.project.dto.environment.EnvironmentInfoDTO;
@ -92,6 +94,8 @@ public class ApiDefinitionMockService {
private ApiDefinitionMockNoticeService apiDefinitionMockNoticeService;
@Resource
private OperationHistoryService operationHistoryService;
@Resource
private ApiCommonService apiCommonService;
public static final String STATUS = "Status";
public static final String TAGS = "Tags";
private static final String MOCK_TABLE = "api_definition_mock";
@ -112,11 +116,43 @@ public class ApiDefinitionMockService {
public void handleMockConfig(String id, ApiDefinitionMockDTO apiDefinitionMockDTO) {
Optional<ApiDefinitionMockConfig> apiDefinitionMockConfigOptional = Optional.ofNullable(apiDefinitionMockConfigMapper.selectByPrimaryKey(id));
apiDefinitionMockConfigOptional.ifPresent(config -> {
apiDefinitionMockDTO.setMockMatchRule(ApiDataUtils.parseObject(new String(config.getMatching()), MockMatchRule.class));
apiDefinitionMockDTO.setResponse(ApiDataUtils.parseObject(new String(config.getResponse()), MockResponse.class));
MockMatchRule matchRule = ApiDataUtils.parseObject(new String(config.getMatching()), MockMatchRule.class);
if (matchRule != null) {
setLinkFileInfo(id, matchRule.getBody());
apiDefinitionMockDTO.setMockMatchRule(matchRule);
}
if (config.getResponse() != null) {
MockResponse httpResponses = ApiDataUtils.parseObject(new String(config.getResponse()), MockResponse.class);
apiCommonService.setLinkFileInfo(id, httpResponses.getBody());
apiDefinitionMockDTO.setResponse(httpResponses);
}
});
}
public void setLinkFileInfo(String id, BodyParamMatchRule body) {
List<ApiFile> updateFiles = new ArrayList<>(0);
if (body != null) {
MockFormDataBody formDataBody = body.getFormDataBody();
if (formDataBody != null) {
List<FormKeyValueInfo> formValues = formDataBody.getMatchRules();
if (CollectionUtils.isNotEmpty(formValues)) {
formValues.forEach(keyValueInfo -> {
List<ApiFile> files = keyValueInfo.getFiles();
if (CollectionUtils.isNotEmpty(files)) {
updateFiles.addAll(files);
}
});
}
}
BinaryBody binaryBody = body.getBinaryBody();
if (binaryBody != null && binaryBody.getFile() != null) {
updateFiles.add(binaryBody.getFile());
}
}
apiCommonService.setLinkFileInfo(id, updateFiles);
}
public void handleApiDefinition(String id, ApiDefinitionMockDTO apiDefinitionMockDTO) {
Optional.ofNullable(apiDefinitionMapper.selectByPrimaryKey(id)).ifPresent(apiDefinition -> {
apiDefinitionMockDTO.setApiNum(apiDefinition.getNum());

29
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionMockControllerTests.java
View File

@ -10,9 +10,7 @@ import io.metersphere.api.dto.definition.request.ApiDefinitionMockAddRequest;
import io.metersphere.api.dto.definition.request.ApiDefinitionMockPageRequest;
import io.metersphere.api.dto.definition.request.ApiDefinitionMockRequest;
import io.metersphere.api.dto.definition.request.ApiDefinitionMockUpdateRequest;
import io.metersphere.api.dto.mockserver.KeyValueInfo;
import io.metersphere.api.dto.mockserver.MockMatchRule;
import io.metersphere.api.dto.mockserver.MockResponse;
import io.metersphere.api.dto.mockserver.*;
import io.metersphere.api.dto.request.ApiTransferRequest;
import io.metersphere.api.dto.request.http.*;
import io.metersphere.api.dto.request.http.body.*;
@ -222,6 +220,26 @@ public class ApiDefinitionMockControllerTests extends BaseTest {
request.setProjectId(DEFAULT_PROJECT_ID);
request.setApiDefinitionId(DEFAULT_API_ID);
MockMatchRule mockMatchRule = new MockMatchRule();
String binaryFiled = doUploadTempFile(mockServerTestService.getMockMultipartFile("request.JPG"));
mockMatchRule.getBody().setBinaryBody(new BinaryBody() {{
this.setFile(new ApiFile());
this.getFile().setFileId(binaryFiled);
this.getFile().setFileName("request.JPG");
}});
String requestFiled = doUploadTempFile(mockServerTestService.getMockMultipartFile("request111.JPG"));
List<FormKeyValueInfo> matchRules = new ArrayList<>();
matchRules.add(new FormKeyValueInfo() {{
this.setKey("key1");
this.setFiles(List.of(new ApiFile() {{
this.setFileId(requestFiled);
this.setFileName("request111.JPG");
}}));
}});
mockMatchRule.getBody().setFormDataBody(new MockFormDataBody() {{
this.setMatchRules(matchRules);
}});
request.setMockMatchRule(mockMatchRule);
uploadFileId = doUploadTempFile(mockServerTestService.getMockMultipartFile("file_upload.JPG"));
MockResponse mockResponse = new MockResponse();
@ -309,7 +327,6 @@ public class ApiDefinitionMockControllerTests extends BaseTest {
copyApiDefinitionMockDTO.setMockMatchRule(ApiDataUtils.parseObject(new String(apiDefinitionMockConfig.getMatching()), MockMatchRule.class));
copyApiDefinitionMockDTO.setResponse(ApiDataUtils.parseObject(new String(apiDefinitionMockConfig.getResponse()), MockResponse.class));
}
Assertions.assertEquals(apiDefinitionMockDTO, copyApiDefinitionMockDTO);
apiDefinitionMockRequest.setId("111");
assertErrorCode(this.requestPost(DETAIL, apiDefinitionMockRequest), MsHttpResultCode.NOT_FOUND);
@ -821,7 +838,7 @@ public class ApiDefinitionMockControllerTests extends BaseTest {
default:
break;
}
// Assertions.assertEquals(returnStr, compareStr);
// Assertions.assertEquals(returnStr, compareStr);
}
@ -913,7 +930,7 @@ public class ApiDefinitionMockControllerTests extends BaseTest {
default:
break;
}
// Assertions.assertEquals(returnStr, compareStr);
// Assertions.assertEquals(returnStr, compareStr);
}
}
}