Commit 0e887272 by taoke

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	test_case_data/bmc/bmc_testcase01_20210513.xlsx
parents 4955751b a8db2645
...@@ -25,6 +25,7 @@ pycryptodome==3.10.1 ...@@ -25,6 +25,7 @@ pycryptodome==3.10.1
pymysql==0.9.3 pymysql==0.9.3
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pytest==6.0.1 pytest==6.0.1
pytest-ordering==0.6
redis==3.5.3 redis==3.5.3
requests==2.22.0 requests==2.22.0
six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
......
...@@ -13,7 +13,7 @@ from config import BMCConfig ...@@ -13,7 +13,7 @@ from config import BMCConfig
# @allure.feature("信用分") # @allure.feature("信用分")
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')
inData = get_excelData(workBook, '信用分', 'creditscore')[0] # inData = get_excelData(workBook, '信用分', 'creditscore')[0]
def bmc_login_fixture(self): def bmc_login_fixture(self):
"""bmc登录获取token""" """bmc登录获取token"""
...@@ -25,40 +25,39 @@ class TestCreditScore(): ...@@ -25,40 +25,39 @@ class TestCreditScore():
# 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('Token==========================', res[0])
print('Pvt-Token==========================', res[1]) # @allure.story("信用分")
print('Token==========================', res[0]) # @allure.title("{inData[testPoint]}")
# @allure.testcase("{inData[yapiAddress]}")
# @allure.story("信用分") # @allure.description("url:/auth/login 。。。。")
# @allure.title("{inData[testPoint]}") # @pytest.mark.parametrize("inData", get_excelData(workBook, '信用分', 'creditscore'))
# @allure.testcase("{inData[yapiAddress]}")
# @allure.description("url:/auth/login 。。。。")
# @pytest.mark.parametrize("inData", get_excelData(workBook, '信用分', 'creditscore'))
def test_creditscore(self,inData): def test_creditscore(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 = config.BMCConfig.headers # headers = config.BMCConfig.headers
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=headers, method=method, data=req_data, has_token=True) 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']
if __name__ == '__main__': if __name__ == '__main__':
# pytest.main(['-s', '-v', 'test_credit_score.py', # pytest.main(['-s', '-v', 'test_credit_score.py',
# r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir']) # r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
# # #
# 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, '积分商城', 'focusSuccessIntegral')[2] inData = get_excelData(workBook, '三车违法学习', 'getPaperIllegalstudy')[0]
print(inData) # # print(inData)
# TestCreditScore().bmc_login_fixture() TestCreditScore().bmc_login_fixture()
# TestCreditScore().test_creditscore(inData) TestCreditScore().test_creditscore(inData)
# res = requests.get('http://testbmcapp.hikcreate.com/credit/myCredit/V2', params={"bCityCode":"520100","bNetTag":"trf_mgt"}, # res = requests.get('http://testbmcapp.hikcreate.com/credit/myCredit/V2', params={"bCityCode":"520100","bNetTag":"trf_mgt"},
# headers= { # headers= {
......
__author__ = 'fanxun'
__data__ = "2021-05-17 15:11"
import pytest, allure, xlrd, os
import config
from common.utils.getExcelData import get_excelData
from common.tools import request_main
from config import BMCConfig
@allure.feature("三车违法学习")
class TestCreditScore():
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
@allure.story("查询最近成绩")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/67503")
@allure.description("/answer/recentGrade")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'recentGradeIllegalstudy'))
def test_recentGradeIllegalstudy(self,inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code']
@allure.story("获取典型案例视频")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/57606")
@allure.description("/illegal/study/video/typicalCase")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'typicalCaseIllegalstudy'))
def test_typicalCaseIllegalstudy(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code']
@allure.story("获取试卷")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/69573")
@allure.description("/paper/getPaper")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'getPaperIllegalstudy'))
def test_getPaperIllegalstudy(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
topic_lists = res['data']['topicList']
self.browsequestion = {}
self.choosequestion = {}
for item in topic_lists:
if item['topicType'] == 2: # 浏览题
self.browsequestion['topicId'] = item['topicId']
self.browsequestion['topicType'] = item['topicType']
elif item['topicType'] == 1:
self.choosequestion['topicId'] = item['topicId']
self.choosequestion['topicType'] = item['topicType']
assert res['code'] == expectData['code']
@allure.story("提交答案")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/67473")
@allure.description("/paper/submitAnswer")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'submitAnswerIllegalstudy'))
def test_submitAnswerIllegalstudy(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
req_data
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code']
@allure.story("查询成绩(只有错题)")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/67485")
@allure.description("/answer/detail")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'detailIllegalstudy'))
def test_detailIllegalstudy(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code']
@allure.story("查询答题记录列表")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/67497")
@allure.description("/answer/logList")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'logListIllegalstudy'))
def test_logListIllegalstudy(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code']
@allure.story("答题记录查询")
@allure.link("http://yapi.hikcreate.com/project/32/interface/api/67491")
@allure.description("/answer/log")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'logIllegalstudy'))
def test_logIllegalstudy(self, inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
res = request_main(url=url, headers=None, method=method, data=req_data, has_token=True)
assert res['code'] == expectData['code']
if __name__ == '__main__':
pytest.main(['-s', '-v', 'test_illegalstudy.py',
r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
#
os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
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