Commit 1d0aefc7 by fanxun

用例完善

parent a8db2645
...@@ -27,7 +27,8 @@ if __name__ == "__main__": ...@@ -27,7 +27,8 @@ if __name__ == "__main__":
pytest.main(['-v', '-s', test_case_dir, '--alluredir', './report/tmp']) pytest.main(['-v', '-s', test_case_dir, '--alluredir', './report/tmp'])
# 打开报告 # 打开报告
# os.system('allure serve ./report/tmp') # os.system('allure serve ./report/tmp')
# 发送钉钉
# 发送钉钉 ()
dingTalk.dingTalk_markdown(secret="SEC465015385218e70a94f107a16f72dd33d8fc118c3b2a631e0433685302f2fbb3", dingTalk.dingTalk_markdown(secret="SEC465015385218e70a94f107a16f72dd33d8fc118c3b2a631e0433685302f2fbb3",
webhook="https://oapi.dingtalk.com/robot/send?access_token=229908a83825ed56abbf728d3382e446a4e8a90e9ad302c37a036bcbccbbf9ee", webhook="https://oapi.dingtalk.com/robot/send?access_token=229908a83825ed56abbf728d3382e446a4e8a90e9ad302c37a036bcbccbbf9ee",
message="") message="")
......
...@@ -21,10 +21,10 @@ class TestCreditScore(): ...@@ -21,10 +21,10 @@ class TestCreditScore():
indata = {"phone": "17822000000", indata = {"phone": "17822000000",
"encodedGesture": "67e6d10010533eed4bbe9659863bf6ee"} "encodedGesture": "67e6d10010533eed4bbe9659863bf6ee"}
res = BMC().bmc_login(indata) res = BMC().bmc_login(indata)
# setattr(BMCConfig, 'bmc_token', res[0]) setattr(BMCConfig, 'bmc_token', res[0])
# setattr(BMCConfig, 'bmc_pvt_token', res[1]) setattr(BMCConfig, 'bmc_pvt_token', res[1])
BMCConfig.headers['Pvt-Token'] = res[1] # BMCConfig.headers['Pvt-Token'] = res[1]
BMCConfig.headers['Token'] = res[0] # BMCConfig.headers['Token'] = res[0]
# #
# # print('Pvt-Token==========================', res[1]) # # print('Pvt-Token==========================', res[1])
# # print('Token==========================', res[0]) # # print('Token==========================', res[0])
...@@ -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)
# assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
......
...@@ -12,31 +12,31 @@ from config import BMCConfig ...@@ -12,31 +12,31 @@ from config import BMCConfig
class TestCreditScore(): class TestCreditScore():
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')
@allure.story("查询最近成绩") # @allure.story("查询最近成绩")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/67503") # @allure.link("http://yapi.hikcreate.com/project/32/interface/api/67503")
@allure.description("/answer/recentGrade") # @allure.description("/answer/recentGrade")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'recentGradeIllegalstudy')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'recentGradeIllegalstudy'))
def test_recentGradeIllegalstudy(self,inData): # def test_recentGradeIllegalstudy(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']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True) # res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
#
@allure.story("获取典型案例视频") # @allure.story("获取典型案例视频")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/57606") # @allure.link("http://yapi.hikcreate.com/project/31/interface/api/57606")
@allure.description("/illegal/study/video/typicalCase") # @allure.description("/illegal/study/video/typicalCase")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'typicalCaseIllegalstudy')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'typicalCaseIllegalstudy'))
def test_typicalCaseIllegalstudy(self, inData): # def test_typicalCaseIllegalstudy(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']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True) # res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
@allure.story("获取试卷") @allure.story("获取试卷")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/69573") @allure.link("http://yapi.hikcreate.com/project/32/interface/api/69573")
...@@ -53,69 +53,72 @@ class TestCreditScore(): ...@@ -53,69 +53,72 @@ class TestCreditScore():
self.browsequestion = {} self.browsequestion = {}
self.choosequestion = {} self.choosequestion = {}
self.browsequestion['answerId'] = res['data']['answerId']
self.choosequestion['answerId'] = res['data']['answerId']
for item in topic_lists: for item in topic_lists:
if item['topicType'] == 2: # 浏览题 if item['topicType'] == 2: # 浏览题
self.browsequestion['topicId'] = item['topicId'] self.browsequestion['topicId'] = item['topicId']
self.browsequestion['topicType'] = item['topicType'] self.browsequestion['topicType'] = item['topicType']
elif item['topicType'] == 1: elif item['topicType'] == 1:
self.choosequestion['topicId'] = item['topicId'] self.choosequestion['topicId'] = item['topicId']
self.choosequestion['topicType'] = item['topicType'] self.choosequestion['topicType'] = item['topicType']
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("提交答案") @allure.story("提交答案")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/67473") @allure.link("http://yapi.hikcreate.com/project/31/interface/api/67473")
@allure.description("/paper/submitAnswer") @allure.description("/paper/submitAnswer")
@allure.title("{inData[testPoint]}") @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'submitAnswerIllegalstudy')) @pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'submitAnswerIllegalstudy')[0])
def test_submitAnswerIllegalstudy(self, inData): def test_submitAnswerIllegalstudy(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']
req_data req_data['answerId'] = self.self.browsequestion['answerId']
req_data['topicId'] = self.browsequestion['topicId']
req_data['topicType'] = self.browsequestion['topicType']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True) res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code'] assert res['code'] == expectData['code']
@allure.story("查询成绩(只有错题)") # @allure.story("查询成绩(只有错题)")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/67485") # @allure.link("http://yapi.hikcreate.com/project/32/interface/api/67485")
@allure.description("/answer/detail") # @allure.description("/answer/detail")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'detailIllegalstudy')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'detailIllegalstudy'))
def test_detailIllegalstudy(self, inData): # def test_detailIllegalstudy(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']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True) # res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
#
@allure.story("查询答题记录列表") # @allure.story("查询答题记录列表")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/67497") # @allure.link("http://yapi.hikcreate.com/project/31/interface/api/67497")
@allure.description("/answer/logList") # @allure.description("/answer/logList")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'logListIllegalstudy')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'logListIllegalstudy'))
def test_logListIllegalstudy(self, inData): # def test_logListIllegalstudy(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']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True) # res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
#
@allure.story("答题记录查询") # @allure.story("答题记录查询")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/67491") # @allure.link("http://yapi.hikcreate.com/project/32/interface/api/67491")
@allure.description("/answer/log") # @allure.description("/answer/log")
@allure.title("{inData[testPoint]}") # @allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'logIllegalstudy')) # @pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'logIllegalstudy'))
def test_logIllegalstudy(self, inData): # def test_logIllegalstudy(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']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True) # res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code'] # assert res['code'] == expectData['code']
if __name__ == '__main__': if __name__ == '__main__':
pytest.main(['-s', '-v', 'test_illegalstudy.py', pytest.main(['-s', '-v', 'test_illegalstudy.py',
......
...@@ -22,9 +22,11 @@ class TestCreditScore(): ...@@ -22,9 +22,11 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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/55878")
@allure.description("/integral/center/sign") @allure.description("/integral/center/sign")
...@@ -35,7 +37,8 @@ class TestCreditScore(): ...@@ -35,7 +37,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("查询我的签到情况")
...@@ -48,7 +51,8 @@ class TestCreditScore(): ...@@ -48,7 +51,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("查询待领取积分清单")
...@@ -61,7 +65,8 @@ class TestCreditScore(): ...@@ -61,7 +65,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("查询积分商品")
...@@ -74,8 +79,8 @@ class TestCreditScore(): ...@@ -74,8 +79,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
# headers = config.BMCConfig.headers headers = inData['headers']
res = request_main(url=url, headers=None, 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("查询积分规则")
...@@ -88,7 +93,8 @@ class TestCreditScore(): ...@@ -88,7 +93,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("设置签到提醒开关")
...@@ -101,7 +107,8 @@ class TestCreditScore(): ...@@ -101,7 +107,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("任务中心主页")
...@@ -114,7 +121,8 @@ class TestCreditScore(): ...@@ -114,7 +121,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("领取积分")
...@@ -123,11 +131,16 @@ class TestCreditScore(): ...@@ -123,11 +131,16 @@ 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
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']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("获取关注信息")
...@@ -140,7 +153,8 @@ class TestCreditScore(): ...@@ -140,7 +153,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("商城中的商品")
...@@ -153,7 +167,8 @@ class TestCreditScore(): ...@@ -153,7 +167,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("商品的详情")
...@@ -166,7 +181,8 @@ class TestCreditScore(): ...@@ -166,7 +181,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("兑换商品接口")
...@@ -179,7 +195,8 @@ class TestCreditScore(): ...@@ -179,7 +195,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("查询商品的适用门店列表")
...@@ -192,7 +209,8 @@ class TestCreditScore(): ...@@ -192,7 +209,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("查询兑换记录")
...@@ -205,7 +223,8 @@ class TestCreditScore(): ...@@ -205,7 +223,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("查询兑换记录详情")
...@@ -218,7 +237,8 @@ class TestCreditScore(): ...@@ -218,7 +237,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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("关注成功回调")
...@@ -231,7 +251,8 @@ class TestCreditScore(): ...@@ -231,7 +251,8 @@ class TestCreditScore():
method = inData['method'] method = inData['method']
req_data = inData['reqData'] req_data = inData['reqData']
expectData = inData['expectData'] expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=False) headers = inData['headers']
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__':
pytest.main(['-s', '-v', 'test_integral.py', pytest.main(['-s', '-v', 'test_integral.py',
......
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