api-engine-xin 0.0.20__tar.gz → 0.0.22__tar.gz

{api_engine_xin-0.0.20 → api_engine_xin-0.0.22}/ApiEngine/BaseCase.py

@@ -13,6 +13,8 @@ class BaseCase(CaseLogHandler):
     def __init__(self):
         self.session = requests.Session()
         self._db = None
+        self._extract_results = []
+        self._assert_results = []
 
     def __run_script(self, data):
         # 执行前后置脚本，可以在前后置脚本中共享数据
@@ -24,15 +26,17 @@ class BaseCase(CaseLogHandler):
         db = self._db
         # 1、读取前置脚本数据
         setup_scripts = data.get("setup_script")
-        # 2、执行字符串中有效的python代码
-        exec(setup_scripts)
+        # 2、执行字符串中有效的python代码（空值守卫）
+        if setup_scripts and isinstance(setup_scripts, str):
+            exec(setup_scripts)
 
         response = yield
 
         # 1、读取后置脚本数据
         teardown_scripts = data.get("teardown_script")
-        # 2、执行字符串中有效的python代码
-        exec(teardown_scripts)
+        # 2、执行字符串中有效的python代码（空值守卫）
+        if teardown_scripts and isinstance(teardown_scripts, str):
+            exec(teardown_scripts)
 
         yield
 
@@ -163,16 +167,17 @@ class BaseCase(CaseLogHandler):
         else:
             request_data["url"] = ENV.get("base_url") + data.get("interface").get("url")
         request_data["method"] = data.get("interface").get("method")
-        # 2、处理请求头
-        request_data["headers"] = ENV.get("headers")
-        request_data["headers"].update(data.get("headers"))
+        # 2、处理请求头（使用副本，避免污染全局 ENV）
+        request_data["headers"] = dict(ENV.get("headers") or {})
+        request_data["headers"].update(data.get("headers") or {})
         # 3、处理请求参数
         request_data["params"] = data.get("request").get("params")
         content_type = request_data["headers"].get("Content-Type", "")
+        _req = data.get("request") or {}
         if "application/json" in content_type:
-            request_data["json"] = data.get("request").get("json")
+            request_data["json"] = _req.get("json") or _req.get("data")
         if "application/x-www-form-urlencoded" in content_type or "multipart/form-data" in content_type:
-            request_data["data"] = data.get("request").get("data")
+            request_data["data"] = _req.get("data") or _req.get("json")
         if "multipart/form-data" in content_type:
             # 注意：这里不直接把 files 放进需要做变量替换的数据里，避免 open 文件对象被 eval 破坏
             request_data["files"] = data.get("request").get("files")
@@ -221,6 +226,7 @@ class BaseCase(CaseLogHandler):
                 from urllib.parse import urlencode
                 query_string = urlencode(params)
                 full_url = f"{self.url}?{query_string}"
+            self.url = full_url  # 更新 self.url 为完整URL（含已替换的查询参数）
             self.info_log("请求地址:", full_url)
             self.info_log("请求方法:", self.method)
             self.info_log("请求头:", self.request_headers)
@@ -311,6 +317,12 @@ class BaseCase(CaseLogHandler):
         # 4、保存到环境变量（后续用 ${user_id} 引用）
         self.save_env_variable(var_name, extracted_value)
         self.info_log(f"数据提取成功：{var_name} = {extracted_value}")
