fix:修复试用反馈问题

1.path路径中的变量没有 $ 符号，没有变量化 2.method 更改为纯大写字母才可以生效，比如 get 需要更改为 GET
Pactortester · Jul 22, 2020 · 25726d4 · 25726d4
1 parent 6a843ad
commit 25726d4
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 14 deletions.
diff --git a/build/lib/swaggerjmx/to_jmx.py b/build/lib/swaggerjmx/to_jmx.py
@@ -8,7 +8,7 @@
 def jmeter_test_plan(root_xml):
     JmeterTestPlan = root_xml
     JmeterTestPlan.set('version', '1.2')
-    JmeterTestPlan.set('properties', '2.3')
+    JmeterTestPlan.set('properties', '5.0')
     JmeterTestPlan.set('jmeter', '5.1.1 r1855137')
     return etree.SubElement(JmeterTestPlan, 'hashTree')
 
@@ -95,7 +95,7 @@ def controller(parent_xml, result):
             HTTPSamplerProxy = etree.SubElement(shashTree, "HTTPSamplerProxy")
             common_api(HTTPSamplerProxy,
                        {"guiclass": "HttpTestSampleGui", "testclass": "HTTPSamplerProxy",
-                        "testname": sample.get('path'),
+                        "testname": str(sample.get('path')).replace('//', '/'),
                         "enabled": "true"})
             if sample.get("params").__len__() < 1:
                 elementProp = etree.SubElement(HTTPSamplerProxy, "elementProp")
@@ -143,17 +143,17 @@ def controller(parent_xml, result):
             # encoding
             stringProp = etree.SubElement(HTTPSamplerProxy, "stringProp")
             stringProp.set("name", "HTTPSampler.contentEncoding")
-            stringProp.text = "utf8"
+            stringProp.text = "UTF-8"
 
             # path
             stringProp = etree.SubElement(HTTPSamplerProxy, "stringProp")
             stringProp.set("name", "HTTPSampler.path")
-            stringProp.text = sample.get("path")
+            stringProp.text = str(sample.get("path")).replace('//', '/').replace('/{', '/${')
 
             # method
             stringProp = etree.SubElement(HTTPSamplerProxy, "stringProp")
             stringProp.set("name", "HTTPSampler.method")
-            stringProp.text = sample.get("method")
+            stringProp.text = sample.get("method").upper()
 
             # follow redirects
             boolProp = etree.SubElement(HTTPSamplerProxy, "boolProp")

diff --git a/build/lib/swaggerjmx/version.py b/build/lib/swaggerjmx/version.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.0.5"
+__version__ = "1.0.6"
 
 import os
 import sys

diff --git a/dist/swaggerjmx-1.0.5-py3-none-any.whl b/dist/swaggerjmx-1.0.5-py3-none-any.whl
diff --git a/dist/swaggerjmx-1.0.5.tar.gz b/dist/swaggerjmx-1.0.5.tar.gz
diff --git a/dist/swaggerjmx-1.0.6-py3-none-any.whl b/dist/swaggerjmx-1.0.6-py3-none-any.whl
diff --git a/dist/swaggerjmx-1.0.6.tar.gz b/dist/swaggerjmx-1.0.6.tar.gz
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name="swaggerjmx",
-    version="1.0.5",
+    version="1.0.6",
     keywords=["pip", "swagger", "jmx", "swagger convert jmx"],
     description="swagger convert jmx",
     long_description=long_description,

diff --git a/swaggerjmx.egg-info/PKG-INFO b/swaggerjmx.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swaggerjmx
-Version: 1.0.5
+Version: 1.0.6
 Summary: swagger convert jmx
 Home-page: https://github.com/Pactortester/swaggerjmx
 Author: lijiawei

diff --git a/swaggerjmx/to_jmx.py b/swaggerjmx/to_jmx.py
@@ -8,7 +8,7 @@
 def jmeter_test_plan(root_xml):
     JmeterTestPlan = root_xml
     JmeterTestPlan.set('version', '1.2')
-    JmeterTestPlan.set('properties', '2.3')
+    JmeterTestPlan.set('properties', '5.0')
     JmeterTestPlan.set('jmeter', '5.1.1 r1855137')
     return etree.SubElement(JmeterTestPlan, 'hashTree')
 
@@ -95,7 +95,7 @@ def controller(parent_xml, result):
             HTTPSamplerProxy = etree.SubElement(shashTree, "HTTPSamplerProxy")
             common_api(HTTPSamplerProxy,
                        {"guiclass": "HttpTestSampleGui", "testclass": "HTTPSamplerProxy",
-                        "testname": sample.get('path'),
+                        "testname": str(sample.get('path')).replace('//', '/'),
                         "enabled": "true"})
             if sample.get("params").__len__() < 1:
                 elementProp = etree.SubElement(HTTPSamplerProxy, "elementProp")
@@ -143,17 +143,17 @@ def controller(parent_xml, result):
             # encoding
             stringProp = etree.SubElement(HTTPSamplerProxy, "stringProp")
             stringProp.set("name", "HTTPSampler.contentEncoding")
-            stringProp.text = "utf8"
+            stringProp.text = "UTF-8"
 
             # path
             stringProp = etree.SubElement(HTTPSamplerProxy, "stringProp")
             stringProp.set("name", "HTTPSampler.path")
-            stringProp.text = sample.get("path")
+            stringProp.text = str(sample.get("path")).replace('//', '/').replace('/{', '/${')
 
             # method
             stringProp = etree.SubElement(HTTPSamplerProxy, "stringProp")
             stringProp.set("name", "HTTPSampler.method")
-            stringProp.text = sample.get("method")
+            stringProp.text = sample.get("method").upper()
 
             # follow redirects
             boolProp = etree.SubElement(HTTPSamplerProxy, "boolProp")

diff --git a/swaggerjmx/version.py b/swaggerjmx/version.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.0.5"
+__version__ = "1.0.6"
 
 import os
 import sys

diff --git a/tests/test_swagger_jmx.py b/tests/test_swagger_jmx.py
@@ -6,5 +6,7 @@
 
 path = os.path.join(os.getcwd(), 'test.json')
 ST.swagger_url_json_path = '/home/travis/build/Pactortester/swaggerjmx/tests/test.json'
+# ST.swagger_url_json_path = 'test.json'
+# ST.swagger_url = 'http://00000:6003/v2/api-docs'
 ST.report_path = 'jmx'
 conversion()