Merge pull request #93 from OpenTestSolar/dev/support-encode-test-name

支持对用例名进行编码

Author: dzx-cptbtptp

pytest/pyproject.toml

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

pytest/src/testsolar_pytestx/converter.py

@@ -1,7 +1,7 @@
 import re
 import os
 from typing import Tuple, Optional
-
+from urllib.parse import quote
 from pytest import Item
 from loguru import logger
 
@@ -79,14 +79,18 @@ def pytest_to_selector(item: Item, project_path: str) -> str:
         if item.cls:
             name = item.cls.__name__ + "/" + name
         name = decode_datadrive(name)
-        full_name = f"{rel_path}?{name}"
+        full_name = f"{rel_path}?{quote(name)}"
     elif hasattr(item, "nodeid") and item.nodeid:
         full_name = normalize_testcase_name(item.nodeid)
+        if "?" in full_name:
+            path = full_name.split("?", 1)[0]
+            case_name = full_name.split("?", 1)[-1]
+            full_name = "?".join([path, quote(case_name)])
     else:
         rel_path, _, name = item.location
         name = name.replace(".", "/")
         name = decode_datadrive(name)
-        full_name = f"{rel_path}?{name}"
+        full_name = f"{rel_path}?{quote(name)}"
 
     return full_name
 
@@ -107,6 +111,7 @@ 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[中文-中文汉字]
+    test_include[\U0001f604] -> test_include[😊]
 
     用例名称中不允许出现[，因此如果有，一定是数据驱动的开头
     """

pytest/tests/test_collector.py

@@ -37,12 +37,12 @@ def test_collect_testcases_when_selector_is_valid(self):
         self.assertEqual(len(re.LoadErrors), 2)
 
         self.assertEqual(re.Tests[0].Name, "aa/bb/cc/test_in_sub_class.py?TestCompute/test_add")
-        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[1].Name, "test_data_drive.py?test_eval/%5B2%2B4-6%5D")
+        self.assertEqual(re.Tests[2].Name, "test_data_drive.py?test_eval/%5B3%2B5-8%5D")
+        self.assertEqual(re.Tests[3].Name, "test_data_drive.py?test_eval/%5B6%2A9-42%5D")
         self.assertEqual(
             re.Tests[4].Name,
-            "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]",
+            "test_data_drive.py?test_special_data_drive_name/%5B%E4%B8%AD%E6%96%87-%E5%88%86%E5%8F%B7%2B%5Bid%3A32%5D%5D",
         )
 
         self.assertEqual(re.Tests[5].Name, "test_normal_case.py?test_success")
@@ -104,11 +104,17 @@ def test_collect_testcases_with_utf8_chars(self):
         self.assertEqual(len(re.Tests), 3)
         self.assertEqual(len(re.LoadErrors), 0)
 
-        self.assertEqual(re.Tests[0].Name, "test_data_drive_zh_cn.py?test_include/[#?-#?^$%!/]")
-        self.assertEqual(re.Tests[1].Name, "test_data_drive_zh_cn.py?test_include/[中文-中文汉字]")
+        self.assertEqual(
+            re.Tests[0].Name,
+            "test_data_drive_zh_cn.py?test_include/%5B%23%3F-%23%3F%5E%24%25%21/%5D",
+        )
+        self.assertEqual(
+            re.Tests[1].Name,
+            "test_data_drive_zh_cn.py?test_include/%5B%E4%B8%AD%E6%96%87-%E4%B8%AD%E6%96%87%E6%B1%89%E5%AD%97%5D",
+        )
         self.assertEqual(
             re.Tests[2].Name,
-            "test_data_drive_zh_cn.py?test_include/[파일을 찾을 수 없습니다-ファイルが見つかりません]",
+            "test_data_drive_zh_cn.py?test_include/%5B%ED%8C%8C%EC%9D%BC%EC%9D%84%20%EC%B0%BE%EC%9D%84%20%EC%88%98%20%EC%97%86%EC%8A%B5%EB%8B%88%EB%8B%A4-%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E3%81%8C%E8%A6%8B%E3%81%A4%E3%81%8B%E3%82%8A%E3%81%BE%E3%81%9B%E3%82%93%5D",
         )
 
     def test_collect_testcases_with_case_drive_separator(self):
@@ -210,5 +216,6 @@ def test_collect_testcases_with_emoji(self):
         self.assertEqual(len(re.Tests), 1)
         self.assertEqual(len(re.LoadErrors), 0)
         self.assertEqual(
-            re.Tests[0].Name, "test_emoji_data_drive.py?test_emoji_data_drive_name/[\U0001f604]"
+            re.Tests[0].Name,
+            "test_emoji_data_drive.py?test_emoji_data_drive_name/%5B%F0%9F%98%84%5D",
         )

pytest/tests/test_converter.py

@@ -52,7 +52,7 @@ def test_pytest_path_cls_to_selector(self):
 
         re = pytest_to_selector(mock, "/data/tests/")
 
-        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?InnerClass/test_include/[2-8]")
+        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?InnerClass/test_include/%5B2-8%5D")
 
     def test_pytest_node_id_to_selector_without_datadrive(self):
         mock = MagicMock()
@@ -74,7 +74,7 @@ def test_pytest_node_id_to_selector_with_datadrive(self):
 
         self.assertEqual(
             re,
-            "/data/tests/tests/test_data_drive_zh_cn.py?test_include/[#?-/[中文:203]]",
+            "/data/tests/tests/test_data_drive_zh_cn.py?test_include/%5B%23%3F-/%5B%E4%B8%AD%E6%96%87%3A203%5D%5D",
         )
 
     def test_pytest_location_to_selector(self):
@@ -86,7 +86,7 @@ def test_pytest_location_to_selector(self):
 
         re = pytest_to_selector(mock, "/data/tests/")
 
-        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?test_include/[AA-BB]")
+        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?test_include/%5BAA-BB%5D")
 
 
 class TestExtractCaseAndDataDrive:

pytest/tests/test_load.py

@@ -24,7 +24,7 @@ def test_collect_testcases_from_args(self):
         self.assertEqual(len(re.Tests), 7)
         self.assertEqual(
             re.Tests[4].Name,
-            "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]",
+            "test_data_drive.py?test_special_data_drive_name/%5B%E4%B8%AD%E6%96%87-%E5%88%86%E5%8F%B7%2B%5Bid%3A32%5D%5D",
         )
         self.assertEqual(
             re.Tests[6].Name,

pytest/testtool.yaml

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