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

fix: 失败继续无效

This commit is contained in:
chenjianxing 2021-06-22 18:35:25 +08:00 committed by jianxing
parent 10ac86a0a0
commit 4aae311024
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
View File

@ -62,7 +62,7 @@ public class MsScenario extends MsTestElement {
private Map<String, String> environmentMap; private Map<String, String> environmentMap;
@JSONField(ordinal = 24) @JSONField(ordinal = 24)
private boolean onSampleError; private Boolean onSampleError;
private static final String BODY_FILE_DIR = FileUtils.BODY_FILE_DIR; private static final String BODY_FILE_DIR = FileUtils.BODY_FILE_DIR;

4
backend/src/main/java/io/metersphere/api/dto/definition/request/MsThreadGroup.java
View File

@ -21,7 +21,7 @@ import java.util.List;
public class MsThreadGroup extends MsTestElement { public class MsThreadGroup extends MsTestElement {
private String type = "ThreadGroup"; private String type = "ThreadGroup";
private boolean enableCookieShare; private boolean enableCookieShare;
private boolean onSampleError; private Boolean onSampleError;
@Override @Override
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) { public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
@ -66,7 +66,7 @@ public class MsThreadGroup extends MsTestElement {
threadGroup.setDuration(0); threadGroup.setDuration(0);
threadGroup.setProperty(ThreadGroup.ON_SAMPLE_ERROR, ThreadGroup.ON_SAMPLE_ERROR_CONTINUE); threadGroup.setProperty(ThreadGroup.ON_SAMPLE_ERROR, ThreadGroup.ON_SAMPLE_ERROR_CONTINUE);
threadGroup.setScheduler(false); threadGroup.setScheduler(false);
if (!onSampleError) { if (onSampleError != null && !onSampleError) {
threadGroup.setProperty("ThreadGroup.on_sample_error", "stoptest"); threadGroup.setProperty("ThreadGroup.on_sample_error", "stoptest");
} }
threadGroup.setSamplerController(loopController); threadGroup.setSamplerController(loopController);

4
backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
View File

@ -33,7 +33,7 @@ public class ParameterConfig {
/** /**
* 是否停止继续 * 是否停止继续
*/ */
private boolean onSampleError; private Boolean onSampleError;
/** /**
* 是否是导入/导出操作 * 是否是导入/导出操作
@ -62,4 +62,4 @@ public class ParameterConfig {
return arguments; return arguments;
} }
} }

8
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -785,7 +785,7 @@ public class ApiAutomationService {
group.setLabel(item.getName()); group.setLabel(item.getName());
group.setName(reportId); group.setName(reportId);
MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class); MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
group.setOnSampleError(scenario.isOnSampleError()); group.setOnSampleError(scenario.getOnSampleError());
this.preduceMsScenario(scenario); this.preduceMsScenario(scenario);
if (planEnvMap.size() > 0) { if (planEnvMap.size() > 0) {
scenario.setEnvironmentMap(planEnvMap); scenario.setEnvironmentMap(planEnvMap);
@ -829,7 +829,7 @@ public class ApiAutomationService {
group.setLabel(apiScenario.getName()); group.setLabel(apiScenario.getName());
group.setName(apiScenario.getName()); group.setName(apiScenario.getName());
group.setEnableCookieShare(scenario.isEnableCookieShare()); group.setEnableCookieShare(scenario.isEnableCookieShare());
group.setOnSampleError(scenario.isOnSampleError()); group.setOnSampleError(scenario.getOnSampleError());
group.setHashTree(new LinkedList<MsTestElement>() {{ group.setHashTree(new LinkedList<MsTestElement>() {{
this.add(scenario); this.add(scenario);
}}); }});
@ -1062,7 +1062,7 @@ public class ApiAutomationService {
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
JSONObject element = JSON.parseObject(item.getScenarioDefinition()); JSONObject element = JSON.parseObject(item.getScenarioDefinition());
MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class); MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
group.setOnSampleError(scenario.isOnSampleError()); group.setOnSampleError(scenario.getOnSampleError());
this.preduceMsScenario(scenario); this.preduceMsScenario(scenario);
// 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取 // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) { if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
@ -1078,7 +1078,7 @@ public class ApiAutomationService {
scenario.setVariables(variables); scenario.setVariables(variables);
} }
group.setEnableCookieShare(scenario.isEnableCookieShare()); group.setEnableCookieShare(scenario.isEnableCookieShare());
group.setOnSampleError(scenario.isOnSampleError()); group.setOnSampleError(scenario.getOnSampleError());
LinkedList<MsTestElement> scenarios = new LinkedList<>(); LinkedList<MsTestElement> scenarios = new LinkedList<>();
scenarios.add(scenario); scenarios.add(scenario);
// 创建场景报告 // 创建场景报告

2
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -969,7 +969,7 @@ public class TestPlanService {
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
JSONObject element = JSON.parseObject(item.getScenarioDefinition()); JSONObject element = JSON.parseObject(item.getScenarioDefinition());
MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class); MsScenario scenario = JSONObject.parseObject(item.getScenarioDefinition(), MsScenario.class);
group.setOnSampleError(scenario.isOnSampleError()); group.setOnSampleError(scenario.getOnSampleError());
// 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取 // 多态JSON普通转换会丢失内容，需要通过 ObjectMapper 获取
if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) { if (element != null && StringUtils.isNotEmpty(element.getString("hashTree"))) {
LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"), LinkedList<MsTestElement> elements = mapper.readValue(element.getString("hashTree"),