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

fix(接口测试): 修复beanshell断言生成失败的缺陷 

--bug=1027705 --user=王孝刚 【接口测试】github#25504，beanshell 脚本断言，在不勾选 JSR223
时，断言结果恒为真 https://www.tapd.cn/55049933/s/1391820
This commit is contained in:
wxg0103 2023-07-11 20:12:06 +08:00 committed by fit2-zhao
parent f5e09b8e4d
commit 8f2c189efe
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
View File

@ -192,18 +192,15 @@ public class MsAssertions extends MsTestElement {
} }
private TestElement jsr223Assertion(MsAssertionJSR223 assertionJSR223) { private TestElement jsr223Assertion(MsAssertionJSR223 assertionJSR223) {
TestElement assertion = new BeanShellAssertion(); TestElement assertion = new JSR223Assertion();
if (assertionJSR223.getJsrEnable() == null || BooleanUtils.isTrue(assertionJSR223.getJsrEnable())) {
assertion = new JSR223Assertion();
}
assertion.setEnabled(this.isEnable()); assertion.setEnabled(this.isEnable());
if (StringUtils.isNotEmpty(assertionJSR223.getDesc())) { if (StringUtils.isNotEmpty(assertionJSR223.getDesc())) {
assertion.setName("JSR223" + delimiter + this.getName() + delimiter + assertionJSR223.getDesc() + delimiterScript + assertionJSR223.getScript()); assertion.setName("JSR223" + delimiter + this.getName() + delimiter + assertionJSR223.getDesc() + delimiterScript + assertionJSR223.getScript());
} else { } else {
assertion.setName("JSR223" + delimiter + this.getName() + delimiter + "JSR223Assertion" + delimiterScript + assertionJSR223.getScript()); assertion.setName("JSR223" + delimiter + this.getName() + delimiter + "JSR223Assertion" + delimiterScript + assertionJSR223.getScript());
} }
assertion.setProperty(TestElement.TEST_CLASS, JSR223Assertion.class.getName());
assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI")); assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
assertion.setProperty(TestElement.TEST_CLASS, JSR223Assertion.class.getName());
assertion.setProperty("cacheKey", "false"); assertion.setProperty("cacheKey", "false");
String scriptLanguage = assertionJSR223.getScriptLanguage(); String scriptLanguage = assertionJSR223.getScriptLanguage();
if (StringUtils.equals(scriptLanguage, "nashornScript")) { if (StringUtils.equals(scriptLanguage, "nashornScript")) {
@ -215,6 +212,12 @@ public class MsAssertions extends MsTestElement {
if (StringUtils.equals(scriptLanguage, "javascript")) { if (StringUtils.equals(scriptLanguage, "javascript")) {
scriptLanguage = "rhino"; scriptLanguage = "rhino";
} }
if (StringUtils.equals(scriptLanguage, "beanshell") && BooleanUtils.isFalse(assertionJSR223.getJsrEnable())) {
assertion = new BeanShellAssertion();
scriptLanguage = "beanshell";
assertion.setProperty(TestElement.TEST_CLASS, BeanShellAssertion.class.getName());
assertion.setProperty(BeanShellAssertion.SCRIPT, assertionJSR223.getScript());
}
assertion.setProperty("scriptLanguage", scriptLanguage); assertion.setProperty("scriptLanguage", scriptLanguage);
assertion.setProperty(ElementConstants.SCRIPT, assertionJSR223.getScript()); assertion.setProperty(ElementConstants.SCRIPT, assertionJSR223.getScript());
return assertion; return assertion;

4
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioExecuteService.java
View File

@ -482,6 +482,10 @@ public class ApiScenarioExecuteService {
if (testElement != null) { if (testElement != null) {
apiScenario.setName(testElement.getName()); apiScenario.setName(testElement.getName());
apiScenario.setScenarioDefinition(JSON.toJSONString(testElement)); apiScenario.setScenarioDefinition(JSON.toJSONString(testElement));
List<String> projectIdLists = getProjectIds(apiScenario.getScenarioDefinition());
Map<String, String> envMap = getProjectEnvMap(projectIdLists, request.getEnvironmentMap());
request.getConfig().setEnvMap(envMap);
report.setEnvConfig(JSON.toJSONString(request.getConfig()));
apiScenarioReportStructureService.save(apiScenario, report.getId(), request.getConfig().getReportType()); apiScenarioReportStructureService.save(apiScenario, report.getId(), request.getConfig().getReportType());
} }
} }