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

feat(接口测试): 没有匹配到的Mock期望按照接口响应设置的内容来返回 

没有匹配到的Mock期望按照接口响应设置的内容来返回
This commit is contained in:
song-tianyang 2022-02-16 17:21:09 +08:00 committed by xiaomeinvG
parent c44dfb0fe4
commit b588cdf53a
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/io/metersphere/api/mock/utils/MockApiUtils.java
View File

@ -290,6 +290,23 @@ public class MockApiUtils {
} }
} }
} }
if(respObj.containsKey("statusCode")){
JSONArray statusCodeArray = respObj.getJSONArray("statusCode");
if(statusCodeArray != null){
for(int i = 0; i < statusCodeArray.size(); i ++){
JSONObject object = statusCodeArray.getJSONObject(i);
if(object.containsKey("name")){
try{
int code = Integer.parseInt(object.getString("name"));
returnMap.put("code",code+"");
break;
}catch (Exception e){
LogUtil.error(e);
}
}
}
}
}
} catch (Exception e) { } catch (Exception e) {
MSException.throwException(e); MSException.throwException(e);
} }

30
backend/src/main/java/io/metersphere/api/service/MockConfigService.java
View File

@ -1131,6 +1131,21 @@ public class MockConfigService {
returnStr = this.updateHttpServletResponse(finalExpectConfig, url, requestHeaderMap, mockParams, response); returnStr = this.updateHttpServletResponse(finalExpectConfig, url, requestHeaderMap, mockParams, response);
break; break;
} }
if(!isMatch){
Map<String,String> apiResponseMap = MockApiUtils.getApiResponse(api.getResponse());
if(MapUtils.isNotEmpty(apiResponseMap)){
returnStr = apiResponseMap.get("returnMsg");
if(StringUtils.isNotEmpty(returnStr)){
isMatch = true;
int code = 200;
if(apiResponseMap.containsKey("code")){
code = Integer.parseInt(apiResponseMap.get("code"));
}
response.setStatus(code);
break;
}
}
}
} }
} }
@ -1173,6 +1188,21 @@ public class MockConfigService {
break; break;
} }
} }
if(!isMatch){
Map<String,String> apiResponseMap = MockApiUtils.getApiResponse(api.getResponse());
if(MapUtils.isNotEmpty(apiResponseMap)){
returnStr = apiResponseMap.get("returnMsg");
if(StringUtils.isNotEmpty(returnStr)){
isMatch = true;
int code = 200;
if(apiResponseMap.containsKey("code")){
code = Integer.parseInt(apiResponseMap.get("code"));
}
response.setStatus(code);
break;
}
}
}
} }
} }