From f9e6877a1097f3de21c8991f8762b3e343b4cd61 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Thu, 31 Mar 2022 11:19:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/test/MessageAutoTest.java | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java index bf519d0..4ce8556 100644 --- a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java +++ b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java @@ -864,14 +864,14 @@ public class MessageAutoTest { if (scene.getConfig() != null) { for (Map.Entry entry:scene.getConfig().getUseVariables().entrySet()) { String replaceVariable = entry.getValue(); - // 如果里面有全局变量就替换 - replaceVariable = PracticalUtils.replaceGlobalVariable(replaceVariable, globalVariableService); + // 如果里面有测试集公共变量就替换 + replaceVariable = PracticalUtils.replaceSetPublicVariable(replaceVariable, config.getPublicDataObject()); // 如果里面有数据池变量就替换 replaceVariable = PracticalUtils.replacePoolData(replaceVariable, poolData.get(itemId)); - // 如果里面有测试集公共变量就替换 - replaceVariable = PracticalUtils.replaceSetPublicVariable(replaceVariable, config.getPublicDataObject()); + // 如果里面有全局变量就替换 + replaceVariable = PracticalUtils.replaceGlobalVariable(replaceVariable, globalVariableService); // 剩下就是在测试过程中需要替换的上下文变量 // 放到替换入参的参数中 @@ -883,8 +883,9 @@ public class MessageAutoTest { requestMessage = parseUtil.depacketizeMessageToString(msg.getComplexParameter(), paramsData.toString()); } - //替换入参报文中的全局变量 - requestMessage = PracticalUtils.replaceGlobalVariable(requestMessage, globalVariableService); + //替换入参报文中的测试集公共变量 + requestMessage = PracticalUtils.replaceSetPublicVariable(requestMessage, config.getPublicDataObject()); + // 处理数据池 if (itemId != null) { @@ -895,11 +896,16 @@ public class MessageAutoTest { requestMessage = PracticalUtils.replacePoolData(requestMessage, testScene.getPoolData()); } - //替换入参报文中的测试集公共变量 - requestMessage = PracticalUtils.replaceSetPublicVariable(requestMessage, config.getPublicDataObject()); + //替换入参报文中的全局变量 + requestMessage = PracticalUtils.replaceGlobalVariable(requestMessage, globalVariableService); + + //处理请求URL中的全局变量 + requestUrl = PracticalUtils.replaceSetPublicVariable(requestUrl, config.getPublicDataObject()); + requestUrl = PracticalUtils.replacePoolData(requestUrl, testScene.getPoolData()); requestUrl = PracticalUtils.replaceGlobalVariable(requestUrl, globalVariableService); + //处理路径参数：在请求URL中出现 #路径path# requestUrl = PracticalUtils.replacePathVariableParameter(requestUrl, requestMessage, parseUtil); @@ -914,12 +920,16 @@ public class MessageAutoTest { testScene.setConfig(config); //提前在此处替换调用参数中的全局变量，防止在异步线程中调用时出现一些不可预期的错误 - // 替换全局变量 - String callParams = PracticalUtils.replaceGlobalVariable(msg.getCallParameter(), null); + // 替换测试集公共变量 + String callParams = PracticalUtils.replaceSetPublicVariable(msg.getCallParameter(), config.getPublicDataObject()); + // 替换数据池 callParams = PracticalUtils.replacePoolData(callParams, testScene.getPoolData()); - // 替换测试集公共变量 - callParams = PracticalUtils.replaceSetPublicVariable(callParams, config.getPublicDataObject()); + + // 替换全局变量 + callParams = PracticalUtils.replaceGlobalVariable(callParams, null); + + testScene.setCallParameter(PracticalUtils.jsonToMap(callParams)); testObjects.add(testScene); -- Gitee From 81017dc8efa3c34e4f0404a4558a67371dfb8596 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Sat, 25 Feb 2023 13:55:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/PerformanceTestConfigAction.java | 4 ++- .../performance/PerformanceTestObject.java | 34 +++++++++++++------ .../resource/advanced/performanceTest.js | 5 +-- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/main/java/yi/master/business/advanced/action/PerformanceTestConfigAction.java b/src/main/java/yi/master/business/advanced/action/PerformanceTestConfigAction.java index d1f378d..fccb56a 100644 --- a/src/main/java/yi/master/business/advanced/action/PerformanceTestConfigAction.java +++ b/src/main/java/yi/master/business/advanced/action/PerformanceTestConfigAction.java @@ -114,6 +114,7 @@ public class PerformanceTestConfigAction extends BaseAction ptos = CacheUtil.getPtObjectsByUserId(user.getUserId()); JSONObject obj = new JSONObject(); obj.put("running", false); + obj.put("end", true); PerformanceTestObject pto = ptos.get(objectId); if (pto != null) { JsonConfig jsonConfig = new JsonConfig(); @@ -122,6 +123,7 @@ public class PerformanceTestConfigAction extends BaseAction