+        # 5、记录提取结果
+        self._extract_results.append({
+            "var_name": var_name,
+            "extract_expr": extract_expr,
+            "value": extracted_value,
+        })
 
     def __assert_data(self, assertion, response):
         """
@@ -345,8 +357,11 @@ class BaseCase(CaseLogHandler):
                 self.error_log("响应体非JSON格式，无法提取数据")
             # 3、通过 JSONPath 提取值
             extracted_value = self.json_extract(resp_json, extract_expr)
+        # 记录实际值（供 __execute_assertions 读取，即使断言失败也能获取）
+        self._last_actual = extracted_value
             # 4、断言
         self.assertion(assertion_type, assertion_content, extracted_value)
+        return extracted_value
 
     # 遍历所有assertions项，依次执行断言
     def __execute_assertions(self, data, response):
@@ -358,11 +373,16 @@ class BaseCase(CaseLogHandler):
             for idx, assertion in enumerate(data.get("assertions"), start=1):
                 field = assertion.get("field", "未知")
                 expected = assertion.get("expected", "未知")
+                assert_type = assertion.get("type", "eq")
+                passed = True
+                actual_value = None
                 try:
                     self.info_log(f"  [{idx}/{total}] 执行断言: field={field}, expected={expected}")
-                    self.__assert_data(assertion, response)
+                    actual_value = self.__assert_data(assertion, response)
                     self.info_log(f"  [{idx}/{total}] ✅ 断言通过: {field}")
                 except AssertionError as e:
+                    passed = False
+                    actual_value = getattr(self, '_last_actual', None)
                     self.error_log(f"  [{idx}/{total}] ❌ 断言失败: {field} — {e}")
                     assertion_errors.append({
                         "index": idx,
@@ -371,6 +391,14 @@ class BaseCase(CaseLogHandler):
                         "error_type": "ASSERTION_FAILED",
                         "message": str(e)
                     })
+                # 记录断言结果
+                self._assert_results.append({
+                    "field": field,
+                    "type": assert_type,
+                    "expected": expected,
+                    "actual": actual_value,
+                    "passed": passed,
+                })
             # 所有断言执行完毕后输出汇总
             passed_count = total - len(assertion_errors)
             if assertion_errors:
@@ -477,6 +505,8 @@ class BaseCase(CaseLogHandler):
         """执行用例"""
         start_time = time.time()
         self._precondition_errors = []  # 记录前置错误（供结果查询）
+        self._extract_results = []      # 重置提取结果
+        self._assert_results = []       # 重置断言结果
         case_name = data.get('title')
         has_failure = False  # ★ 新增：失败标志位
         try:

{api_engine_xin-0.0.20 → api_engine_xin-0.0.22}/ApiEngine/caseLog.py

@@ -1,7 +1,12 @@
+import time
+
+
 class CaseLogHandler:
     """用例日志处理类"""
     def save_log(self,msg,level):
         """保存日志"""
+        ts = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
+        msg = ts + " | " + msg
         # 1、判断当前实例是否有日志属性
         if not hasattr(self,"log_data"):
             setattr(self,"log_data",[])

{api_engine_xin-0.0.20 → api_engine_xin-0.0.22}/ApiEngine/core.py

@@ -32,7 +32,9 @@ class TestRunner:
                 ENV.clear()
                 ENV.update(self.env_data)
                 # 将tools中的函数（用户自定义），通过exec执行（字符串中的python函数），加载到TestTools模块的命名空间中
-                exec(ENV.get("global_func"), global_func.__dict__)
+                _gf = ENV.get("global_func")
+                if _gf and isinstance(_gf, str):
+                    exec(_gf, global_func.__dict__)
                 # 创建测试结果的记录器
                 test_result = TestResult(all=len(testcases["cases"]),name=testcases["name"])
                 # 运行测试用例
@@ -48,7 +50,9 @@ class TestRunner:
                 ENV.clear()
                 ENV.update(self.env_data)
                 # 将tools中的函数（用户自定义），通过exec执行（字符串中的python函数），加载到TestTools模块的命名空间中
-                exec(ENV.get("global_func"), global_func.__dict__)
+                _gf = ENV.get("global_func")
+                if _gf and isinstance(_gf, str):
+                    exec(_gf, global_func.__dict__)
                 # 创建测试结果的记录器
                 test_result = TestResult(all=1)
                 # log.info_log("执行测试用例：",testcases)
@@ -65,7 +69,9 @@ class TestRunner:
                 ENV.clear()
                 ENV.update(self.env_data)
                 # 将tools中的函数（用户自定义），通过exec执行（字符串中的python函数），加载到TestTools模块的命名空间中
-                exec(ENV.get("global_func"), global_func.__dict__)
+                _gf = ENV.get("global_func")
+                if _gf and isinstance(_gf, str):
+                    exec(_gf, global_func.__dict__)
                 # 新增检测日志
                 log.info_log(f"gen_random_num 是否存在：{hasattr(global_func, 'gen_random_num')}")
                 log.info_log(f"gen_random_num 是否可调用：{callable(getattr(global_func, 'gen_random_num', None))}")

api_engine_xin-0.0.22/ApiEngine/testResult.py

@@ -0,0 +1,86 @@
+from ApiEngine import log
+from ApiEngine.BaseCase import BaseCase
+
+
+class TestResult:
+    """测试结果类"""
+    def __init__(self, all, name="调试运行"):
+        """
+        :param all: 测试套件中的用例个数
+        :param name: 测试套件的名称
+        """
+        self.all = all
+        self.name = name
+        self.success = 0
+        self.fail = 0
+        self.error = 0
+        self.results = []
+
+    def _build_info(self, test: BaseCase, status: str) -> dict:
+        """构建用例结果信息（包含提取和断言结果）"""
+        return {
+            "name": getattr(test, "name", ""),
+            "url": getattr(test, "url", ""),
+            "method": getattr(test, "method", ""),
+            "request_headers": getattr(test, "request_headers", ""),
+            "request_body": getattr(test, "request_body", ""),
+            "response_code": getattr(test, "status_code", ""),
+            "response_headers": getattr(test, "response_headers", ""),
+            "response_body": getattr(test, "response_body", ""),
+            "status": status,
+            "log_data": getattr(test, "log_data", ""),
+            "run_time": getattr(test, "elapsed_ms", ""),
+            "extract_info": getattr(test, "_extract_results", []),
+            "assert_info": getattr(test, "_assert_results", []),
+        }
+
+    def add_success(self, test: BaseCase):
+        """
+        :param test: 用例对象
+        :return:
+        """
+        self.success += 1
+        self.results.append(self._build_info(test, "success"))
+
+    def add_fail(self, test: BaseCase):
+        """
+        :param test: 用例对象
+        :return:
+        """
+        self.fail += 1
+        self.results.append(self._build_info(test, "fail"))
+
+    def add_error(self, test: BaseCase, error):
+        """
+        :param test: 用例对象
+        :return:
+        """
+        self.error += 1
+        # 同时记录到全局日志和当前用例日志，确保返回结果中也能看到 ERROR 记录
+        log.error_log("用例执行错误，错误信息：", error)
+        try:
+            test.error_log("用例执行错误，错误信息：", error)
+        except Exception:
+            pass
+        self.results.append(self._build_info(test, "error"))
+
+    def get_result_info(self):
+        """
+        :return: 测试结果信息
+        """
+        if self.success == self.all:
+            state = "success"
+        elif self.fail > 0:
+            state = "fail"
+        else:
+            state = "error"
+        info = {
+            "name": self.name,
+            "all": self.all,
+            "success": self.success,
+            "fail": self.fail,
+            "error": self.error,
+            "cases": self.results,
+            "state": state
+        }
+        return info

{api_engine_xin-0.0.20/api_engine_xin.egg-info → api_engine_xin-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: api_engine_xin
-Version: 0.0.20
+Version: 0.0.22
 Summary: 接口测试平台测试用例执行引擎
 Home-page: https://pypi.org/project/api_engine_xin/
 Author: Shawn
@@ -19,19 +19,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pymysql>=1.0.0
-Requires-Dist: requests>=2.26.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 
 # api_engine_xin

{api_engine_xin-0.0.20 → api_engine_xin-0.0.22/api_engine_xin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
-Name: api_engine_xin
-Version: 0.0.20
+Metadata-Version: 2.1
+Name: api-engine-xin
+Version: 0.0.22
 Summary: 接口测试平台测试用例执行引擎
 Home-page: https://pypi.org/project/api_engine_xin/
 Author: Shawn
@@ -19,19 +19,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pymysql>=1.0.0
-Requires-Dist: requests>=2.26.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 
 # api_engine_xin

{api_engine_xin-0.0.20 → api_engine_xin-0.0.22}/setup.py

@@ -12,7 +12,7 @@ with codecs.open(os.path.join(here, "README.md"), encoding="utf-8") as fh:
 # 核心配置
 setup(
     name="api_engine_xin",  # ✅【必须改】pip install 这个名字！全网唯一，不能和PyPI上已有的包名重复
-    version="0.0.20", # ✅【必须改】版本号，每次更新包都要升级版本（如0.0.2、0.1.0）
+    version="0.0.22", # ✅【必须改】版本号，每次更新包都要升级版本（如0.0.2、0.1.0）
     author="Shawn",# ✅【必须改】你的名字/昵称
     author_email="xiaoh0525@xiaoh.com",# ✅【必须改】你的注册PyPI的邮箱
     description="接口测试平台测试用例执行引擎", # ✅【必须改】一句话说明你的包是干嘛的

api_engine_xin-0.0.20/ApiEngine/testResult.py

@@ -1,109 +0,0 @@
-from ApiEngine import log
-from ApiEngine.BaseCase import BaseCase
-
-
-class TestResult:
-    """测试结果类"""
-    def __init__(self, all, name="调试运行"):
-        """
-        :param all: 测试套件中的用例个数
-        :param name: 测试套件的名称
-        """
-        self.all = all
-        self.name = name
-        self.success = 0
-        self.fail = 0
-        self.error = 0
-        self.results = []
-
-    def add_success(self, test: BaseCase):
-        """
-        :param test: 用例对象
-        :return:
-        """
-        self.success += 1
-        info = {
-            "name": getattr(test, "name",""),
-            "url": getattr(test, "url",""),
-            "method": getattr(test, "method",""),
-            "request_headers": getattr(test, "request_headers",""),
-            "request_body": getattr(test, "request_body",""),
-            "response_code": getattr(test, "status_code",""),
-            "response_headers": getattr(test, "response_headers",""),
-            "response_body": getattr(test, "response_body",""),
-            "status": "success",
-            "log_data": getattr(test, "log_data", ""),
-            "run_time": getattr(test,"elapsed_ms","")
-        }
-        self.results.append(info)
-
-    def add_fail(self, test: BaseCase):
-        """
-        :param test: 用例对象
-        :return:
-        """
-        self.fail += 1
-        info = {
-            "name": getattr(test, "name",""),
-            "url": getattr(test, "url",""),
-            "method": getattr(test, "method",""),
-            "request_headers": getattr(test, "request_headers",""),
-            "request_body": getattr(test, "request_body",""),
-            "response_code": getattr(test, "status_code",""),
-            "response_headers": getattr(test, "response_headers",""),
-            "response_body": getattr(test, "response_body",""),
-            "status": "fail",
-            "log_data": getattr(test, "log_data", ""),
-            "run_time": getattr(test,"elapsed_ms","")
-        }
-        self.results.append(info)
-
-    def add_error(self, test: BaseCase, error):
-        """
-        :param test: 用例对象
-        :return:
-        """
-        self.error += 1
-        # 同时记录到全局日志和当前用例日志，确保返回结果中也能看到 ERROR 记录
-        log.error_log("用例执行错误，错误信息：", error)
-        try:
-            # BaseCase 继承了 CaseLogHandler，直接复用其 error_log 记录到用例的 log_data
-            test.error_log("用例执行错误，错误信息：", error)
-        except Exception:
-            # 如果 test 上不存在 error_log（理论上不会发生），则忽略，不影响后续结果生成
-            pass
-        info = {
-            "name": getattr(test, "name",""),
-            "url": getattr(test, "url",""),
-            "method": getattr(test, "method",""),
-            "request_headers": getattr(test, "request_headers",""),
-            "request_body": getattr(test, "request_body",""),
-            "response_code": getattr(test, "status_code",""),
-            "response_headers": getattr(test, "response_headers",""),
-            "response_body": getattr(test, "response_body",""),
-            "status": "error",
-            "log_data": getattr(test, "log_data", ""),
-            "run_time": getattr(test,"elapsed_ms","")
-        }
-        self.results.append(info)
-
-    def get_result_info(self):
-        """
-        :return: 测试结果信息
-        """
-        if self.success == self.all:
-            state = "success"
-        elif self.fail > 0:
-            state = "fail"
-        else:
-            state = "error"
-        info = {
-            "name": self.name,
-            "all": self.all,
-            "success": self.success,
-            "fail": self.fail,
-            "error": self.error,
-            "cases": self.results,
-            "state": state
-        }
-        return info