xiaoe/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
pfl
2025-06-25 13:51:17 +08:00
parent ef741fcb64 c170f9e5ec
commit 48b20390d4
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java
View File

@@ -342,7 +342,8 @@ public class TestCaseServiceImpl implements ITestCaseService
useTime = Long.valueOf(resultMap.get("costMiliseconds"));
}
testCaseResult.setUseTime(useTime);
if ("fail".equals(assignmentResultMap.get("assertionResult"))) {
String responseCode = resultMap.get("responseCode");
if ("fail".equals(assignmentResultMap.get("assertionResult")) || responseCode == null || resultMap.get("responseCode").startsWith("Non HTTP response code")) {
testCaseResult.setStatus("失败");
testCaseResultMapper.insertTestCaseResult(testCaseResult);
return false;

12
test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java
View File

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -223,7 +224,16 @@ public class TestCaseStepServiceImpl implements ITestCaseStepService {
jmeterRequest.setRequestHeader(testCaseStep.getRequestHeader());
jmeterRequest.setJmeterHomePath(jmeterHomePath);
log.info("getRequestHeader:{}", jmeterRequest.getRequestHeader());
Map<String, String> resultMap = JMeterUtil.getJmeterResult(jmeterRequest);
Map<String, String> resultMap = new HashMap<>();
try {
resultMap = JMeterUtil.getJmeterResult(jmeterRequest);
} catch (Exception e) {
log.error("JMeterUtil异常：", e);
resultMap.put("requestHeader", jmeterRequest.getRequestHeader());
resultMap.put("requestBody", jmeterRequest.getRequestBody());
resultMap.put("responseHeader", "");
resultMap.put("responseBody", "");
}
return resultMap;
}

2
test-ui/src/views/test/performance/performance.vue
View File

@@ -71,7 +71,7 @@ export default {
},
// 编辑
hadleClickEdit(val) {
this.$tab.openPage(`修改测试_${val.id}`, `/performance/edit`, { id: val.id });
this.$tab.openPage(`修改测试_${val.id}`, `/performance/edit/${val.id}`, { id: val.id });
},
// 删除
hadleClickDelete(val) {