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

fix(接口定义): 修复接口定义无法使用环境中带的mock函数的缺陷 

--bug=1018823 --user=王孝刚 【接口测试】接口场景中可以使用变量「常量-函数」接口定义中测试无法使用
https://www.tapd.cn/55049933/s/1276193
This commit is contained in:
wxg0103 2022-10-25 15:15:19 +08:00 committed by wxg0103
parent 00938b25f1
commit 3788084c7a
1 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
View File

@ -852,9 +852,12 @@ public class ElementUtil {
// 场景变量 // 场景变量
if (CollectionUtils.isNotEmpty(variables)) { if (CollectionUtils.isNotEmpty(variables)) {
variables.stream().filter(ScenarioVariable::isConstantValid).forEach(keyValue -> arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")); variables.stream()
.filter(ScenarioVariable::isConstantValid).forEach(keyValue ->
List<ScenarioVariable> variableList = variables.stream().filter(ScenarioVariable::isListValid).collect(Collectors.toList()); arguments.addArgument(keyValue.getName(),
keyValue.getValue(), "="));
List<ScenarioVariable> variableList = variables.stream()
.filter(ScenarioVariable::isListValid).collect(Collectors.toList());
variableList.forEach(item -> { variableList.forEach(item -> {
String[] arrays = item.getValue().split(","); String[] arrays = item.getValue().split(",");
for (int i = 0; i < arrays.length; i++) { for (int i = 0; i < arrays.length; i++) {
@ -863,12 +866,24 @@ public class ElementUtil {
}); });
} }
// 环境通用变量 // 环境通用变量
if (config.isEffective(projectId) && config.getConfig().get(projectId).getCommonConfig() != null && CollectionUtils.isNotEmpty(config.getConfig().get(projectId).getCommonConfig().getVariables())) { if (config.isEffective(projectId)
&& config.getConfig().get(projectId).getCommonConfig() != null
&& CollectionUtils.isNotEmpty(config.getConfig().get(projectId).getCommonConfig().getVariables())) {
//常量 //常量
List<ScenarioVariable> constants = config.getConfig().get(projectId).getCommonConfig().getVariables().stream().filter(ScenarioVariable::isConstantValid).filter(ScenarioVariable::isEnable).collect(Collectors.toList()); List<ScenarioVariable> constants = config.getConfig().get(projectId).getCommonConfig().getVariables().stream()
constants.forEach(keyValue -> arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")); .filter(ScenarioVariable::isConstantValid)
.filter(ScenarioVariable::isEnable)
.collect(Collectors.toList());
constants.forEach(keyValue ->
arguments.addArgument(keyValue.getName(),
keyValue.getValue() != null && keyValue.getValue().startsWith("@")
? ScriptEngineUtils.buildFunctionCallString(keyValue.getValue())
: keyValue.getValue(), "="));
// List类型的变量 // List类型的变量
List<ScenarioVariable> variableList = config.getConfig().get(projectId).getCommonConfig().getVariables().stream().filter(ScenarioVariable::isListValid).filter(ScenarioVariable::isEnable).collect(Collectors.toList()); List<ScenarioVariable> variableList = config.getConfig().get(projectId).getCommonConfig().getVariables().stream()
.filter(ScenarioVariable::isListValid)
.filter(ScenarioVariable::isEnable)
.collect(Collectors.toList());
variableList.forEach(item -> { variableList.forEach(item -> {
String[] arrays = item.getValue().split(","); String[] arrays = item.getValue().split(",");
for (int i = 0; i < arrays.length; i++) { for (int i = 0; i < arrays.length; i++) {
@ -888,9 +903,13 @@ public class ElementUtil {
public static void addApiVariables(ParameterConfig config, HashTree httpSamplerTree, String projectId) { public static void addApiVariables(ParameterConfig config, HashTree httpSamplerTree, String projectId) {
if (config.isEffective(projectId) && config.getConfig().get(projectId).getCommonConfig() != null && CollectionUtils.isNotEmpty(config.getConfig().get(projectId).getCommonConfig().getVariables())) { if (config.isEffective(projectId) && config.getConfig().get(projectId).getCommonConfig() != null && CollectionUtils.isNotEmpty(config.getConfig().get(projectId).getCommonConfig().getVariables())) {
ElementUtil.addApiCsvDataSet(httpSamplerTree, config.getConfig().get(projectId).getCommonConfig().getVariables(), config, "shareMode.group"); ElementUtil.addApiCsvDataSet(httpSamplerTree,
ElementUtil.addCounter(httpSamplerTree, config.getConfig().get(projectId).getCommonConfig().getVariables(), false); config.getConfig().get(projectId).getCommonConfig().getVariables(),
ElementUtil.addRandom(httpSamplerTree, config.getConfig().get(projectId).getCommonConfig().getVariables()); config, "shareMode.group");
ElementUtil.addCounter(httpSamplerTree,
config.getConfig().get(projectId).getCommonConfig().getVariables(), false);
ElementUtil.addRandom(httpSamplerTree,
config.getConfig().get(projectId).getCommonConfig().getVariables());
} }
} }
@ -900,15 +919,24 @@ public class ElementUtil {
List<ApiTestEnvironmentWithBLOBs> environment = environmentService.list(projectId); List<ApiTestEnvironmentWithBLOBs> environment = environmentService.list(projectId);
EnvironmentConfig dataConfig = null; EnvironmentConfig dataConfig = null;
List<String> dataName = new ArrayList<>(); List<String> dataName = new ArrayList<>();
List<ApiTestEnvironmentWithBLOBs> orgDataSource = environment.stream().filter(ApiTestEnvironmentWithBLOBs -> ApiTestEnvironmentWithBLOBs.getConfig().contains(dataSourceId)).collect(Collectors.toList()); List<ApiTestEnvironmentWithBLOBs> orgDataSource = environment.stream()
.filter(ApiTestEnvironmentWithBLOBs ->
ApiTestEnvironmentWithBLOBs.getConfig().contains(dataSourceId)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(orgDataSource)) { if (CollectionUtils.isNotEmpty(orgDataSource)) {
dataConfig = JSONUtil.parseObject(orgDataSource.get(0).getConfig(), EnvironmentConfig.class); dataConfig = JSONUtil.parseObject(orgDataSource.get(0).getConfig(), EnvironmentConfig.class);
if (CollectionUtils.isNotEmpty(dataConfig.getDatabaseConfigs())) { if (CollectionUtils.isNotEmpty(dataConfig.getDatabaseConfigs())) {
dataName = dataConfig.getDatabaseConfigs().stream().filter(DatabaseConfig -> DatabaseConfig.getId().equals(dataSourceId)).map(DatabaseConfig::getName).collect(Collectors.toList()); dataName = dataConfig.getDatabaseConfigs().stream()
.filter(DatabaseConfig ->
DatabaseConfig.getId().equals(dataSourceId))
.map(DatabaseConfig::getName)
.collect(Collectors.toList());
} }
} }
List<String> finalDataName = dataName; List<String> finalDataName = dataName;
List<DatabaseConfig> collect = envConfig.getDatabaseConfigs().stream().filter(DatabaseConfig -> DatabaseConfig.getName().equals(finalDataName.get(0))).collect(Collectors.toList()); List<DatabaseConfig> collect = envConfig.getDatabaseConfigs().stream()
.filter(DatabaseConfig ->
DatabaseConfig.getName().equals(finalDataName.get(0)))
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(collect)) { if (CollectionUtils.isNotEmpty(collect)) {
return collect.get(0); return collect.get(0);
} }