修复数据驱动中包含[]问题 (#64)

增加更多测试

Author: asiazhang

pytest/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "testsolar-pytestx"
-version = "0.1.16"
+version = "0.1.17"
 description = "Pytest tool for TestSolar"
 authors = [
     {name = "asiazhang2002", email = "asiazhang2002@gmail.com"},

pytest/src/testsolar_pytestx/converter.py

@@ -104,9 +104,14 @@ def decode_datadrive(name: str) -> str:
     https://docs.pytest.org/en/7.0.x/how-to/parametrize.html
 
     test_include[\u4e2d\u6587-\u4e2d\u6587\u6c49\u5b57] -> test_include[中文-中文汉字]
+
+    用例名称中不允许出现[，因此如果有，一定是数据驱动的开头
     """
-    if name.endswith("]") and "[" in name:
-        name = name.replace("[", "/[")
+    if name.endswith("]"):
+        start_index = name.find("[")
+        if start_index != -1:
+            name = name.replace(name[start_index], "/[", 1)
+
         if re.search(r"\\u\w{4}", name):
             name = name.encode().decode("unicode_escape")
 

pytest/testdata/entry_with_error_case.json

@@ -0,0 +1,16 @@
+{
+  "TaskId": "aa",
+  "ProjectPath": "bb",
+  "FileReportPath": "",
+  "Collectors": [],
+  "Context": {},
+  "TestSelectors": [
+    "test_normal_case.py?test_success",
+    "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]",
+    "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32:34]]",
+    "aa/bb/cc/test_in_sub_class.py",
+    "test_data_drive.py",
+    "errors/test_import_error.py",
+    "errors/test_load_error.py"
+  ]
+}

pytest/testdata/test_data_drive.py

@@ -4,3 +4,8 @@
 @pytest.mark.parametrize("test_input,expected", [("3+5", 8), ("2+4", 6), ("6*9", 42)])
 def test_eval(test_input, expected):
     assert eval(test_input) == expected
+
+
+@pytest.mark.parametrize("test_input", ["中文-分号+[id:32]"])
+def test_special_data_drive_name(test_input):
+    assert "bad" not in test_input

pytest/tests/test_collector.py

@@ -35,7 +35,7 @@ def test_collect_testcases_when_selector_is_valid(self):
 
         re = read_load_result(pipe_io)
 
-        self.assertEqual(len(re.Tests), 5)
+        self.assertEqual(len(re.Tests), 6)
         self.assertEqual(len(re.LoadErrors), 2)
 
         self.assertEqual(
@@ -44,13 +44,17 @@ def test_collect_testcases_when_selector_is_valid(self):
         self.assertEqual(re.Tests[1].Name, "test_data_drive.py?test_eval/[2+4-6]")
         self.assertEqual(re.Tests[2].Name, "test_data_drive.py?test_eval/[3+5-8]")
         self.assertEqual(re.Tests[3].Name, "test_data_drive.py?test_eval/[6*9-42]")
+        self.assertEqual(
+            re.Tests[4].Name,
+            "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]",
+        )
 
-        self.assertEqual(re.Tests[4].Name, "test_normal_case.py?test_success")
-        self.assertEqual(re.Tests[4].Attributes["owner"], "foo")
-        self.assertEqual(re.Tests[4].Attributes["description"], "测试获取答案")
-        self.assertEqual(re.Tests[4].Attributes["tag"], "high")
+        self.assertEqual(re.Tests[5].Name, "test_normal_case.py?test_success")
+        self.assertEqual(re.Tests[5].Attributes["owner"], "foo")
+        self.assertEqual(re.Tests[5].Attributes["description"], "测试获取答案")
+        self.assertEqual(re.Tests[5].Attributes["tag"], "high")
         self.assertEqual(
-            re.Tests[4].Attributes["extra_attributes"], '[{"env": ["AA", "BB"]}]'
+            re.Tests[5].Attributes["extra_attributes"], '[{"env": ["AA", "BB"]}]'
         )
 
         self.assertEqual(
@@ -83,7 +87,7 @@ def test_collect_testcases_when_select_not_valid(self):
 
         re = read_load_result(pipe_io)
 
-        self.assertEqual(len(re.Tests), 3)
+        self.assertEqual(len(re.Tests), 4)
         self.assertEqual(len(re.LoadErrors), 1)
         self.assertIn(
             "test_not_exist.py does not exist, SKIP it", re.LoadErrors[0].message

pytest/tests/test_converter.py

@@ -39,6 +39,14 @@ def test_selector_to_pytest_with_utf8_string(self):
             "/data/tests/tests/test_data_drive_zh_cn.py::aa::bb::test_include[\\u4e2d\\u6587-\\u4e2d\\u6587\\u6c49\\u5b57]",
         )
 
+        re = selector_to_pytest(
+            "/data/tests/tests/test_data_drive_zh_cn.py?aa/bb/test_include/[中文-[中文]汉字]"
+        )
+        self.assertEqual(
+            re,
+            "/data/tests/tests/test_data_drive_zh_cn.py::aa::bb::test_include[\\u4e2d\\u6587-[\\u4e2d\\u6587]\\u6c49\\u5b57]",
+        )
+
     def test_pytest_path_cls_to_selector(self):
         mock = MagicMock()
         mock.nodeid = None
@@ -65,15 +73,16 @@ def test_pytest_node_id_to_selector_without_datadrive(self):
     def test_pytest_node_id_to_selector_with_datadrive(self):
         mock = MagicMock()
         mock.nodeid = (
-            "/data/tests/tests/test_data_drive_zh_cn.py::test_include[#?-#?^$%!]"
+            "/data/tests/tests/test_data_drive_zh_cn.py::test_include[#?-[中文:203]]"
         )
         mock.path = None
         mock.cls = None
 
         re = pytest_to_selector(mock, "/data/tests/")
 
         self.assertEqual(
-            re, "/data/tests/tests/test_data_drive_zh_cn.py?test_include/[#?-#?^$%!]"
+            re,
+            "/data/tests/tests/test_data_drive_zh_cn.py?test_include/[#?-[中文:203]]",
         )
 
     def test_pytest_location_to_selector(self):

pytest/tests/test_load.py

@@ -23,7 +23,8 @@ def test_collect_testcases_from_args(self):
         pipe_io.seek(0)
         re = read_load_result(pipe_io)
 
-        self.assertEqual(len(re.Tests), 5)
+        self.assertEqual(len(re.Tests), 6)
+        self.assertEqual(re.Tests[4].Name, "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]")
 
     def test_raise_error_when_param_is_invalid(self):
         with self.assertRaises(SystemExit):

pytest/tests/test_run.py

@@ -17,7 +17,10 @@ class TestExecuteEntry(TestCase):
     def test_run_testcases_from_args(self):
         pipe_io = io.BytesIO()
         run_testcases_from_args(
-            args=["run.py", Path.joinpath(Path(self.testdata_dir), "entry.json")],
+            args=[
+                "run.py",
+                Path.joinpath(Path(self.testdata_dir), "entry_with_error_case.json"),
+            ],
             workspace=self.testdata_dir,
             pipe_io=pipe_io,
         )

pytest/testtool.yaml

@@ -2,7 +2,7 @@ schemaVersion: 1.0
 name: pytest
 nameZh: pytest自动化测试
 lang: python
-version: '0.1.16'
+version: '0.1.17'
 langType: INTERPRETED
 description: |-
   pytest是一个成熟的全功能Python测试工具，可以帮助您编写更好的程序。此测试工具允许您在TestSolar上运行pytest。