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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
q4speed 2020-07-14 11:42:59 +08:00
parent f19eb2e3dd 339e1e243b
commit 8d22140f32
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -341,21 +341,23 @@ public class TestCaseService {
if (TestCaseList.get(i).getMethod().equals("manual")) { if (TestCaseList.get(i).getMethod().equals("manual")) {
String steps = TestCaseList.get(i).getSteps(); String steps = TestCaseList.get(i).getSteps();
JSONArray jsonArray = JSON.parseArray(steps); JSONArray jsonArray = JSON.parseArray(steps);
for (int j = 0; j <jsonArray.size(); j++) { for (int j = 0; j < jsonArray.size(); j++) {
int num=j+1; int num = j + 1;
step.append(num + ":" + jsonArray.getJSONObject(j).getString("desc")); step.append(num + ":" + jsonArray.getJSONObject(j).getString("desc") + "\n");
step.append("\n"); result.append(num + ":" + jsonArray.getJSONObject(j).getString("result") + "\n");
data.setStepDesc(step.toString());
result.append(num + ":" + jsonArray.getJSONObject(j).getString("result"));
result.append("\n");
data.setStepResult(result.toString());
} }
data.setStepDesc(step.toString());
data.setStepResult(result.toString());
step.setLength(0);
result.setLength(0);
data.setRemark(TestCaseList.get(i).getRemark()); data.setRemark(TestCaseList.get(i).getRemark());
} else if(TestCaseList.get(i).getMethod().equals("auto")&&TestCaseList.get(i).getType().equals("api")){
} else if (TestCaseList.get(i).getMethod().equals("auto") && TestCaseList.get(i).getType().equals("api")) {
data.setStepDesc(""); data.setStepDesc("");
data.setStepResult(""); data.setStepResult("");
data.setRemark(TestCaseList.get(i).getApiName()); data.setRemark(TestCaseList.get(i).getApiName());
}else if(TestCaseList.get(i).getMethod().equals("auto")&&TestCaseList.get(i).getType().equals("performance")){ } else if (TestCaseList.get(i).getMethod().equals("auto") && TestCaseList.get(i).getType().equals("performance")) {
data.setStepDesc(""); data.setStepDesc("");
data.setStepResult(""); data.setStepResult("");
data.setRemark(TestCaseList.get(i).getPerformName()); data.setRemark(TestCaseList.get(i).getPerformName());