Commit 793e49d4 by huangchengcheng

Merge remote-tracking branch 'origin/master' into master

parents d7c45529 04ca54e0
...@@ -70,7 +70,7 @@ class TestDrivingLicense(): ...@@ -70,7 +70,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("获取驾驶证图片状态") @allure.story("获取驾驶证图片状态")
...@@ -86,7 +86,7 @@ class TestDrivingLicense(): ...@@ -86,7 +86,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.usefixtures("imaAuditStatus") @pytest.mark.usefixtures("imaAuditStatus")
...@@ -103,7 +103,7 @@ class TestDrivingLicense(): ...@@ -103,7 +103,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("图像上传页文案") @allure.story("图像上传页文案")
...@@ -119,10 +119,10 @@ class TestDrivingLicense(): ...@@ -119,10 +119,10 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.tttt
@pytest.mark.usefixtures("avatarUpdate_del") @pytest.mark.usefixtures("avatarUpdate_del")
@allure.story("修改驾驶证头像") @allure.story("修改驾驶证头像")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/22750") @allure.link("http://yapi.hikcreate.com/project/32/interface/api/22750")
...@@ -137,7 +137,7 @@ class TestDrivingLicense(): ...@@ -137,7 +137,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -154,7 +154,7 @@ class TestDrivingLicense(): ...@@ -154,7 +154,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("驾驶证图片接口") @allure.story("驾驶证图片接口")
...@@ -171,6 +171,7 @@ class TestDrivingLicense(): ...@@ -171,6 +171,7 @@ class TestDrivingLicense():
"""请求""" """请求"""
res = requests.get(url,params=req_data,headers=headers) res = requests.get(url,params=req_data,headers=headers)
"""断言,此接口响应和其他不通,暂未做断言""" """断言,此接口响应和其他不通,暂未做断言"""
allure.attach("{0}".format(res), "用例结果")
# assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
...@@ -187,9 +188,9 @@ class TestDrivingLicense(): ...@@ -187,9 +188,9 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
return res['data']['list'][0]['vehicleId']
@pytest.mark.run(order=664) # 建议放在 绑定用例之后 @pytest.mark.run(order=664) # 建议放在 绑定用例之后
...@@ -214,7 +215,7 @@ class TestDrivingLicense(): ...@@ -214,7 +215,7 @@ class TestDrivingLicense():
"""请求""" """请求"""
res = request_main(url, headers, method, req_data,has_token=True) res = request_main(url, headers, method, req_data,has_token=True)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
"""把其他某个用例做为初始化,这种方式还需讨论,暂时不行""" """把其他某个用例做为初始化,这种方式还需讨论,暂时不行"""
...@@ -256,7 +257,7 @@ class TestDrivingLicense(): ...@@ -256,7 +257,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.run(order=662) @pytest.mark.run(order=662)
...@@ -273,7 +274,7 @@ class TestDrivingLicense(): ...@@ -273,7 +274,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.run(order=663) @pytest.mark.run(order=663)
...@@ -297,7 +298,7 @@ class TestDrivingLicense(): ...@@ -297,7 +298,7 @@ class TestDrivingLicense():
pass pass
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.run(order=665) # 需要在绑定用例之后 @pytest.mark.run(order=665) # 需要在绑定用例之后
...@@ -317,11 +318,12 @@ class TestDrivingLicense(): ...@@ -317,11 +318,12 @@ class TestDrivingLicense():
req_data["vehicleId"] = get_vehickleId_Tounbind req_data["vehicleId"] = get_vehickleId_Tounbind
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("机动车详情") @allure.story("机动车详情")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/1880") @allure.link("http://yapi.hikcreate.com/project/32/interface/api/1880")
@allure.description("/vehicle/bind/detail") @allure.description("/vehicle/bind/detail")
...@@ -335,7 +337,7 @@ class TestDrivingLicense(): ...@@ -335,7 +337,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -352,7 +354,7 @@ class TestDrivingLicense(): ...@@ -352,7 +354,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -369,7 +371,7 @@ class TestDrivingLicense(): ...@@ -369,7 +371,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -386,7 +388,7 @@ class TestDrivingLicense(): ...@@ -386,7 +388,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -403,7 +405,7 @@ class TestDrivingLicense(): ...@@ -403,7 +405,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -420,7 +422,7 @@ class TestDrivingLicense(): ...@@ -420,7 +422,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("添加商业保险") @allure.story("添加商业保险")
...@@ -436,7 +438,7 @@ class TestDrivingLicense(): ...@@ -436,7 +438,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("关联查询强制险信息") @allure.story("关联查询强制险信息")
...@@ -452,7 +454,7 @@ class TestDrivingLicense(): ...@@ -452,7 +454,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("获取商业险枚举") @allure.story("获取商业险枚举")
...@@ -468,10 +470,10 @@ class TestDrivingLicense(): ...@@ -468,10 +470,10 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.mark.scoreDetail
@allure.story("车辆选择列表") @allure.story("车辆选择列表")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/11066") @allure.link("http://yapi.hikcreate.com/project/32/interface/api/11066")
@allure.description("/vehicle/selection/list") @allure.description("/vehicle/selection/list")
...@@ -485,7 +487,7 @@ class TestDrivingLicense(): ...@@ -485,7 +487,7 @@ class TestDrivingLicense():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach( "{0}".format(res),"用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
......
...@@ -46,13 +46,14 @@ class TestCreditRight(): ...@@ -46,13 +46,14 @@ class TestCreditRight():
if inData['frontInterface'] == "未激活": if inData['frontInterface'] == "未激活":
res = request_main(url, self.noActiveheaders, method, req_data,has_token=True) res = request_main(url, self.noActiveheaders, method, req_data,has_token=True)
allure.attach("{0}".format(res), "未激活用例结果1")
assert res['data']['creditInfo']['creditLevelName'] ==otherExpectData['data']['creditInfo']['creditLevelName'] assert res['data']['creditInfo']['creditLevelName'] ==otherExpectData['data']['creditInfo']['creditLevelName']
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
else: else:
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果2")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("信用权益主页") @allure.story("信用权益主页")
...@@ -69,12 +70,12 @@ class TestCreditRight(): ...@@ -69,12 +70,12 @@ class TestCreditRight():
if inData['frontInterface'] == "未激活": if inData['frontInterface'] == "未激活":
"""请求""" """请求"""
res = request_main(url, self.noActiveheaders, method, req_data, has_token=True) res = request_main(url, self.noActiveheaders, method, req_data, has_token=True)
"""断言""" allure.attach("{0}".format(res), "用例结果1")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
else: else:
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果2")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
...@@ -92,7 +93,7 @@ class TestCreditRight(): ...@@ -92,7 +93,7 @@ class TestCreditRight():
if inData['frontInterface'] == "未激活": if inData['frontInterface'] == "未激活":
"""请求""" """请求"""
res = request_main(url, self.noActiveheaders, method, req_data, has_token=True) res = request_main(url, self.noActiveheaders, method, req_data, has_token=True)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
else: else:
"""请求""" """请求"""
...@@ -114,12 +115,12 @@ class TestCreditRight(): ...@@ -114,12 +115,12 @@ class TestCreditRight():
if inData['frontInterface'] == "未激活": if inData['frontInterface'] == "未激活":
"""请求""" """请求"""
res = request_main(url, self.noActiveheaders, method, req_data, has_token=True) res = request_main(url, self.noActiveheaders, method, req_data, has_token=True)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
else: else:
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("所有信用权益") @allure.story("所有信用权益")
...@@ -135,7 +136,7 @@ class TestCreditRight(): ...@@ -135,7 +136,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("预约通行") @allure.story("预约通行")
...@@ -151,7 +152,7 @@ class TestCreditRight(): ...@@ -151,7 +152,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("预约通行") @allure.story("预约通行")
...@@ -167,7 +168,7 @@ class TestCreditRight(): ...@@ -167,7 +168,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("预约通行") @allure.story("预约通行")
...@@ -183,7 +184,7 @@ class TestCreditRight(): ...@@ -183,7 +184,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("预约通行") @allure.story("预约通行")
...@@ -199,7 +200,7 @@ class TestCreditRight(): ...@@ -199,7 +200,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("信用优享日") @allure.story("信用优享日")
...@@ -215,7 +216,7 @@ class TestCreditRight(): ...@@ -215,7 +216,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("拜尔口腔") @allure.story("拜尔口腔")
...@@ -231,7 +232,7 @@ class TestCreditRight(): ...@@ -231,7 +232,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("拜尔口腔") @allure.story("拜尔口腔")
...@@ -247,7 +248,7 @@ class TestCreditRight(): ...@@ -247,7 +248,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("拜尔口腔") @allure.story("拜尔口腔")
...@@ -263,7 +264,7 @@ class TestCreditRight(): ...@@ -263,7 +264,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("车辆评估") @allure.story("车辆评估")
...@@ -279,7 +280,7 @@ class TestCreditRight(): ...@@ -279,7 +280,7 @@ class TestCreditRight():
headers = inData['headers'] headers = inData['headers']
"""请求""" """请求"""
res = request_main(url, headers, method, req_data) res = request_main(url, headers, method, req_data)
"""断言""" allure.attach("{0}".format(res), "用例结果")
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
......
...@@ -12,213 +12,213 @@ from config import BMCConfig ...@@ -12,213 +12,213 @@ from config import BMCConfig
class TestIntegral(): class TestIntegral():
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_integral_20210513.xlsx') workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_integral_20210513.xlsx')
# @allure.story("查询我的积分") @allure.story("查询我的积分")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55860") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55860")
# @allure.description("/integral/center/myIntegral") @allure.description("/integral/center/myIntegral")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'myIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'myIntegral'))
# def test_my_integral(self,inData): def test_my_integral(self,inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("查询我的签到情况") @allure.story("查询我的签到情况")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55869") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55869")
# @allure.description("/integral/center/sign") @allure.description("/integral/center/sign")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'getsignIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'getsignIntegral'))
# def test_get_sign_integral(self, inData): def test_get_sign_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
# return res['data']['canSignInToday'] return res['data']['canSignInToday']
#
# @pytest.fixture() @pytest.fixture()
# def test_pre_get_sign_integral(self): def test_pre_get_sign_integral(self):
# """签到前置用例""" """签到前置用例"""
# url = f"{BMCConfig().host}/integral/center/sign" url = f"{BMCConfig().host}/integral/center/sign"
# method = 'get' method = 'get'
# req_data = None req_data = None
# headers = None headers = None
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# return res['data']['canSignInToday'] return res['data']['canSignInToday']
#
# @allure.story("签到") @allure.story("签到")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55878") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55878")
# @allure.description("/integral/center/sign") @allure.description("/integral/center/sign")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.usefixtures('test_pre_get_sign_integral') @pytest.mark.usefixtures('test_pre_get_sign_integral')
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'postSignIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'postSignIntegral'))
# def test_post_sign_integral(self, inData, test_pre_get_sign_integral): def test_post_sign_integral(self, inData, test_pre_get_sign_integral):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# other_expected_data = inData['otherExpectData'] other_expected_data = inData['otherExpectData']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# if not test_pre_get_sign_integral: # 已经签到过 if not test_pre_get_sign_integral: # 已经签到过
# assert res['code'] == other_expected_data['code'] assert res['code'] == other_expected_data['code']
# else: else:
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("查询待领取积分清单") @allure.story("查询待领取积分清单")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55887") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55887")
# @allure.description("/integral/center/recommendedTasks") @allure.description("/integral/center/recommendedTasks")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'taskIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'taskIntegral'))
# def test_task_integral(self, inData): def test_task_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("查询积分商品") @allure.story("查询积分商品")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/57138") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/57138")
# @allure.description("/integral/center/integralGoods") @allure.description("/integral/center/integralGoods")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'goodsIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'goodsIntegral'))
# def test_goods_integral(self, inData): def test_goods_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("查询积分规则") @allure.story("查询积分规则")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/64302") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/64302")
# @allure.description("/integral/center/rule") @allure.description("/integral/center/rule")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'ruleIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'ruleIntegral'))
# def test_rule_integral(self, inData): def test_rule_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("设置签到提醒开关") @allure.story("设置签到提醒开关")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56418") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56418")
# @allure.description("/integral/center/sign/warnSwitch") @allure.description("/integral/center/sign/warnSwitch")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'switchIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'switchIntegral'))
# def test_switch_integral(self, inData): def test_switch_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("任务中心主页") @allure.story("任务中心主页")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56427") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56427")
# @allure.description("/integral/task/info") @allure.description("/integral/task/info")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'infoIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'infoIntegral'))
# def test_info_integral(self, inData): def test_info_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @pytest.fixture() @pytest.fixture()
# def test_pre_task_integral(self): def test_pre_task_integral(self):
# """查询待领取积分清单""" """查询待领取积分清单"""
# url = f"{BMCConfig().host}/integral/center/recommendedTasks" url = f"{BMCConfig().host}/integral/center/recommendedTasks"
# method = 'get' method = 'get'
# req_data = None req_data = None
# headers = None headers = None
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# return res['data']['list'] return res['data']['list']
#
# @allure.story("领取积分") @allure.story("领取积分")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56436") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56436")
# @allure.description("/integral/task/receive") @allure.description("/integral/task/receive")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.usefixtures('test_pre_task_integral') @pytest.mark.usefixtures('test_pre_task_integral')
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'receiveIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'receiveIntegral'))
# def test_receive_integral(self, inData, test_pre_task_integral): def test_receive_integral(self, inData, test_pre_task_integral):
# case_num = inData['caseNum'] case_num = inData['caseNum']
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# for task in test_pre_task_integral: for task in test_pre_task_integral:
# if task['status'] == 2 and case_num == 'receiveIntegral001': # 2表示可领取 if task['status'] == 2 and case_num == 'receiveIntegral001': # 2表示可领取
# req_data['taskCode'] = task['taskCode'] req_data['taskCode'] = task['taskCode']
# break break
# elif task['status'] != 2 and case_num == 'receiveIntegral001': elif task['status'] != 2 and case_num == 'receiveIntegral001':
# expectData['code'] = 1006 expectData['code'] = 1006
# break break
# elif task['status'] != 2 and case_num == 'receiveIntegral002': elif task['status'] != 2 and case_num == 'receiveIntegral002':
# req_data['taskCode'] = task['taskCode'] req_data['taskCode'] = task['taskCode']
# break break
# else: else:
# break break
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("获取关注信息") @allure.story("获取关注信息")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56841") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56841")
# @allure.description("/integral/task/getFollowInfo") @allure.description("/integral/task/getFollowInfo")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'FollowInfoIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'FollowInfoIntegral'))
# def test_follow_info_integral(self, inData): def test_follow_info_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("商城中的商品") @allure.story("商城中的商品")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55896") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/55896")
# @allure.description("/integral/mall/goods/list") @allure.description("/integral/mall/goods/list")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'listIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'listIntegral'))
# def test_list_integral(self, inData): def test_list_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("商品的详情") @allure.story("商品的详情")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56076") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56076")
# @allure.description("/integral/mall/goods/detail") @allure.description("/integral/mall/goods/detail")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'detailIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'detailIntegral'))
# def test_detail_integral(self, inData): def test_detail_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@pytest.fixture() @pytest.fixture()
def test_pre_list_integral(self): def test_pre_list_integral(self):
...@@ -242,69 +242,77 @@ class TestIntegral(): ...@@ -242,69 +242,77 @@ class TestIntegral():
expectData = inData['expectData'] expectData = inData['expectData']
headers = inData['headers'] headers = inData['headers']
case_num = inData['caseNum'] case_num = inData['caseNum']
if case_num == 'exchangeIntegral001': count = 0
for good in test_pre_list_integral['list']:
for good in test_pre_list_integral['list']:
if case_num != 'exchangeIntegral002' and case_num != 'exchangeIntegral003':
if good['status'] == 1: if good['status'] == 1:
req_data['id'] = good['id'] req_data['id'] = good['id']
count += 1
break break
if count == 0:
if case_num == 'exchangeIntegral002': # 说明没有可兑换的商品
expectData['code'] = 1005
else:
expectData['code'] = 1006
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
# @allure.story("查询商品的适用门店列表") @allure.story("查询商品的适用门店列表")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56094") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56094")
# @allure.description("/integral/mall/goods/applicableStores") @allure.description("/integral/mall/goods/applicableStores")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'applicableStoresIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'applicableStoresIntegral'))
# def test_applicable_stores_integral(self, inData): def test_applicable_stores_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
# @allure.story("查询兑换记录") @allure.story("查询兑换记录")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56103") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/56103")
# @allure.description("/integral/mall/exchangeRecord/list") @allure.description("/integral/mall/exchangeRecord/list")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'exchangeRecordListIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'exchangeRecordListIntegral'))
# def test_exchange_record_list_integral(self, inData): def test_exchange_record_list_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("查询兑换记录详情") @allure.story("查询兑换记录详情")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/57354") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/57354")
# @allure.description("/integral/mall/exchangeRecord/detail") @allure.description("/integral/mall/exchangeRecord/detail")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'exchangeRecordDetailIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'exchangeRecordDetailIntegral'))
# def test_exchange_record_detail_integral(self, inData): def test_exchange_record_detail_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
#
# @allure.story("关注成功回调") @allure.story("关注成功回调")
# @allure.link("http://yapi.hikcreate.com/project/31/interface/api/61233") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/61233")
# @allure.description("/integral/task/focusSuccess") @allure.description("/integral/task/focusSuccess")
# @allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'focusSuccessIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'focusSuccessIntegral'))
# def test_focus_success_integral(self, inData): def test_focus_success_integral(self, inData):
# url = f"{BMCConfig().host}{inData['url']}" url = f"{BMCConfig().host}{inData['url']}"
# method = inData['method'] method = inData['method']
# req_data = inData['reqData'] req_data = inData['reqData']
# expectData = inData['expectData'] expectData = inData['expectData']
# headers = inData['headers'] headers = inData['headers']
# res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
# assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
if __name__ == '__main__': if __name__ == '__main__':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment