From 05f34366afd778f4d9c5fb86b01f73699c95d461 Mon Sep 17 00:00:00 2001 From: floraachy <1622042529@qq.com> Date: Fri, 9 Jun 2023 15:04:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E9=A2=84=E8=AD=A6=E6=9C=BA?= =?UTF-8?q?=E5=88=B6=202.=20=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=96=B9=E6=B3=95?= =?UTF-8?q?=203.=20=E5=B0=86=E7=94=A8=E4=BE=8B=E8=B7=B3=E8=BF=87=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E6=8F=90=E5=8F=96=E6=88=90=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E7=9A=84fixture=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=204.=20=E4=BF=AE=E6=94=B9pytet-html=E6=B5=8B=E8=AF=95=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=88=97=E2=80=99=E7=94=A8=E4=BE=8B=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E2=80=99=E5=80=BC=E8=8E=B7=E5=8F=96=205.=20=E6=A0=B9=20?= =?UTF-8?q?=E6=8D=AE=E6=9C=80=E6=96=B0=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0readme=E6=96=87=E4=BB=B6~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pipfile | 2 + README.md | 40 +++-- case_utils/case_data_analysis.py | 97 ++++++++++ case_utils/case_fun_handle.py | 168 ++++++++++++++++++ case_utils/request_data_handle.py | 6 +- common_utils/base_request.py | 22 +-- common_utils/data_handle.py | 1 + common_utils/func_handle.py | 16 +- config/case_template.txt | 36 ++-- config/models.py | 56 ++++++ config/settings.py | 2 +- conftest.py | 25 +-- .../{test_login_demo.yaml => login_demo.yaml} | 27 +-- data/test_gitlink_demo.xlsx | Bin 0 -> 11778 bytes data/test_login_excel_demo.xlsx | Bin 10033 -> 0 bytes data/test_new_project_demo.yaml | 29 +-- pytest.ini | 7 +- run.py | 13 +- test_case/conftest.py | 14 +- test_case/test_manual_case/test_demo.py | 28 ++- test_case/test_manual_case/test_login_demo.py | 38 ++-- 21 files changed, 498 insertions(+), 129 deletions(-) create mode 100644 case_utils/case_data_analysis.py create mode 100644 case_utils/case_fun_handle.py rename data/{test_login_demo.yaml => login_demo.yaml} (84%) create mode 100644 data/test_gitlink_demo.xlsx delete mode 100644 data/test_login_excel_demo.xlsx diff --git a/Pipfile b/Pipfile index 4248951..972c697 100644 --- a/Pipfile +++ b/Pipfile @@ -20,6 +20,8 @@ pytest = "==6.2.5" pytest-html = "==2.1.1" pytest-rerunfailures = "*" allure-pytest = "==2.9.45" +pydantic = "*" +xpinyin = "*" [dev-packages] diff --git a/README.md b/README.md index 81f182b..51eccd9 100644 --- a/README.md +++ b/README.md @@ -24,23 +24,15 @@ ## 二、实现功能 * 通过session会话方式，解决了登录之后cookie关联处理 - * 框架天然支持接口动态传参、关联灵活处理 - +* 支持测试数据分析，测试数据不符合规范有预警机制 * 测试数据隔离, 实现数据驱动 - * 自动生成用例代码: 测试人员在yaml/excel文件中填写好测试用例, 程序可以直接生成用例代码，纯小白也能使用 - * 动态多断言: 支持响应断言和数据库断言 - * 多种报告随心选择：框架支持pytest-html以及Allure测试报告，可以动态配置所需报告 - * 日志模块: 采用loguru管理日志，可以输出更为优雅，简洁的日志 - * 钉钉、企业微信通知: 支持多种通知场景，执行成功之后，可选择发送钉钉、或者企业微信、邮箱通知 - * 执行环境一键切换，解决多环境相互影响问题 - * 使用pipenv管理虚拟环境和依赖文件，提供了一系列命令和选项来帮助你实现各种依赖和环境管理相关的操作 @@ -52,7 +44,8 @@ │ ├────allure_handle.py 操作allure的相关方法 │ ├────platform_handle.py 跨平台的支持allure，用于生成allure测试报告 │ ├────assert_handle.py 断言处理， 包括响应断言和数据库断言 -│ ├────case_handle.py 根据配置文件，从指定类型文件中读取用例数据，并调用生成用例文件方法，生成用例文件 +│ ├────case_fun_handle.py 根据配置文件，从指定类型文件中读取用例数据，并调用生成用例文件方法，生成用例文件 +│ ├────case_data_analysis 分析用例数据是否符合规范 │ ├────data_handle.py 数据处理 │ ├────request_data_handle.py 针对用例数据进行请求前后的处理 │ ├────get_results_handle.py 从pytest-html/allure测试报告中获取测试结果 @@ -171,7 +164,7 @@ pip install pipenv 1）在目录`data`下新建一个YAML/Excel文件，按照要求编写测试用例数据 2）在test_case.test_manual_case下新建一个以"test"开头的测试方法，进行测试用例方法编写。 -### 6. 用例中相关字段的介绍 +### 5. 用例中相关字段的介绍 ```yaml - case_common ：公共参数 @@ -186,13 +179,36 @@ pip install pipenv - method：请求方式，例如：GET, POST, DELETE, PUT, PATCH等 - headers：请求头，注意如果在headers里面防止cookies，其值类型需要是字符串 - cookies：请求cookies，格式是：DICT， CookieJar对象 - - pk：请求数据类型：params, json, file, data + - request_type：请求数据类型：params, json, file, data - payload：请求参数 - files：上传附件接口所需的文件绝对路径 - extract：后置提取参数 - assert_response：响应断言 - assert_sql：数据库断言 ``` +### 6. Excel用例单独说明 +框架支持excel多表单自动生成测试用例，每一个表单作为一个测试用例模块。 +例如： +excel表格名称是：test_demo.xlsx +excel表单1名称是：GitLink-登录模块 +excel表单2名称是：示例模块 + + +生成规则： +- 如果excel表单中存在"-"，我们将取"-"后面的部分的首字母拼接excel文件名称作为测试用例模块/测试用例类/测试用例方法名称 +- 如果excel表单中不存在"-"，我们将直接获取表单名称首字母拼接excel文件名称作为测试用例模块/测试用例类/测试用例方法名称 +- 测试用例模块/测试用例类/测试用例方法名称同时也将遵循python语法规则进行适当调整 + +基于上述规则： +- excel第一个表单生成的测试用例 +测试用例模块：test_demo_dlmk.py +测试用例类：TestDemoDlmkAuto +测试用例方法：test_demo_dlmk_auto + +- excel第二个表单生成的测试用例 +测试用例模块：test_demo_slmk.py +测试用例类：TestDemoSlmkAuto +测试用例方法：test_demo_slmk_auto ## 六、运行自动化测试 ### 1. 激活已存在的虚拟环境 diff --git a/case_utils/case_data_analysis.py b/case_utils/case_data_analysis.py new file mode 100644 index 0000000..ea201c7 --- /dev/null +++ b/case_utils/case_data_analysis.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# @Time : 2023/6/7 16:37 +# @Author : chenyinhua +# @File : case_data_analysis.py +# @Software: PyCharm +# @Desc: 分析用例数据是否符合规范 + +from typing import Text +from config.models import TestCase, TestCaseEnum, Method, RequestType + + +class CaseDataCheck: + """ + 用例数据解析, 判断数据填写是否符合规范 + """ + + def __init__(self): + self.case_data = None + self.case_id = None + + @property + def get_method(self) -> Text: + + return self.check_params_right( + Method, + self.case_data.get(TestCaseEnum.METHOD.value[0]) + ) + + @property + def get_request_type(self): + return self.check_params_right( + RequestType, + self.case_data.get(TestCaseEnum.REQUEST_TYPE.value[0]) + ) + + def check_case_data_attr(self, attr: Text): + assert attr in self.case_data.keys(), ( + f"用例ID为 {self.case_id} 的用例中缺少 {attr} 参数，请确认用例内容是否编写规范." + ) + + def check_params_exit(self): + """ + 遍历一个枚举类中所有成员，并检查与每个成员对应的实例属性是否存在。 + 如果属性存在，则什么也不做，如果不存在，则抛出异常或执行其他操作 + """ + for enum in list(TestCaseEnum._value2member_map_.keys()): + if enum[1]: + self.check_case_data_attr(enum[0]) + + def check_params_right(self, enum_name, attr): + """ + 检查参数值是否正确，符合要求规范 + """ + _member_names_ = enum_name._member_names_ + assert attr.upper() in _member_names_, ( + f"用例ID为 {self.case_id} 的用例中 {enum_name}: {attr} 填写不正确，" + f"当前框架中只支持 {_member_names_} 类型." + f"如需新增 method 类型，请联系管理员." + ) + return attr.upper() + + @property + def get_assert_response(self): + _assert_data = self.case_data.get(TestCaseEnum.ASSERT_RESPONSE.value[0]) + assert _assert_data is not None, ( + f"用例ID 为 {self.case_id} 未添加断言" + ) + return _assert_data + + def case_process(self, cases): + case_list = [] + for key, values in cases.items(): + # 公共配置中的数据，与用例数据不同，需要单独处理 + if key != 'case_common': + # 检查用例数据，去除用例数据中的空格 + for k, v in values.items(): + values[k] = v.strip() if isinstance(v, str) else v + self.case_data = values + self.case_id = key + self.check_params_exit() + case_data = { + 'feature': self.case_data.get(TestCaseEnum.FEATURE.value[0]), + 'title': self.case_data.get(TestCaseEnum.TITLE.value[0]), + 'url': self.case_data.get(TestCaseEnum.URL.value[0]), + 'method': self.get_method, + 'run': self.case_data.get(TestCaseEnum.RUN.value[0]), + 'headers': self.case_data.get(TestCaseEnum.HEADERS.value[0]), + 'cookies': self.case_data.get(TestCaseEnum.COOKIES.value[0]), + 'request_type': self.get_request_type, + 'payload': self.case_data.get(TestCaseEnum.PAYLOAD.value[0]), + 'extract': self.case_data.get(TestCaseEnum.EXTRACT.value[0]), + "assert_response": self.get_assert_response, + "assert_sql": self.case_data.get(TestCaseEnum.ASSERT_SQL.value[0]), + } + case_list.append(TestCase(**case_data).dict()) + + return case_list diff --git a/case_utils/case_fun_handle.py b/case_utils/case_fun_handle.py new file mode 100644 index 0000000..1cb0f80 --- /dev/null +++ b/case_utils/case_fun_handle.py @@ -0,0 +1,168 @@ +# -*- coding: utf-8 -*- +# @Time : 2023/6/7 10:07 +# @Author : chenyinhua +# @File : case_fun_handle.py +# @Software: PyCharm +# @Desc: + +from config.path_config import DATA_DIR, CASE_TEMPLATE_DIR, AUTO_CASE_DIR +from common_utils.excel_handle import ExcelHandle +from common_utils.yaml_handle import YamlHandle +from config.models import CaseFileType +from config.settings import CASE_FILE_TYPE +from loguru import logger +from common_utils.files_handle import get_files +from case_utils.case_data_analysis import CaseDataCheck +import os +from config.path_config import AUTO_CASE_DIR +from string import Template +import datetime +from xpinyin import Pinyin # 纯 Python 编写的中文字符串拼音转换模块，不需要依赖外部程序和词库。 + +""" +主要步骤： +1. 从用例数据文件（EXCEL/YAML）中获取用例数据 +2. 分析用例数据是否符合规范 +3. 确认符合规范后，获取所有用例数据，自动生成测试用例方法（PY） +""" + + +def generate_case_from_excel(files: list): + """ + 读取excel用例数据生成测试用例 + """ + for file in files: + # 读取excel文件中的用例数据，存储到data中 + if os.path.isfile(file): + # 读取xlsx/xls文件中的用例数据，存储到data中 + data = ExcelHandle(file).read() + # logger.debug(f"从{file}中读取到的用例数据是：{data}") + for index, v in enumerate(data): + excel_case = {} + # 将excel读取到的用例数据，适配allure格式 + """ + 表单名称以短横线隔开的情况下，左边部分作为allure_epic， 右边部分作为allure_feature以及allure_story。 + 否则，表单名称全部作为allure_epic，allure_feature，allure_story + """ + if "-" in v["sheet_name"]: + excel_case["case_common"] = { + "allure_epic": v["sheet_name"].split("-")[0], + "allure_feature": v["sheet_name"].split("-")[1], + "allure_story": v["sheet_name"].split("-")[1] + } + else: + excel_case["case_common"] = { + "allure_epic": v["sheet_name"], + "allure_feature": v["sheet_name"], + "allure_story": v["sheet_name"] + } + # 处理excel用例数据 + for case in v["data"]: + excel_case[case["id"]] = case + # 检查用例数据是否符合规范 + tested_case = CaseDataCheck().case_process(excel_case) + # 生成测试方法 + """ + 由于excel涉及到多个表单，每一个表单都会生成一个测试方法。因此会将表单名称的首字母拼接到测试方法上。 + excel名称：test_demo + 例如表单名称："GitLink-登录模块" 或 "登录模块"，都是取关键字"登录模块"首字母 + 测试文件：test_demo_dl.py + 测试方法名称: TestDemoDl.test_demo_dl + """ + pin_yin = Pinyin() + _name = pin_yin.get_initials(excel_case["case_common"]["allure_feature"], "").lower() + gen_case_file(filename=os.path.splitext(os.path.basename(file))[0] + "_" + _name, + case_template_path=CASE_TEMPLATE_DIR, + case_common=excel_case["case_common"], case_data=tested_case, + target_case_path=AUTO_CASE_DIR) + else: + logger.error(f"{file}不是一个正确的文件路径！") + + +def generate_case_from_yaml(files: list): + """ + 读取yaml用例数据生成测试用例 + """ + for file in files: + # 从yaml/yml中读取用例数据 + if os.path.isfile(file): + # 读取yaml/yml文件中的用例数据，存储到data中 + yaml_data = YamlHandle(file).read_yaml + # logger.debug(f"从{file}中读取到的用例数据是：{yaml_data}") + # 检查用例数据是否符合规范 + tested_case = CaseDataCheck().case_process(yaml_data) + # 生成测试方法 + gen_case_file(filename=os.path.splitext(os.path.basename(file))[0], case_template_path=CASE_TEMPLATE_DIR, + case_common=yaml_data["case_common"], case_data=tested_case, + target_case_path=AUTO_CASE_DIR) + else: + logger.error(f"{file}不是一个正确的文件路径！") + + +def generate_cases(): + """ + 根据配置文件，从指定类型文件中读取所有用例数据，并自动生成测试用例 + """ + # 判断配置文件里面CASE_DATA_TYPE,判断用例数据是从excel还是yaml文件中读取 + # 从excel中读取用例数据 + if CASE_FILE_TYPE == CaseFileType.EXCEL.value: + # 在用例数据"DATA_DIR"目录中寻找后缀是xlsx, xls的文件 + files = get_files(target=DATA_DIR, start="test_", end=".xlsx") \ + + get_files(target=DATA_DIR, start="test_", end=".xls") + # 自动生成测试用例 + generate_case_from_excel(files) + # 从yaml中读取用例数据 + elif CASE_FILE_TYPE == CaseFileType.YAML.value: + # 在用例数据"DATA_DIR"目录中寻找后缀是yaml, yml的文件 + files = get_files(target=DATA_DIR, start="test_", end=".yaml") \ + + get_files(target=DATA_DIR, start="test_", end=".yml") + # 自动生成测试用例 + generate_case_from_yaml(files) + else: + # 在用例数据"DATA_DIR"目录中寻找后缀是xlsx,xls, yaml, yml的文件 + excel_files = get_files(target=DATA_DIR, start="test_", end=".xlsx") \ + + get_files(target=DATA_DIR, start="test_", end=".xls") + yaml_files = get_files(target=DATA_DIR, start="test_", end=".yaml") \ + + get_files(target=DATA_DIR, start="test_", end=".yml") + # 自动生成测试用例 + generate_case_from_excel(excel_files) + generate_case_from_yaml(yaml_files) + + +def gen_case_file(filename, case_template_path, case_common, case_data, target_case_path): + """ + 根据测试用例文件(yaml/yml/xlsx/xls)，以及事先定义的测试用例模板，实际用例数据，生成测试用例方法(.py) + :param filename: 测试用例文件(yaml/yml/xlsx/xls)的名称，用作生成测试用例类名，方法名 + :param case_template_path: 测试用例模板的绝对路径 + :param case_common: 用例公共参数 + :param case_data: 实际用例数据 + :param target_case_path: 测试用例方法(.py)的绝对路径 + """ + # 如果自动生成用例的目录不存在则自动创建一个 + if not os.path.exists(AUTO_CASE_DIR): + os.makedirs(AUTO_CASE_DIR) + """ + string.Template是将一个string设置为模板，通过替换变量的方法，最终得到想要的string。 + """ + # 将用例数据的名称作为测试用例文件名称, 如test_login_demo + func_name = filename + # 方法名test_demo的类名是TestDemo + class_name = "".join([word.capitalize() for word in func_name.split("_")]) + # 定义生成的测试用例的模板 + with open(file=case_template_path, mode="r", encoding="utf-8") as f: + case_template = f.read() + # 根据模板，生成测试用例方法 + my_case = Template(case_template).safe_substitute({"allure_epic": case_common["allure_epic"], + "allure_feature": case_common["allure_feature"], + "allure_story": case_common["allure_story"], + "case_data": case_data, + "func_title": func_name, + "class_title": class_name, + "now": datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}) + # 将测试用例方法写入py文件中 + with open(os.path.join(target_case_path, func_name + '.py'), "w", encoding="utf-8") as fp: + fp.write(my_case) + + +if __name__ == '__main__': + generate_cases() diff --git a/case_utils/request_data_handle.py b/case_utils/request_data_handle.py index 15fd81b..bbd4a95 100644 --- a/case_utils/request_data_handle.py +++ b/case_utils/request_data_handle.py @@ -30,7 +30,7 @@ class RequestPreDataHandle: f"请求方式: {type(request_data.get('method', None))} || {request_data.get('method', None)}\n" \ f"请求头: {type(request_data.get('headers', None))} || {request_data.get('headers', None)}\n" \ f"请求cookies: {type(request_data.get('cookies', None))} || {request_data.get('cookies', None)}\n" \ - f"请求类型: {type(request_data.get('pk', None))} || {request_data.get('pk', None)}\n" \ + f"请求类型: {type(request_data.get('request_type', None))} || {request_data.get('request_type', None)}\n" \ f"请求内容: {type(request_data.get('payload', None))} || {request_data.get('payload', None)}\n" \ f"请求文件: {type(request_data.get('files', None))} || {request_data.get('files', None)}\n" \ f"后置提取参数: {type(request_data.get('extract', None))} || {request_data.get('extract', None)}\n" \ @@ -58,7 +58,7 @@ class RequestPreDataHandle: f"请求方式: {type(self.request_data.get('method', None))} || {self.request_data.get('method', None)}\n" \ f"请求头: {type(self.request_data.get('headers', None))} || {self.request_data.get('headers', None)}\n" \ f"请求cookies: {type(self.request_data.get('cookies', None))} || {self.request_data.get('cookies', None)}\n" \ - f"请求类型: {type(self.request_data.get('pk', None))} || {self.request_data.get('pk', None)}\n" \ + f"请求类型: {type(self.request_data.get('request_type', None))} || {self.request_data.get('request_type', None)}\n" \ f"请求内容: {type(self.request_data.get('payload', None))} || {self.request_data.get('payload', None)}\n" \ f"请求文件: {type(self.request_data.get('files', None))} || {self.request_data.get('files', None)}\n" \ f"后置提取参数: {type(self.request_data.get('extract', None))} || {self.request_data.get('extract', None)}\n" \ @@ -204,7 +204,7 @@ class RequestHandle: f"请求方式: {type(self.case_data.get('method', None))} || {self.case_data.get('method', None)}\n" \ f"请求头: {type(self.case_data.get('headers', None))} || {self.case_data.get('headers', None)}\n" \ f"请求cookies: {type(self.case_data.get('cookies', None))} || {self.case_data.get('cookies', None)}\n" \ - f"请求类型: {type(self.case_data.get('pk', None))} || {self.case_data.get('pk', None)}\n" \ + f"请求类型: {type(self.case_data.get('request_type', None))} || {self.case_data.get('request_type', None)}\n" \ f"请求内容: {type(self.case_data.get('payload', None))} || {self.case_data.get('payload', None)}\n" \ f"请求文件: {type(self.case_data.get('files', None))} || {self.case_data.get('files', None)}\n" \ f"请求响应数据: {response.text}\n" \ diff --git a/common_utils/base_request.py b/common_utils/base_request.py index 5aca1f1..fae99c5 100644 --- a/common_utils/base_request.py +++ b/common_utils/base_request.py @@ -37,7 +37,7 @@ class BaseRequest: f"请求方式: {req_data.get('method', None)}\n" \ f"请求头: {req_data.get('headers', None)}\n" \ f"请求Cookies: {req_data.get('cookies', None)}\n" \ - f"请求关键字: {req_data.get('pk', None)}\n" \ + f"请求关键字: {req_data.get('request_type', None)}\n" \ f"请求内容: {req_data.get('payload', None)}\n" \ f"请求文件: {req_data.get('files', None)}\n" \ "=====================================================") @@ -48,14 +48,14 @@ class BaseRequest: f"请求方式: {req_data.get('method', None)}\n" \ f"请求头: {req_data.get('headers', None)}\n" \ f"请求Cookies: {req_data.get('cookies', None)}\n" \ - f"请求关键字: {req_data.get('pk', None)}\n" \ + f"请求关键字: {req_data.get('request_type', None)}\n" \ f"请求内容: {req_data.get('payload', None)}\n" \ f"请求文件: {req_data.get('files', None)}\n" \ "=====================================================") res = cls.send_api_request( url=req_data.get("url"), method=req_data.get("method").lower(), - pk=req_data.get("pk", None), + request_type=req_data.get("request_type", None), header=req_data.get("headers", None), payload=req_data.get("payload", None), files=req_data.get("files", None), @@ -79,13 +79,13 @@ class BaseRequest: return res @classmethod - def send_api_request(cls, url: str, method: str, pk: str, header: Dict[str, str] = None, payload=None, + def send_api_request(cls, url: str, method: str, request_type: str, header: Dict[str, str] = None, payload=None, files=None, cookies=None) -> Response: """ 发送请求 :param method: 请求方法 :param url: 请求url - :param pk: 请求参数类型，可选值为params，json，data + :param request_type: 请求参数类型，可选值为params，json，data :param payload: 请求数据，对于不同请求类型，可以为dict，MultipartEncoder等 :param files: 请求上传的文件 :param header: 请求头 @@ -95,9 +95,9 @@ class BaseRequest: headers = header or {} session = cls.get_session() - if pk and pk.lower() == 'params': + if request_type and request_type.lower() == 'params': res = session.request(method=method, url=url, params=payload, headers=headers, cookies=cookies, timeout=5) - elif pk and pk.lower() == 'data': + elif request_type and request_type.lower() == 'data': if files: if not isinstance(files, dict): raise ValueError('data参数必须为dict') @@ -108,7 +108,7 @@ class BaseRequest: else: headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8' res = session.request(method=method, url=url, data=payload, headers=headers, cookies=cookies, timeout=5) - elif pk and pk.lower() == 'json': + elif request_type and request_type.lower() == 'json': if files: if not isinstance(files, dict): raise ValueError('json参数必须为dict') @@ -120,8 +120,8 @@ class BaseRequest: headers['Content-Type'] = 'application/json' res = session.request(method=method, url=url, json=payload, headers=headers, cookies=cookies, timeout=5) else: - logger.error('pk可选关键字为params, json, data') - print('pk可选关键字为params, json, data') - raise ValueError('pk可选关键字为params, json, data') + logger.error('request_type可选关键字为params, json, data') + print('request_type可选关键字为params, json, data') + raise ValueError('request_type可选关键字为params, json, data') return res diff --git a/common_utils/data_handle.py b/common_utils/data_handle.py index 9fd0122..8df11b4 100644 --- a/common_utils/data_handle.py +++ b/common_utils/data_handle.py @@ -26,6 +26,7 @@ def data_replace(content, source): return None logger.debug("\n======================================================\n" \ "-------------Start：数据替换--------------------\n" + f"替换源: {source}\n" \ f"初始字符串: {content}\n" \ "=====================================================") print(f"-----Start-----数据替换: 初始字符串为：{content}") diff --git a/common_utils/func_handle.py b/common_utils/func_handle.py index a5df01e..dbf8257 100644 --- a/common_utils/func_handle.py +++ b/common_utils/func_handle.py @@ -15,4 +15,18 @@ def add_docstring(docstring): func.__doc__ = docstring return func - return decorator \ No newline at end of file + return decorator + + +class AddCLassDocstring: + """ + 类装饰器，它接受一个字符串参数docstring， + 并返回一个装饰器函数。装饰器函数接受一个函数参数func， + 并将func的__doc__属性设置为docstring。 + """ + def __init__(self, docstring): + self.docstring = docstring + + def __call__(self, func): + func.__doc__ = self.docstring + return func \ No newline at end of file diff --git a/config/case_template.txt b/config/case_template.txt index ce0ac4a..f44cb2e 100644 --- a/config/case_template.txt +++ b/config/case_template.txt @@ -1,31 +1,33 @@ +# -*- coding: utf-8 -*- +# @Time : ${now} + import pytest from case_utils.assert_handle import assert_response, assert_sql from loguru import logger from case_utils.request_data_handle import RequestPreDataHandle, RequestHandle, after_request_extract from pytest_html import extras # 往pytest-html报告中填写额外的内容 -from common_utils.func_handle import add_docstring from case_utils.allure_handle import allure_title import allure from config.settings import db_info from config.global_vars import GLOBAL_VARS - # 用例数据 cases = ${case_data} -@allure.story(f'{cases["case_common"]["allure_story"]}') -@pytest.mark.${func_title} -@pytest.mark.auto -@pytest.mark.parametrize("case", cases.get("case_info")) -def ${func_title}_auto(case, extra): - logger.info("-----------------------------START-开始执行用例-----------------------------") - logger.debug(f"当前执行的用例数据:{case}") - # 给当前测试方法添加文档注释 - add_docstring(case.get("title", ""))(${func_title}_auto) - # 添加用例标题作为allure中显示的用例标题 - allure_title(case.get("title", "")) - if case.get("run", None): +@allure.epic("${allure_epic}") +@allure.feature("${allure_feature}") +class ${class_title}Auto: + + @allure.story("${allure_story}") + @pytest.mark.${func_title} + @pytest.mark.auto + @pytest.mark.parametrize("case", cases, ids=["{}".format(case["title"]) for case in cases]) + def ${func_title}_auto(self, case, extra): + logger.info("-----------------------------START-开始执行用例-----------------------------") + logger.debug(f"当前执行的用例数据:{case}") + # 添加用例标题作为allure中显示的用例标题 + allure_title(case.get("title", "")) # 处理请求前的用例数据 case_data = RequestPreDataHandle(case).request_data_handle() # 将用例数据显示在pytest-html报告中 @@ -40,9 +42,5 @@ def ${func_title}_auto(case, extra): assert_sql(db_info[GLOBAL_VARS["env_key"]], case_data["assert_sql"]) # 断言成功后进行参数提取 after_request_extract(response, case_data.get("extract", None)) - else: - reason = f"标记了该用例为false，不执行\\n" - logger.warning(f"{reason}") - pytest.skip(reason) - logger.info("-----------------------------END-用例执行结束-----------------------------") + logger.info("-----------------------------END-用例执行结束-----------------------------") diff --git a/config/models.py b/config/models.py index 7a6661c..a73ab73 100644 --- a/config/models.py +++ b/config/models.py @@ -7,6 +7,8 @@ # @Desc: 全局变量 from enum import Enum, unique # python 3.x版本才能使用 +from typing import Text, Dict, Callable, Union, Optional, List, Any +from pydantic import BaseModel class CaseFileType(Enum): @@ -55,3 +57,57 @@ class AllureAttachmentType(Enum): WEBM = "webm" PDF = "pdf" + + +class TestCaseEnum(Enum): + FEATURE = ("feature", False) + TITLE = ("title", True) + URL = ("url", True) + METHOD = ("method", True) + HEADERS = ("headers", True) + COOKIES = ("cookies", False) + RUN = ("run", False) + REQUEST_TYPE = ("request_type", True) + PAYLOAD = ("payload", False) + FILES = ("files", False) + EXTRACT = ("extract", False) + ASSERT_RESPONSE = ("assert_response", True) + ASSERT_SQL = ("assert_sql", False) + + +class TestCase(BaseModel): + feature: Union[None, Text] = None + title: Text + url: Text + method: Text + headers: Union[None, Dict, Text] = {} + cookies: Union[None, Dict, Text] + request_type: Text + run: Union[None, bool, Text] = None + payload: Any = None + files: Any = None + extract: Union[None, Dict, Text] = None + assert_response: Union[None, Dict, Text] + assert_sql: Union[None, Dict, Text] = None + + +class Method(Enum): + GET = "GET" + POST = "POST" + PUT = "PUT" + PATCH = "PATCH" + DELETE = "DELETE" + HEAD = "HEAD" + OPTION = "OPTION" + + +class RequestType(Enum): + """ + request请求发送，请求参数的数据类型 + """ + JSON = "JSON" + PARAMS = "PARAMS" + DATA = "DATA" + FILE = 'FILE' + EXPORT = "EXPORT" + NONE = "NONE" diff --git a/config/settings.py b/config/settings.py index 755e85a..21d0add 100644 --- a/config/settings.py +++ b/config/settings.py @@ -8,7 +8,7 @@ # ------------------------------------ 配置信息 ----------------------------------------------------# # 0代表执行Excel和yaml两种格式的用例， 1 代表 yaml文件，2 用例代表Excel用例 -CASE_FILE_TYPE = 1 +CASE_FILE_TYPE = 0 # 0表示默认不发送任何通知， 1代表钉钉通知，2代表企业微信通知， 3代表邮件通知， 4代表所有途径都发送通知 SEND_RESULT_TYPE = 0 diff --git a/conftest.py b/conftest.py index 3d3b174..716e238 100644 --- a/conftest.py +++ b/conftest.py @@ -11,16 +11,10 @@ from config.global_vars import ENV_VARS, GLOBAL_VARS import pytest from py._xmlgen import html # 安装pytest-html，版本最好是2.1.1 from time import strftime +import re # ------------------------------------- START: 报告处理 ---------------------------------------# -def pytest_collection_modifyitems(items): - """# 测试用例执行收集完成时，将收集到的item的name和nodeid的中文显示在控制台上""" - for item in items: - item.name = item.name.encode("utf-8").decode("unicode-escape") - item._nodeid = item._nodeid.encode("utf-8").decode("unicode_escape") - - @pytest.mark.hookwrapper def pytest_runtest_makereport(item, call): """设置列"用例描述"的值为用例的标题title""" @@ -28,9 +22,10 @@ def pytest_runtest_makereport(item, call): # 获取调用结果的测试报告，返回一个report对象 # report对象的属性包括when（steup, call, teardown三个值）、nodeid(测试用例的名字)、outcome(用例的执行结果，passed,failed) report = outcome.get_result() - # 将测试方法的文档注释作为结果表的Description的值，如果文档注释为空，则测试方法名作为结果表的Description的值 - report.description = str(item.function.__doc__) - report.nodeid = report.nodeid.encode("utf-8").decode("unicode_escape") + # 将测试用例的title作为测试报告"用例描述"列的值。 + # 注意参数传递时需要这样写：@pytest.mark.parametrize("case", cases, ids=["{}".format(case["title"]) for case in cases]) + report.description = re.findall('\[(.*?)\]', report.nodeid)[0] + report.func = report.nodeid.split("[")[0] def pytest_html_report_title(report): @@ -73,10 +68,13 @@ def pytest_html_results_table_header(cells): """ 修改结果表的表头 """ + cells.pop(1) # 移除 "Test" 列 # 往表格中增加一列"用例描述"，并且给"用例描述"增加排序 cells.insert(0, html.th('用例描述', class_="sortable", col="name")) + # 往表格中增加一列"用例方法"，并且给"用例方法"增加排序 + cells.insert(1, html.th('用例方法', class_="sortable", col="name")) # 往表格中增加一列"执行时间"，并且给"执行时间"增加排序 - cells.insert(1, html.th('执行时间', class_="sortable time", col="time")) + cells.insert(2, html.th('执行时间', class_="sortable time", col="time")) @pytest.mark.optionalhook @@ -84,10 +82,13 @@ def pytest_html_results_table_row(report, cells): """ 修改结果表的表头后给对应的行增加值 """ + cells.pop(1) # 移除 "Test" 列 # 往列"用例描述"插入每行的值 cells.insert(0, html.td(report.description)) + # 往列"用例方法"插入每行的值 + cells.insert(1, html.td(report.func)) # 往列"执行时间"插入每行的值 - cells.insert(1, html.td(strftime("%Y-%m-%d %H:%M:%S"), class_="col-time")) + cells.insert(2, html.td(strftime("%Y-%m-%d %H:%M:%S"), class_="col-time")) def pytest_html_results_table_html(report, data): diff --git a/data/test_login_demo.yaml b/data/login_demo.yaml similarity index 84% rename from data/test_login_demo.yaml rename to data/login_demo.yaml index 35c9a20..66c7a08 100644 --- a/data/test_login_demo.yaml +++ b/data/login_demo.yaml @@ -1,24 +1,24 @@ # 公共参数 case_common: - allure_epic: GitLink接口 # 敏捷里面的概念，定义史诗，相当于module级的标签, 往下是 feature + allure_epic: GitLink接口（手动编写用例） # 敏捷里面的概念，定义史诗，相当于module级的标签, 往下是 feature allure_feature: 登录模块 # 功能点的描述，相当于class级的标签, 理解成模块往下是 story allure_story: 登录接口 # 故事，可以理解为场景，相当于method级的标签, 往下是 title # 用例数据 -case_info: -- feature: 登录 +case_login_demo_01: + feature: 登录 title: 用户名密码正确，登录成功(不校验数据库) + run: True url: /api/accounts/login.json method: POST headers: {"Content-Type": "application/json; charset=utf-8;"} cookies: - pk: json + request_type: json payload: { "login": "${login}","password": "${password}","autologin": 1 } files: extract: nickname: $.username login: $.login user_id: $.user_id - run: False assert_response: eq: http_code: 200 @@ -32,20 +32,22 @@ case_info: not: $.user_id: 85390 assert_sql: -- feature: 登录 + +case_login_demo_02: + feature: 登录 title: 用户名密码正确，登录成功（校验数据库） + run: False url: /api/accounts/login.json method: POST headers: {"Content-Type": "application/json; charset=utf-8;"} cookies: - pk: json + request_type: json payload: { "login": "${login}","password": "${password}","autologin": 1 } files: extract: nickname: $.username login: $.login user_id: $.user_id - run: False assert_response: eq: http_code: 200 @@ -62,19 +64,20 @@ case_info: eq: sql: select count(*) from tokens where user_id=${user_id}; len: 1 -- feature: 登录 +case_login_demo_03: + feature: 登录 title: 用户名正确，密码错误，登录失败 + run: False url: /api/accounts/login.json method: POST headers: {"Content-Type": "application/json; charset=utf-8;"} cookies: - pk: json + request_type: json payload: { "login": "chytest10","password": "password111","autologin": 1 } files: extract: - run: False assert_response: eq: http_code: 200 $.status: -2 - assert_sql: \ No newline at end of file + assert_sql: diff --git a/data/test_gitlink_demo.xlsx b/data/test_gitlink_demo.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2c98df4eb97848efd3e72863655b689178023457 GIT binary patch literal 11778 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 diff --git a/data/test_new_project_demo.yaml b/data/test_new_project_demo.yaml index ccc6184..8266515 100644 --- a/data/test_new_project_demo.yaml +++ b/data/test_new_project_demo.yaml @@ -1,19 +1,21 @@ # 公共参数 case_common: - allure_epic: GitLink接口 # 敏捷里面的概念，定义史诗，相当于module级的标签, 往下是 feature + allure_epic: GitLink接口（自动生成用例） # 敏捷里面的概念，定义史诗，相当于module级的标签, 往下是 feature allure_feature: 开源项目模块 # 功能点的描述，相当于class级的标签, 理解成模块往下是 story allure_story: 新建项目接口 # 故事，可以理解为场景，相当于method级的标签, 往下是 title + # 用例数据 -case_info: -- feature: 新建项目 +case_new_project_demo_01: + feature: 新建项目 title: 正确输入各项必填参数，新建项目成功（不校验数据库, header里面传cookies） + run: True url: /api/projects.json method: POST headers: Content-Type: application/json; charset=utf-8; cookies: ${login_cookie} cookies: - pk: json + request_type: json payload: "user_id": ${user_id} "name": ${faker.name().replace(" ", "").replace(".", "")} @@ -23,20 +25,22 @@ case_info: project_id: $.id project_name: $.name project_identifier: $.identifier - run: True assert_response: eq: http_code: 200 $.login: ${login} assert_sql: -- feature: 新建项目 + +case_new_project_demo_02: + feature: 新建项目 title: 正确输入各项必填参数，新建项目成功（不校验数据库，单独传cookies） + run: True url: /api/projects.json method: POST headers: Content-Type: application/json; charset=utf-8; cookies: ${login_cookie} - pk: json + request_type: json payload: "user_id": ${user_id} "name": ${faker.name().replace(" ", "").replace(".", "")} @@ -46,19 +50,21 @@ case_info: project_id: $.id project_name: $.name project_identifier: $.identifier - run: True assert_response: eq: http_code: 200 $.login: ${login} assert_sql: -- feature: 新建项目 + +case_new_project_demo_03: + feature: 新建项目 title: 正确输入各项必填参数，新建项目成功（校验数据库） + run: False url: /api/projects.json method: POST headers: {"Content-Type": "application/json; charset=utf-8;"} cookies: - pk: json + request_type: json payload: "user_id": ${user_id} "name": ${faker.name().replace(" ", "").replace(".", "")} @@ -68,14 +74,13 @@ case_info: project_id: $.id project_name: $.name project_identifier: $.identifier - run: False assert_response: eq: http_code: 200 $.login: ${login} assert_sql: eq: - sql: select id, `name`, identifier from projects where user_id=${user_id} ORDER BY created_on DESC; + sql: select id,`name`, identifier from projects where user_id=${user_id} ORDER BY created_on DESC; $.id: ${project_id} $.name: ${project_name} $.identifier: ${project_identifier} \ No newline at end of file diff --git a/pytest.ini b/pytest.ini index c58b57d..b2b6fd0 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,7 +4,8 @@ addopts = -s --cache-clear --capture=sys --self-contained-html --reruns=0 --reru disable_test_id_escaping_and_forfeit_all_rights_to_community_support = True markers = test_login_demo: login - test_login_excel_demo: login excel + test_gitlink_demo_dlmkexcel: login excel + test_gitlink_demo_xjxmmkexcel: new project excel test_new_project_demo: new_project - test_softbot: softbot - auto: auto generate case \ No newline at end of file + auto: auto generate case + test_demo: demo case \ No newline at end of file diff --git a/run.py b/run.py index 1f6a5b7..c69b0a9 100644 --- a/run.py +++ b/run.py @@ -20,7 +20,7 @@ import shutil import pytest from config.path_config import REPORT_DIR, LOG_DIR, AUTO_CASE_DIR, CONF_DIR, LIB_DIR, ALLURE_RESULTS_DIR, \ ALLURE_HTML_DIR -from case_utils.case_handle import get_case_data +from case_utils.case_fun_handle import generate_cases from loguru import logger import click from config.settings import LOG_LEVEL @@ -55,6 +55,11 @@ def run(env, m, report): |_| Starting ... ... ... """) + # ------------------------ 设置全局变量 ------------------------ + # 根据指定的环境参数，将运行环境所需相关配置数据保存到GLOBAL_VARS + GLOBAL_VARS["env_key"] = env.lower() + for k, v in ENV_VARS[env.lower()].items(): + GLOBAL_VARS[k] = v # ------------------------ 自动生成测试用例 ------------------------ # 删除原有的测试用例，以便生成新的测试用例 if os.path.exists(AUTO_CASE_DIR): @@ -62,7 +67,7 @@ def run(env, m, report): shutil.rmtree(AUTO_CASE_DIR) # 根据data里面的yaml/excel文件，自动生成测试用例 - get_case_data() + generate_cases() # ------------------------ pytest执行测试用例 ------------------------ """ @@ -80,10 +85,6 @@ def run(env, m, report): "--reruns=3", "--reruns-delay=2" """ arg_list = [] - # 根据指定的环境参数，将运行环境所需相关配置数据保存到GLOBAL_VARS - GLOBAL_VARS["env_key"] = env.lower() - for k, v in ENV_VARS[env.lower()].items(): - GLOBAL_VARS[k] = v # 执行指定测试用例 if m is not None: arg_list.append(f"-m {m}") diff --git a/test_case/conftest.py b/test_case/conftest.py index 05c9194..043930b 100644 --- a/test_case/conftest.py +++ b/test_case/conftest.py @@ -13,6 +13,18 @@ from loguru import logger from common_utils.base_request import BaseRequest +@pytest.fixture(scope="function", autouse=True) +def case_skip(request): + """处理跳过用例""" + # 使用 request.getfixturevalue() 方法来获取测试用例函数的参数值 + # 注意这里的"case"需要与@pytest.mark.parametrize("case", cases)中传递的保持一致 + case = request.getfixturevalue("case") + if case.get("run") is None or case.get("run") is False: + reason = f"{case.get('title')}: 标记了该用例为false，不执行\\n" + logger.warning(f"{reason}") + pytest.skip(reason) + + @pytest.fixture(scope="session", autouse=True) def login_init(): """ @@ -28,7 +40,7 @@ def login_init(): req_data = { "url": host + "/api/accounts/login.json", "method": "POST", - "pk": "json", + "request_type": "json", "headers": {"Content-Type": "application/json; charset=utf-8;"}, "payload": {"login": login, "password": password, "autologin": 1} } diff --git a/test_case/test_manual_case/test_demo.py b/test_case/test_manual_case/test_demo.py index 487091b..6d405c8 100644 --- a/test_case/test_manual_case/test_demo.py +++ b/test_case/test_manual_case/test_demo.py @@ -10,33 +10,25 @@ import pytest from loguru import logger from pytest_html import extras # 往pytest-html报告中填写额外的内容 -from common_utils.func_handle import add_docstring import allure from case_utils.allure_handle import allure_title, allure_step # 读取用例数据 -cases = [{"title": "demo case 01", "user": "flora1", "age": 17, "run": False}, - {"title": "demo case 02", "user": "lucy", "age": 17, "run": False}] +cases = [{"title": "demo用例01", "user": "flora", "age": 17, "run": True}, + {"title": "demo用例02", "user": "lucy", "age": 17, "run": False}] -@allure.story("demo模块") -@pytest.mark.test_login_demo -@pytest.mark.parametrize("case", cases) +@allure.story("demo模块(手动用例)") +@pytest.mark.test_demo +@pytest.mark.parametrize("case", cases, ids=["{}".format(case["title"]) for case in cases]) def test_demo(case, extra): logger.info("-----------------------------START-开始执行用例-----------------------------") logger.debug(f"当前执行的用例数据:{case}") - # 给当前测试方法添加文档注释 - add_docstring(case.get("title", ""))(test_demo) # 添加用例标题作为allure中显示的用例标题 allure_title(case.get("title", "")) - if case.get("run", None): - # 将用例数据显示在pytest-html报告中 - extra.append(extras.json(case, name="用例数据")) - # 在allure报告中显示请求的用例数据 - allure_step(step_title="用例数据", content=f"{case}") - assert case["user"] == "flora" - else: - reason = f"标记了该用例为false，不执行\\n" - logger.warning(f"{reason}") - pytest.skip(reason) + # 将用例数据显示在pytest-html报告中 + extra.append(extras.json(case, name="用例数据")) + # 在allure报告中显示请求的用例数据 + allure_step(step_title="用例数据", content=f"{case}") + assert case["user"] == "flora" logger.info("-----------------------------END-用例执行结束-----------------------------") diff --git a/test_case/test_manual_case/test_login_demo.py b/test_case/test_manual_case/test_login_demo.py index 47b2c1d..0a0235c 100644 --- a/test_case/test_manual_case/test_login_demo.py +++ b/test_case/test_manual_case/test_login_demo.py @@ -15,27 +15,33 @@ from case_utils.assert_handle import assert_response, assert_sql from loguru import logger from case_utils.request_data_handle import RequestPreDataHandle, RequestHandle, after_request_extract from pytest_html import extras # 往pytest-html报告中填写额外的内容 -from common_utils.func_handle import add_docstring from case_utils.allure_handle import allure_title import allure from config.settings import db_info from config.global_vars import GLOBAL_VARS # 读取用例数据 -cases = YamlHandle(filename=os.path.join(DATA_DIR, "test_login_demo.yaml")).read_yaml +yaml_data = YamlHandle(filename=os.path.join(DATA_DIR, "login_demo.yaml")).read_yaml +case_common = yaml_data["case_common"] +cases = [] +for k, v in yaml_data.items(): + if k != "case_common": + cases.append(v) -@allure.story(f'{cases["case_common"]["allure_story"]}') -@pytest.mark.test_login_demo -@pytest.mark.parametrize("case", cases.get("case_info")) -def test_login_demo(case, extra): - logger.info("-----------------------------START-开始执行用例-----------------------------") - logger.debug(f"当前执行的用例数据:{case}") - # 给当前测试方法添加文档注释 - add_docstring(case.get("title", ""))(test_login_demo) - # 添加用例标题作为allure中显示的用例标题 - allure_title(case.get("title", "")) - if case.get("run", None): +@allure.epic(case_common["allure_epic"]) +@allure.feature(case_common["allure_feature"]) +class TestLoginDemo: + + @allure.story(case_common["allure_story"]) + @pytest.mark.test_login_demo + @pytest.mark.auto + @pytest.mark.parametrize("case", cases, ids=["{}".format(case["title"]) for case in cases]) + def test_login_demo_auto(self, case, extra): + logger.info("-----------------------------START-开始执行用例-----------------------------") + logger.debug(f"当前执行的用例数据:{case}") + # 添加用例标题作为allure中显示的用例标题 + allure_title(case.get("title", "")) # 处理请求前的用例数据 case_data = RequestPreDataHandle(case).request_data_handle() # 将用例数据显示在pytest-html报告中 @@ -50,8 +56,4 @@ def test_login_demo(case, extra): assert_sql(db_info[GLOBAL_VARS["env_key"]], case_data["assert_sql"]) # 断言成功后进行参数提取 after_request_extract(response, case_data.get("extract", None)) - else: - reason = f"标记了该用例为false，不执行\\n" - logger.warning(f"{reason}") - pytest.skip(reason) - logger.info("-----------------------------END-用例执行结束-----------------------------") + logger.info("-----------------------------END-用例执行结束-----------------------------")