From b2bb3a486f6d3a1accf428b554a4ce05eec33ea2 Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Mon, 24 Jan 2022 14:20:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E6=AC=A1=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=B5=8B=E8=AF=95=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=B8=AD=E7=9A=84=E6=9C=80=E5=90=8E=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1009926 --user=宋天阳 【测试跟踪】测试计划，场景用例列表，失败的场景不显示最后结果 https://www.tapd.cn/55049933/s/1097432 --- .../io/metersphere/api/service/ApiDefinitionService.java | 3 +++ .../metersphere/api/service/ApiScenarioReportService.java | 7 ++++++- .../components/api/automation/report/ApiReportStatus.vue | 2 +- .../components/api/automation/scenario/ApiScenarioList.vue | 3 +++ .../plan/view/comonents/api/TestPlanApiScenarioList.vue | 3 +++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java index 7a0d09807b..818f5d2b88 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -1101,6 +1101,9 @@ public class ApiDefinitionService { ApiDefinitionImport apiImport = null; try { apiImport = (ApiDefinitionImport) Objects.requireNonNull(runService).parse(file == null ? null : file.getInputStream(), request); + if(apiImport.getMocks() == null){ + apiImport.setMocks(new ArrayList<>()); + } } catch (Exception e) { LogUtil.error(e.getMessage(), e); String returnThrowException = e.getMessage(); diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java index 306fa6c050..1877a326ce 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java @@ -351,7 +351,12 @@ public class ApiScenarioReportService { scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId()); } if (scenario != null) { - scenario.setLastResult(errorSize > 0 ? "Fail" : ScenarioStatus.Success.name()); + if(StringUtils.equalsAnyIgnoreCase(status,ExecuteResult.errorReportResult.name())){ + scenario.setLastResult(status); + }else { + scenario.setLastResult(errorSize > 0 ? "Fail" : ScenarioStatus.Success.name()); + } + long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); scenario.setPassRate(new DecimalFormat("0%").format((float) successSize / requestResults.size())); scenario.setReportId(dto.getReportId()); diff --git a/frontend/src/business/components/api/automation/report/ApiReportStatus.vue b/frontend/src/business/components/api/automation/report/ApiReportStatus.vue index ac809623b6..c783847a4f 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportStatus.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportStatus.vue @@ -15,7 +15,7 @@ {{ row.status }} - + {{ $t('error_report_library.option.name') }} diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index b0af8b82fe..d9cbba7804 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -218,6 +218,9 @@ {{ $t('api_test.automation.fail') }} + + {{ $t('error_report_library.option.name') }} + diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue index 8a5383da55..d1e499de69 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue @@ -156,6 +156,9 @@ {{ $t('api_test.automation.fail') }} + + {{ $t('api_test.automation.fail') }} + {{ $t('error_report_library.option.name') }}