Commit faa1c2f8 authored by wdy's avatar wdy

Merge branch 'dev' into 'master'

dev - master 30

See merge request !378
parents 203a2c64 7fb0439d
...@@ -73,7 +73,7 @@ public class StrategyModelTestTaskPending implements StrategyModelTestTask, Init ...@@ -73,7 +73,7 @@ public class StrategyModelTestTaskPending implements StrategyModelTestTask, Init
List<CaseStatistics> caseStatisticsList = jsonObject.getList("case_statistics", CaseStatistics.class); List<CaseStatistics> caseStatisticsList = jsonObject.getList("case_statistics", CaseStatistics.class);
if (CollUtil.isNotEmpty(caseStatisticsList)) { if (CollUtil.isNotEmpty(caseStatisticsList)) {
caseStatisticsList.forEach(obj -> { caseStatisticsList.forEach(obj -> {
if (CaseStatistics.CASE_STATUS_FAILED.equals(obj.status) || CaseStatistics.CASE_STATUS_PASSED.equals(obj.status)) { if (CaseStatistics.CASE_STATUS_FAILED.equals(obj.status) || CaseStatistics.CASE_STATUS_PASSED.equals(obj.status) || CaseStatistics.CASE_STATUS_IGNORED.equals(obj.status)) {
currentCount.updateAndGet(v -> v + obj.getCount()); currentCount.updateAndGet(v -> v + obj.getCount());
} }
if (CaseStatistics.CASE_STATUS_FAILED.equals(obj.status)) { if (CaseStatistics.CASE_STATUS_FAILED.equals(obj.status)) {
...@@ -128,6 +128,11 @@ public class StrategyModelTestTaskPending implements StrategyModelTestTask, Init ...@@ -128,6 +128,11 @@ public class StrategyModelTestTaskPending implements StrategyModelTestTask, Init
*/ */
private static final String CASE_STATUS_FAILED = "FAILED"; private static final String CASE_STATUS_FAILED = "FAILED";
/**
* 已忽略
*/
private static final String CASE_STATUS_IGNORED = "IGNORED";
/** /**
* 数量 * 数量
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment