feat(接口测试): TCP-Mock的期望设置中针对xml参数增加范围值选项

TCP-Mock的期望设置中针对xml参数增加范围值选项

backend/src/main/java/io/metersphere/api/controller/MockConfigController.java

@@ -1,5 +1,6 @@
 package io.metersphere.api.controller;
 
+import io.metersphere.api.dto.automation.TcpTreeTableDataStruct;
 import io.metersphere.api.dto.mock.MockParamSuggestions;
 import io.metersphere.api.dto.mock.MockTestDataRequest;
 import io.metersphere.api.dto.mockconfig.MockConfigRequest;
@@ -82,4 +83,10 @@ public class MockConfigController {
         return testDataUtil.parseTestDataByRequest(requestArray);
     }
 
+    @PostMapping("/getTcpMockTestData")
+    public List<TcpTreeTableDataStruct> getTcpMockTestData(@RequestBody List<TcpTreeTableDataStruct> requestArray) {
+        MockTestDataUtil testDataUtil = new MockTestDataUtil();
+        return testDataUtil.parseTestDataByTcpTreeTableData(requestArray);
+    }
+
 }

backend/src/main/java/io/metersphere/api/dto/automation/TcpTreeTableDataStruct.java

@@ -28,6 +28,7 @@ public class TcpTreeTableDataStruct {
     private String type;
     private String systemName;
     private String contentType;
+    private String condition;
     private boolean required;
     private String description;
     private List<TcpTreeTableDataStruct> children;
@@ -114,7 +115,6 @@ public class TcpTreeTableDataStruct {
         try {
             element = document.addElement(this.name);
             if (StringUtils.equalsAnyIgnoreCase(type, "string", "array")) {
-                long lengthNum = Long.parseLong(this.contentType);
                 String attrString = "";
                 if (StringUtils.equalsIgnoreCase(this.type, "string")) {
                     attrString = "s," + contentType;
@@ -153,7 +153,6 @@ public class TcpTreeTableDataStruct {
         try {
             element = document.addElement(this.name);
             if (StringUtils.equalsAnyIgnoreCase(type, "string", "array")) {
-                long lengthNum = Long.parseLong(this.contentType);
                 String attrString = "";
                 if (StringUtils.equalsIgnoreCase(this.type, "string")) {
                     attrString = "s," + contentType;

backend/src/main/java/io/metersphere/api/dto/automation/parse/TcpTreeTableDataParser.java

@@ -1,12 +1,17 @@
 package io.metersphere.api.dto.automation.parse;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.dto.automation.TcpTreeTableDataStruct;
+import io.metersphere.api.dto.mock.MockConfigRequestParams;
+import io.metersphere.api.mock.utils.MockApiUtils;
 import io.metersphere.commons.utils.LogUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
+import org.springframework.util.CollectionUtils;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -77,4 +82,60 @@ public class TcpTreeTableDataParser {
         return xmlString;
     }
 
+    public static boolean isMatchTreeTableData(JSONObject sourceObj, List<TcpTreeTableDataStruct> tcpDataList) {
+        if (CollectionUtils.isEmpty(tcpDataList)) {
+            return true;
+        }
+        if (sourceObj == null) {
+            sourceObj = new JSONObject();
+        }
+
+        boolean isMatch = false;
+        for (TcpTreeTableDataStruct dataStruct : tcpDataList) {
+            if(isMatch){
+                break;
+            }
+            String key = dataStruct.getName();
+            if (sourceObj.containsKey(key)) {
+                Object sourceObjItem = sourceObj.get(key);
+                if (sourceObjItem instanceof JSONObject) {
+                    if (!CollectionUtils.isEmpty(dataStruct.getChildren())) {
+                        if (!isMatchTreeTableData((JSONObject) sourceObjItem, dataStruct.getChildren())) {
+                            continue;
+                        }
+                    } else {
+                        continue;
+                    }
+                } else if (sourceObjItem instanceof JSONArray) {
+                    if (!CollectionUtils.isEmpty(dataStruct.getChildren())) {
+                        JSONArray jsonArray = (JSONArray) sourceObjItem;
+                        for (int i = 0; i < jsonArray.size(); i ++){
+                            Object itemObj = jsonArray.get(i);
+                            if(itemObj instanceof JSONObject){
+                                if (!isMatchTreeTableData((JSONObject) itemObj, dataStruct.getChildren())) {
+                                    continue;
+                                }
+                            }else {
+                                continue;
+                            }
+                        }
+                    } else {
+                        continue;
+                    }
+                } else {
+                    String sourceValues = String.valueOf(sourceObjItem);
+                    MockConfigRequestParams mockParams = new MockConfigRequestParams();
+                    mockParams.setKey(dataStruct.getName());
+                    mockParams.setValue(dataStruct.getValue());
+                    mockParams.setCondition(dataStruct.getCondition());
+                    if (!MockApiUtils.isValueMatch(sourceValues, mockParams)) {
+                        continue;
+                    }
+                }
+            }
+            isMatch = true;
+        }
+
+        return isMatch;
+    }
 }

backend/src/main/java/io/metersphere/api/mock/utils/MockApiUtils.java

@@ -701,7 +701,7 @@ public class MockApiUtils {
         return false;
     }
 
-    private static boolean isValueMatch(String requestParam, MockConfigRequestParams params) {
+    public static boolean isValueMatch(String requestParam, MockConfigRequestParams params) {
         if (StringUtils.equals(params.getCondition(), MockParamConditionEnum.VALUE_EQUALS.name())) {
             return StringUtils.equals(requestParam, params.getValue());
         } else if (StringUtils.equals(params.getCondition(), MockParamConditionEnum.VALUE_NOT_EQUALS.name())) {

backend/src/main/java/io/metersphere/api/mock/utils/MockTestDataUtil.java

@@ -1,11 +1,13 @@
 package io.metersphere.api.mock.utils;
 
 import com.mifmif.common.regex.Generex;
+import io.metersphere.api.dto.automation.TcpTreeTableDataStruct;
 import io.metersphere.api.dto.mock.MockTestDataRequest;
 import io.metersphere.api.mock.dto.MockParamConditionEnum;
 import io.metersphere.commons.utils.LogUtil;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -50,4 +52,49 @@ public class MockTestDataUtil {
             return "";
         }
     }
+
+    public String getTestData(TcpTreeTableDataStruct condition) {
+        if (StringUtils.equals(MockApiUtils.parseCondition(condition.getCondition()), MockParamConditionEnum.VALUE_EQUALS.name())) {
+            return condition.getValue();
+        } else if (StringUtils.equalsAny(MockApiUtils.parseCondition(condition.getCondition()), MockParamConditionEnum.VALUE_CONTAINS.name(), MockParamConditionEnum.VALUE_NOT_EQUALS.name())) {
+            return condition.getValue() + "A";
+        } else if (StringUtils.equals(MockApiUtils.parseCondition(condition.getCondition()), MockParamConditionEnum.LENGTH_EQUALS.name())) {
+            int length = Integer.parseInt(condition.getValue());
+            return RandomStringUtils.randomAlphanumeric(length);
+        } else if (StringUtils.equalsAny(MockApiUtils.parseCondition(condition.getCondition()), MockParamConditionEnum.LENGTH_NOT_EQUALS.name(), MockParamConditionEnum.LENGTH_LARGE_THAN.name())) {
+            int length = Integer.parseInt(condition.getValue()) + 1;
+            return RandomStringUtils.randomAlphanumeric(length);
+        } else if (StringUtils.equals(MockApiUtils.parseCondition(condition.getCondition()), MockParamConditionEnum.LENGTH_SHOT_THAN.name())) {
+            int length = Integer.parseInt(condition.getValue());
+            if(length > 1){
+                return RandomStringUtils.randomAlphanumeric(length);
+            }else {
+                return "";
+            }
+        } else if (StringUtils.equals(MockApiUtils.parseCondition(condition.getCondition()), MockParamConditionEnum.REGULAR_MATCH.name())) {
+            if (StringUtils.isNotEmpty(condition.getValue())) {
+                Generex generex = new Generex(condition.getValue());
+                String randomStr = generex.random();
+                return randomStr;
+            }else {
+                return "";
+            }
+        } else {
+            return "";
+        }
+    }
+
+    public List<TcpTreeTableDataStruct> parseTestDataByTcpTreeTableData(List<TcpTreeTableDataStruct> requestArray) {
+        for (TcpTreeTableDataStruct request : requestArray) {
+            try{
+                request.setValue(this.getTestData(request));
+                if(!CollectionUtils.isEmpty(request.getChildren())){
+                    this.parseTestDataByTcpTreeTableData(request.getChildren());
+                }
+            }catch (Exception e){
+                LogUtil.error(e);
+            }
+        }
+        return requestArray;
+    }
 }

backend/src/main/java/io/metersphere/api/service/MockConfigService.java

@@ -1292,15 +1292,12 @@ public class MockConfigService {
                         } else if (isXMLMessage && StringUtils.equalsIgnoreCase(reportType, "xml")) {
                             if (requestJson.containsKey("xmlDataStruct")) {
                                 JSONObject sourceObj = XMLUtils.XmlToJson(message);
-                                String xmlStr = "";
                                 try {
                                     List<TcpTreeTableDataStruct> tcpDataList = JSONArray.parseArray(requestJson.getString("xmlDataStruct"), TcpTreeTableDataStruct.class);
-                                    xmlStr = TcpTreeTableDataParser.treeTableData2Xml(tcpDataList);
+                                    isMatch = TcpTreeTableDataParser.isMatchTreeTableData(sourceObj,tcpDataList);
                                 } catch (Exception e) {
                                     LogUtil.error(e);
                                 }
-                                JSONObject matchObj = XMLUtils.XmlToJson(xmlStr);
-                                isMatch = JsonStructUtils.checkJsonObjCompliance(sourceObj, matchObj);
                             }
                         } else if (StringUtils.equalsIgnoreCase(reportType, "raw")) {
                             if (requestJson.containsKey("rawDataStruct")) {

backend/src/main/java/io/metersphere/api/tcp/server/TCPServicer.java

@@ -16,6 +16,7 @@ public class TCPServicer {
     private InputStream is;
     private OutputStream os;
     private int port;
+
     public TCPServicer(Socket s, int port) {
         this.s = s;
         this.port = port;
@@ -40,6 +41,7 @@ public class TCPServicer {
     }
 
     private String getReturnMsg(String message) {
+        LogUtil.info("TCP-Mock start. port: " + this.port + "; Message:" + message);
         MockConfigService mockConfigService = CommonBeanFactory.getBean(MockConfigService.class);
         MockExpectConfigWithBLOBs matchdMockExpect = mockConfigService.matchTcpMockExpect(message, this.port);
         String returnMsg = "";
@@ -88,14 +90,18 @@ public class TCPServicer {
         //关闭资源
         try {
             is.close();
-        }catch (Exception e){}finally {
+        } catch (Exception e) {
+            LogUtil.error(e);
+        } finally {
             try {
                 os.close();
-            }catch (Exception e){}finally {
+            } catch (Exception e) {
+                LogUtil.error(e);
+            } finally {
                 try {
                     s.close();
-                }catch (Exception e){}finally {
+                } catch (Exception e) {
-
+                    LogUtil.error(e);
                 }
             }
         }

backend/src/main/java/io/metersphere/commons/utils/XMLUtils.java

@@ -71,13 +71,9 @@ public class XMLUtils {
             }
             xml = xml.substring(begin + 2);
         }   //  <?xml version="1.0" encoding="utf-8"?> 若存在，则去除
-        String rgex = "\\s*";
+        String rgex = ">";
         Pattern pattern = Pattern.compile(rgex);
         Matcher m = pattern.matcher(xml);
-        xml = m.replaceAll("");
-        rgex = ">";
-        pattern = Pattern.compile(rgex);
-        m = pattern.matcher(xml);
         xml = m.replaceAll("> ");
         rgex = "\\s*</";
         pattern = Pattern.compile(rgex);

frontend/src/business/components/api/definition/components/complete/table/TcpXmlTable.vue

@@ -34,6 +34,19 @@
           <span v-else>{{ scope.row.description }}</span>
         </template>
       </el-table-column>
+      <el-table-column v-if="showOperationCol" prop="condition" :label="$t('api_test.request.range')" width="200">
+        <template slot-scope="scope">
+          <el-select v-if="scope.row.status" :maxlength="100" v-model="scope.row.condition"
+                     size="small" style="width: 100%">
+            <el-option
+                v-for="item in rangeTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"></el-option>
+          </el-select>
+          <span v-else>{{ parseRangeType(scope.row.condition) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="value" :label="$t('api_test.definition.request.esb_table.value')" width="180">
         <template slot-scope="scope">
           <el-input v-if="scope.row.status" v-model="scope.row.value"></el-input>
@@ -43,9 +56,11 @@
       <el-table-column v-if="showOptionsButton" :label="$t('commons.operating')" width="140" fixed="right">
         <template v-slot:default="scope">
           <span>
-            <el-button size="mini" p="$t('commons.next_level')" icon="el-icon-plus" type="primary" circle @click="nextRow(scope.row)"
+            <el-button size="mini" p="$t('commons.next_level')" icon="el-icon-plus" type="primary" circle
+                       @click="nextRow(scope.row)"
                        class="ht-btn-confirm"/>
-            <el-button size="mini" p="$t('commons.copy')" icon="el-icon-copy-document" type="primary" circle @click="copyDataStructConfirm(scope.row)"
+            <el-button size="mini" p="$t('commons.copy')" icon="el-icon-copy-document" type="primary" circle
+                       @click="copyDataStructConfirm(scope.row)"
                        class="ht-btn-confirm"/>
             <el-button size="mini" p="$t('commons.remove')" icon="el-icon-close" circle @click="remove(scope.row)"
                        class="ht-btn-remove"/>
@@ -54,8 +69,12 @@
       </el-table-column>
     </el-table>
     <div v-if="showOptionsButton">
-      <el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-circle-plus-outline" @click="add">{{$t("commons.add")}}</el-button>
+      <el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-circle-plus-outline" @click="add">
-      <el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-circle-plus-outline" @click="saveTableData">{{$t("commons.save")}}</el-button>
+        {{ $t("commons.add") }}
+      </el-button>
+      <el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-circle-plus-outline"
+                 @click="saveTableData">{{ $t("commons.save") }}
+      </el-button>
     </div>
   </div>
 </template>
@@ -68,10 +87,52 @@ export default {
   props: {
     tableData: Array,
     showOptionsButton: Boolean,
+    showOperationCol: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
       loading: false,
+      rangeTypeOptions: [
+        {
+          value: "",
+          label: this.$t("commons.please_select"),
+        },
+        {
+          value: "value_eq",
+          label: this.$t("api_test.mock.range_type.value_eq"),
+        },
+        {
+          value: "value_not_eq",
+          label: this.$t("api_test.mock.range_type.value_not_eq"),
+        },
+        {
+          value: "value_contain",
+          label: this.$t("api_test.mock.range_type.value_contain"),
+        },
+        {
+          value: "length_eq",
+          label: this.$t("api_test.mock.range_type.length_eq"),
+        },
+        {
+          value: "length_not_eq",
+          label: this.$t("api_test.mock.range_type.length_not_eq"),
+        },
+        {
+          value: "length_large_than",
+          label: this.$t("api_test.mock.range_type.length_large_than"),
+        },
+        {
+          value: "length_shot_than",
+          label: this.$t("api_test.mock.range_type.length_shot_than"),
+        },
+        {
+          value: "regular_match",
+          label: this.$t("api_test.mock.range_type.regular_match"),
+        },
+      ],
       typeSelectOptions: [
         {value: 'object', label: '[object]'},
         {value: 'string', label: '[string]'},
@@ -92,8 +153,47 @@ export default {
         }
       })
     }
+  },
+  computed: {
+
   },
   methods: {
+    parseRangeType(type) {
+      if (!type) {
+        type = "";
+      }
+      let returnValue = null;
+      switch (type) {
+        case "value_eq":
+          returnValue = this.$t("api_test.mock.range_type.value_eq");
+          break;
+        case "value_not_eq":
+          returnValue = this.$t("api_test.mock.range_type.value_not_eq");
+          break;
+        case "value_contain":
+          returnValue = this.$t("api_test.mock.range_type.value_contain");
+          break;
+        case "length_eq":
+          returnValue = this.$t("api_test.mock.range_type.length_eq");
+          break;
+        case "length_not_eq":
+          returnValue = this.$t("api_test.mock.range_type.length_not_eq");
+          break;
+        case "length_large_than":
+          returnValue = this.$t("api_test.mock.range_type.length_large_than");
+          break;
+        case "length_shot_than":
+          returnValue = this.$t("api_test.mock.range_type.length_shot_than");
+          break;
+        case "regular_match":
+          returnValue = this.$t("api_test.mock.range_type.regular_match");
+          break;
+        default:
+          returnValue = "";
+          break;
+      }
+      return returnValue;
+    },
     saveTableData: function () {
       this.$emit('saveTableData', this.tableData);
     },
@@ -180,7 +280,15 @@ export default {
     getNewRow(param) {
       if (param == null) {
         let row = {
-          name: '',systemName: '',status: 'edit',type: '[object]',contentType: '',required: false,description: '',uuid: this.uuid(),children: []
+          name: '',
+          systemName: '',
+          status: 'edit',
+          type: '[object]',
+          contentType: '',
+          required: false,
+          description: '',
+          uuid: this.uuid(),
+          children: []
         }
         return row;
       } else {

frontend/src/business/components/api/definition/components/environment/EnvironmentSelect.vue

@@ -106,6 +106,9 @@
         },
         setEnvironment(enviromentId){
           this.currentData.environmentId = enviromentId;
+          if (this.currentData.request) {
+            this.currentData.request.useEnvironment = enviromentId;
+          }
         }
       }
     }

frontend/src/business/components/api/definition/components/mock/MockEditDrawer.vue

@@ -16,7 +16,7 @@
           <div class="base-info">
             <el-row>
               <tcp-params
-                v-if="isTcp"
+                v-if="isTcp" :show-operation-col="true"
                 :request="mockExpectConfig.request" style="margin: 10px 10px;" ref="tcpParam"></tcp-params>
               <mock-request-param
                 v-else
@@ -218,6 +218,9 @@ export default {
       this.showDrawer = false;
     },
     saveMockExpectConfig() {
+      if(this.isTcp && this.$refs.tcpParam){
+        this.$refs.tcpParam.saveData();
+      }
       let mockConfigId = this.mockConfigId;
       this.mockExpectConfig.mockConfigId = mockConfigId;
       let formCheckResult = this.checkMockExpectForm("mockExpectForm", true);

frontend/src/business/components/api/definition/components/mock/MockTab.vue

@@ -155,7 +155,30 @@ export default {
       if (row && row.request) {
         requestParam = JSON.parse(JSON.stringify(row.request));
       }
-      if(requestParam.params){
+      if (requestParam.xmlDataStruct) {
+        this.getTcpMockTestData(requestParam);
+      } else {
+        this.getHttpMockTestData(requestParam);
+      }
+
+    },
+    getTcpMockTestData(requestParam) {
+      if (requestParam && requestParam.xmlDataStruct) {
+        let selectParma = requestParam.xmlDataStruct;
+        //调用后台生成符合mock需求的测试数据
+        this.$post("/mockConfig/getTcpMockTestData", selectParma, response => {
+          let returnData = response.data;
+          if (returnData) {
+            requestParam.xmlDataStruct = returnData;
+          }
+          this.$emit("redirectToTest", requestParam);
+        }, error => {
+          this.$emit("redirectToTest", requestParam);
+        });
+      }
+    },
+    getHttpMockTestData(requestParam) {
+      if (requestParam && requestParam.params) {
         let selectParma = [];
         if (requestParam.params.arguments && requestParam.params.arguments.length > 0) {
           requestParam.params.arguments.forEach(item => {

frontend/src/business/components/api/definition/components/request/tcp/TcpParams.vue

@@ -13,7 +13,7 @@
         </el-radio>
       </el-radio-group>
       <div style="min-width: 1200px;" v-if="request.reportType === 'xml'">
-        <tcp-xml-table :table-data="request.xmlDataStruct" :show-options-button="true"
+        <tcp-xml-table :table-data="request.xmlDataStruct" :show-options-button="true" :show-operation-col="showOperationCol"
                        @xmlTablePushRow="xmlTablePushRow"
                        @initXmlTableData="initXmlTableData"
                        @saveTableData="saveXmlTableData" ref="treeTable"></tcp-xml-table>
@@ -74,6 +74,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showOperationCol: {
+      type: Boolean,
+      default: false
+    },
     showScript: {
       type: Boolean,
       default: true,
@@ -167,6 +171,11 @@ export default {
         });
       }
     },
+    saveData(){
+      if(this.request && this.request.reportType === 'xml' && this.$refs.treeTable){
+        this.$refs.treeTable.saveTableData();
+      }
+    },
     checkXmlTableDataStructData(dataStruct){
       let allCheckResult = true;
       if(this.$refs.treeTable){