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

fix(测试跟踪): 测试计划列表的通过率精度提高到两位小数 

--bug=1031001 --user=宋天阳 【测试跟踪】测试计划列表通过率未实现保留两位小数
https://www.tapd.cn/55049933/s/1426628
This commit is contained in:
song-tianyang 2023-10-16 17:06:37 +08:00 committed by 刘瑞斌
parent f19a91d143
commit 16f9b1eb3d
1 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -165,6 +165,35 @@ public class TestPlanService {
@Resource @Resource
private BaseTestResourcePoolService baseTestResourcePoolService; private BaseTestResourcePoolService baseTestResourcePoolService;
private static void buildCaseIdList
(List<TestCaseTest> list, List<String> apiCaseIds, List<String> scenarioIds, List<String> performanceIds, List<String> uiScenarioIds) {
for (TestCaseTest l : list) {
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.performance.name())) {
performanceIds.add(l.getTestId());
}
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.testcase.name())) {
apiCaseIds.add(l.getTestId());
}
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.automation.name())) {
scenarioIds.add(l.getTestId());
}
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.uiAutomation.name())) {
uiScenarioIds.add(l.getTestId());
}
}
}
//获取下次执行时间（getFireTimeAfter，也可以下下次...）
private static long getNextTriggerTime(String cron) {
if (!CronExpression.isValidExpression(cron)) {
return 0;
}
CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity("Calculate Date").withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();
Date time0 = trigger.getStartTime();
Date time1 = trigger.getFireTimeAfter(time0);
return time1 == null ? 0 : time1.getTime();
}
public TestPlan addTestPlan(AddTestPlanRequest testPlan) { public TestPlan addTestPlan(AddTestPlanRequest testPlan) {
if (getTestPlanByName(testPlan.getName()).size() > 0) { if (getTestPlanByName(testPlan.getName()).size() > 0) {
MSException.throwException(Translator.get("plan_name_already_exists")); MSException.throwException(Translator.get("plan_name_already_exists"));
@ -428,6 +457,10 @@ public class TestPlanService {
public List<TestPlanDTOWithMetric> calcTestPlanRateByIdList(List<String> testPlanIdList) { public List<TestPlanDTOWithMetric> calcTestPlanRateByIdList(List<String> testPlanIdList) {
List<TestPlanDTOWithMetric> returnList = new ArrayList<>(); List<TestPlanDTOWithMetric> returnList = new ArrayList<>();
DecimalFormat rateFormat = new DecimalFormat("#0.00");
rateFormat.setMinimumFractionDigits(2);
rateFormat.setMaximumFractionDigits(2);
for (String testPlanId : testPlanIdList) { for (String testPlanId : testPlanIdList) {
TestPlanDTOWithMetric returnMetric = new TestPlanDTOWithMetric(); TestPlanDTOWithMetric returnMetric = new TestPlanDTOWithMetric();
returnMetric.setId(testPlanId); returnMetric.setId(testPlanId);
@ -448,7 +481,7 @@ public class TestPlanService {
} }
} }
} }
returnMetric.setTotal(returnMetric.getTotal() + functionalExecTotal); returnMetric.setTotal(functionalExecTotal);
Set<String> serviceIdSet = DiscoveryUtil.getServiceIdSet(); Set<String> serviceIdSet = DiscoveryUtil.getServiceIdSet();
if (serviceIdSet.contains(MicroServiceName.API_TEST)) { if (serviceIdSet.contains(MicroServiceName.API_TEST)) {
@ -462,8 +495,26 @@ public class TestPlanService {
calcExecResultStatus(testPlanId, returnMetric, planTestPlanUiScenarioCaseService::getExecResultByPlanId); calcExecResultStatus(testPlanId, returnMetric, planTestPlanUiScenarioCaseService::getExecResultByPlanId);
} }
returnMetric.setPassRate(MathUtils.getPercentWithDecimal(returnMetric.getTested() == 0 ? 0 : returnMetric.getPassed() * 1.0 / returnMetric.getTotal())); if (returnMetric.getTotal() > 0) {
returnMetric.setTestRate(MathUtils.getPercentWithDecimal(returnMetric.getTotal() == 0 ? 0 : returnMetric.getTested() * 1.0 / returnMetric.getTotal())); int passCount = returnMetric.getPassed();
double passRate = Double.parseDouble(rateFormat.format((double) passCount * 100 / (double) returnMetric.getTotal()));
if (passRate == 100 && passCount < returnMetric.getTotal()) {
returnMetric.setPassRate(0.9999);
} else {
returnMetric.setPassRate(passRate);
}
int testCount = returnMetric.getTested();
double testRate = Double.parseDouble(rateFormat.format((double) testCount * 100 / (double) returnMetric.getTotal()));
if (testRate == 100 && testCount < returnMetric.getTotal()) {
returnMetric.setTestRate(0.9999);
} else {
returnMetric.setTestRate(testRate);
}
} else {
returnMetric.setPassRate(0.00);
returnMetric.setTestRate(0.00);
}
returnList.add(returnMetric); returnList.add(returnMetric);
} }
return returnList; return returnList;
@ -738,7 +789,6 @@ public class TestPlanService {
} }
} }
public void caseTestRelevance(PlanCaseRelevanceRequest request, List<String> testCaseIds) { public void caseTestRelevance(PlanCaseRelevanceRequest request, List<String> testCaseIds) {
//同步添加关联的接口和测试用例 //同步添加关联的接口和测试用例
if (!request.getChecked()) { if (!request.getChecked()) {
@ -781,24 +831,6 @@ public class TestPlanService {
} }
} }
private static void buildCaseIdList
(List<TestCaseTest> list, List<String> apiCaseIds, List<String> scenarioIds, List<String> performanceIds, List<String> uiScenarioIds) {
for (TestCaseTest l : list) {
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.performance.name())) {
performanceIds.add(l.getTestId());
}
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.testcase.name())) {
apiCaseIds.add(l.getTestId());
}
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.automation.name())) {
scenarioIds.add(l.getTestId());
}
if (StringUtils.equals(l.getTestType(), TestCaseTestStatus.uiAutomation.name())) {
uiScenarioIds.add(l.getTestId());
}
}
}
private List<OrderRequest> getDefaultOrders() { private List<OrderRequest> getDefaultOrders() {
List<OrderRequest> orderRequests = new ArrayList<>(); List<OrderRequest> orderRequests = new ArrayList<>();
OrderRequest orderRequest = new OrderRequest(); OrderRequest orderRequest = new OrderRequest();
@ -1235,7 +1267,6 @@ public class TestPlanService {
return replaceSharReport(microServices); return replaceSharReport(microServices);
} }
/** /**
* 获取微服务信息，替换前端变量 * 获取微服务信息，替换前端变量
* 实现跨服务访问报告 * 实现跨服务访问报告
@ -1603,7 +1634,6 @@ public class TestPlanService {
return reportStruct; return reportStruct;
} }
public TestPlanReportDataStruct buildPlanReport(String planId, boolean saveResponse) { public TestPlanReportDataStruct buildPlanReport(String planId, boolean saveResponse) {
TestPlanWithBLOBs testPlan = testPlanMapper.selectByPrimaryKey(planId); TestPlanWithBLOBs testPlan = testPlanMapper.selectByPrimaryKey(planId);
@ -2072,17 +2102,6 @@ public class TestPlanService {
} }
//获取下次执行时间（getFireTimeAfter，也可以下下次...）
private static long getNextTriggerTime(String cron) {
if (!CronExpression.isValidExpression(cron)) {
return 0;
}
CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity("Calculate Date").withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();
Date time0 = trigger.getStartTime();
Date time1 = trigger.getFireTimeAfter(time0);
return time1 == null ? 0 : time1.getTime();
}
@MsAuditLog(module = OperLogModule.TRACK_TEST_PLAN_SCHEDULE, type = OperLogConstants.UPDATE, title = "#request.name", @MsAuditLog(module = OperLogModule.TRACK_TEST_PLAN_SCHEDULE, type = OperLogConstants.UPDATE, title = "#request.name",
beforeEvent = "#msClass.getLogDetails(#request.id)", content = "#msClass.getLogDetails(#request.id)", msClass = BaseScheduleService.class) beforeEvent = "#msClass.getLogDetails(#request.id)", content = "#msClass.getLogDetails(#request.id)", msClass = BaseScheduleService.class)
public Schedule updateSchedule(Schedule request) { public Schedule updateSchedule(Schedule request) {