From d8262c3ec3ff2616e4da6c6201b69ab032518377 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 15:23:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=94=9F?=
 =?UTF-8?q?=E6=88=90jmx=E6=96=87=E4=BB=B6=E5=87=BD=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改生成jmx文件函数的逻辑
---
 .../api/controller/APITestController.java     |  2 +-
 .../api/service/APITestService.java           | 23 ++++++++++++++-----
 .../api/service/ApiAutomationService.java     |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 61eb6e2fef..85b1bc768c 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -393,7 +393,7 @@ public class APITestController {
         String testName = runRequest.getName();
 
         //将jmx处理封装为通用方法
-        jmxString = apiTestService.updateJmxString(jmxString,testName,true);
+        jmxString = apiTestService.updateJmxString(jmxString,testName,false);
 
         JmxInfoDTO dto = new JmxInfoDTO();
         dto.setName(runRequest.getName() + ".jmx");
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 10cf3ab666..781ca72078 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -461,7 +461,20 @@ public class APITestService {
         });
     }
 
-    public String updateJmxString(String jmxString,String testName,boolean updateHTTPSamplerProxyName) {
+    /**
+     * @param jmxString      原JMX文件
+     * @param testName       某些节点要替换的testName
+     * @param isFromScenario 是否来源于场景 （来源于场景的话，testName要进行处理）
+     * @return
+     */
+    public String updateJmxString(String jmxString, String testName, boolean isFromScenario) {
+        if (isFromScenario) {
+            //如果调用源来自场景， 原testName是 案例<->场景 ，需要进行切分，只保留案例名
+            String[] testNameArr = testName.split("<->");
+            if (testNameArr.length > 0) {
+                testName = testNameArr[0];
+            }
+        }
         try {
             //将ThreadGroup的testname改为接口名称
             Document doc = DocumentHelper.parseText(jmxString);// 获取可续保保单列表报文模板
@@ -473,11 +486,9 @@ public class APITestService {
 
             List<Element> thirdHashTreeElementList = innerHashTreeElement.elements("hashTree");
             for (Element element : thirdHashTreeElementList) {
-                if(updateHTTPSamplerProxyName){
-                    List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
-                    for (Element itemElement : sampleProxyElementList) {
-                        itemElement.attribute("testname").setText(testName);
-                    }
+                List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
+                for (Element itemElement : sampleProxyElementList) {
+                    itemElement.attribute("testname").setText(testName);
                 }
                 //检查有没有自定义参数
                 List<Element> scriptHashTreeElementList = element.elements("hashTree");
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 0436a9c0d6..ecade606fe 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -668,7 +668,7 @@ public class ApiAutomationService {
         HashTree jmeterHashTree = generateHashTree(apiScenarios, request, null);
         String jmx = testPlan.getJmx(jmeterHashTree);
 
-        jmx = apiTestService.updateJmxString(jmx,testName,false);
+        jmx = apiTestService.updateJmxString(jmx,testName,true);
 
         //将ThreadGroup的testname改为接口名称
 //        Document doc = DocumentHelper.parseText(jmx);// 获取可续保保单列表报文模板