Commit 5c9b154a by fanxun

积分商城结束

parent 2399236f
from common.tools import request_main
__author__ = 'dengmaosheng' __author__ = 'dengmaosheng'
__data__ = "2021-05-08 10:26" __data__ = "2021-05-08 10:26"
import pytest import pytest
...@@ -19,6 +21,9 @@ def bmc_login_fixture(): ...@@ -19,6 +21,9 @@ def bmc_login_fixture():
# BMCConfig.headers['Pvt-Token'] = res[1] # BMCConfig.headers['Pvt-Token'] = res[1]
# BMCConfig.headers['Token'] = res[0] # BMCConfig.headers['Token'] = res[0]
if __name__ == '__main__': if __name__ == '__main__':
bmc_login_fixture() bmc_login_fixture()
......
...@@ -43,7 +43,7 @@ class TestCreditScore(): ...@@ -43,7 +43,7 @@ class TestCreditScore():
# print(expectData) # print(expectData)
#res = requests.post(url = url,headers =headers,json =req_data ) #res = requests.post(url = url,headers =headers,json =req_data )
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False)
print(res) print(res['data']['canSignInToday'])
# assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
...@@ -54,8 +54,8 @@ if __name__ == '__main__': ...@@ -54,8 +54,8 @@ if __name__ == '__main__':
# #
# os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report') # os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx') workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
inData = get_excelData(workBook, '三车违法学习', 'getPaperIllegalstudy')[0] inData = get_excelData(workBook, '积分商城', 'getsignIntegral')[0]
# # print(inData) # print(inData)
TestCreditScore().bmc_login_fixture() TestCreditScore().bmc_login_fixture()
TestCreditScore().test_creditscore(inData) TestCreditScore().test_creditscore(inData)
......
...@@ -26,13 +26,13 @@ class TestCreditScore(): ...@@ -26,13 +26,13 @@ class TestCreditScore():
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.mark.skip(reason="只能签到一次")
@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/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, '积分商城', 'postSignIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'getsignIntegral'))
def test_post_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']
...@@ -40,13 +40,27 @@ class TestCreditScore(): ...@@ -40,13 +40,27 @@ class TestCreditScore():
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']
@allure.story("查询我的签到情况") @pytest.fixture()
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/55869") def test_pre_get_sign_integral(self):
"""签到前置用例"""
url = f"{BMCConfig().host}/integral/center/sign"
method = 'get'
req_data = None
headers = None
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
return res['data']['canSignInToday']
@allure.story("签到")
@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.parametrize("inData", get_excelData(workBook, '积分商城', 'getsignIntegral')) @pytest.mark.usefixtures('test_pre_get_sign_integral')
def test_get_sign_integral(self, inData): @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'postSignIntegral'))
def test_post_sign_integral(self, inData, test_pre_get_sign_integral):
if not test_pre_get_sign_integral:
pytest.skip(msg="今天已经进行签到过,此用例不执行")
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']
...@@ -67,6 +81,7 @@ class TestCreditScore(): ...@@ -67,6 +81,7 @@ class TestCreditScore():
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)
self.task_list = res['data']['list']
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("查询积分商品") @allure.story("查询积分商品")
...@@ -131,16 +146,24 @@ class TestCreditScore(): ...@@ -131,16 +146,24 @@ class TestCreditScore():
@allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'receiveIntegral')) @pytest.mark.parametrize("inData", get_excelData(workBook, '积分商城', 'receiveIntegral'))
def test_receive_integral(self, inData): def test_receive_integral(self, inData):
count = 1 case_num = inData['caseNum']
if count == 1:
pytest.skip(msg="领取积分只能领取一次")
count += 1
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) for task in self.task_list:
if task['status'] == 2 and case_num == 'receiveIntegral001': # 2表示可领取
req_data['taskCode'] = task['taskCode']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
break
elif task['status'] != 2 and case_num == 'receiveIntegral002':
req_data['taskCode'] = task['taskCode']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
break
else:
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
break
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("获取关注信息") @allure.story("获取关注信息")
......
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