test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-03 12:39:12 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

feat(接口测试): 执行报告处理

Browse Source
This commit is contained in:
fit2-zhao 2023-12-29 17:49:44 +08:00 committed by Craftsman
parent ef02890311
commit ca1217b724
5 changed files with 136 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ApiReportType.java Normal file
View File

@ -0,0 +1,6 @@
package io.metersphere.sdk.constants;
public enum ApiReportType {
// 集成报告，独立报告
INTEGRATED, INDEPENDENT
}

26
backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/result/ProcessResultDTO.java Normal file
View File

@ -0,0 +1,26 @@
package io.metersphere.sdk.dto.api.result;
import lombok.Data;
@Data
public class ProcessResultDTO {
private String status;
private long scenarioSuccess;
private int scenarioTotal;
public void computerTotal(int total) {
this.scenarioTotal += total;
}
public void computerSuccess(long success) {
this.scenarioSuccess += success;
}
public long computerPassRate() {
if (this.scenarioTotal == 0) return 0;
return this.scenarioSuccess / this.scenarioTotal;
}
}

18
backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/result/TaskResult.java
View File

@ -5,7 +5,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@Data
public class TaskResult implements Serializable {
@ -27,6 +26,19 @@ public class TaskResult implements Serializable {
private String runningDebugSampler;
private Boolean hasEnded;
private boolean retryEnable;
private Map<String, Object> arbitraryData;
Map<String, List<MsRegexDTO>> fakeErrorMap;
private String projectId;
private String environmentId;
/**
* 执行过程状态
*/
private ProcessResultDTO processResultDTO;
/**
* 资源类型
* ApiResourceType
*/
private String resourceType;
/**
* 环境变量处理信息
*/
List<String> environmentList;
}

7
backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/api/task/TaskRequest.java
View File

@ -1,10 +1,12 @@
package io.metersphere.sdk.dto.api.task;
import io.metersphere.sdk.dto.api.result.MsRegexDTO;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 任务请求参数数据
@ -51,5 +53,10 @@ public class TaskRequest implements Serializable {
* 执行时下载文件后，按原文件命名
*/
private List<ApiExecuteFileInfo> refFiles;
/**
* 误报规则
*/
Map<String, List<MsRegexDTO>> fakeErrorMap;
// TODO 其它执行参数
}

82
backend/framework/sdk/src/main/java/io/metersphere/sdk/util/RetryResultUtils.java Normal file
View File

@ -0,0 +1,82 @@
package io.metersphere.sdk.util;
import io.metersphere.sdk.dto.api.result.RequestResult;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.samplers.SampleResult;
import java.util.*;
import java.util.stream.Collectors;
/**
* 重试报告处理util
*/
public class RetryResultUtils {
public final static String RETRY = "MsRetry_";
public final static String RETRY_CN = "RETRY";
public final static String RETRY_FIRST_CN = "RETRY_FIRST";
public final static String MS_CLEAR_LOOPS_VAR = "MS_CLEAR_LOOPS_VAR_";
public final static int RETRY_RES_NUM = 11;
/**
* 合并掉重试结果；保留最后十次重试结果
*/
public static void mergeRetryResults(List<RequestResult> results) {
if (CollectionUtils.isNotEmpty(results)) {
Map<String, List<RequestResult>> resultMap = results.stream().collect(Collectors.groupingBy(RequestResult::getResourceId));
List<RequestResult> list = new LinkedList<>();
resultMap.forEach((k, v) -> {
if (CollectionUtils.isNotEmpty(v)) {
// 校验是否含重试结果
List<RequestResult> isRetryResults = v
.stream()
.filter(c -> StringUtils.isNotEmpty(c.getName()) && c.getName().startsWith(RETRY))
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(isRetryResults)) {
// 取最后执行的10 条
if (v.size() > 10) {
v.sort(Comparator.comparing(RequestResult::getResourceId));
RequestResult sampleResult = v.getFirst();
List<RequestResult> topTens = v.subList(v.size() - RETRY_RES_NUM, v.size());
topTens.set(0, sampleResult);
assembleName(topTens);
list.addAll(topTens);
} else {
assembleName(v);
list.addAll(v);
}
} else {
// 成功的结果
list.addAll(v);
}
}
});
results.clear();
results.addAll(list);
}
}
private static void assembleName(List<RequestResult> list) {
// 名称排序处理
for (int i = 0; i < list.size(); i++) {
list.get(i).setName(list.get(i).getName().replaceAll(RETRY, RETRY_CN));
if (list.get(i).getName().endsWith("_")) {
list.get(i).setName(list.get(i).getName().substring(0, list.get(i).getName().length() - 1));
}
if (i == 0) {
list.get(i).setName(StringUtils.isNotEmpty(list.get(i).getName())
? RETRY_FIRST_CN + "_" + list.get(i).getName() : RETRY_FIRST_CN);
}
}
}
public static List<SampleResult> clearLoops(List<SampleResult> results) {
if (CollectionUtils.isNotEmpty(results)) {
return results.stream().filter(sampleResult ->
StringUtils.isNotEmpty(sampleResult.getSampleLabel())
&& !sampleResult.getSampleLabel().startsWith(MS_CLEAR_LOOPS_VAR))
.collect(Collectors.toList());
}
return results;
}
}