Commit 19db2936 by taoke

Merge remote-tracking branch 'origin/master'

parents 6cad7b63 e3b8860f
......@@ -15,6 +15,7 @@ build
#myignore
log
test.py
debug.py
.idea
report/tmp/*.*
# Environments
......
......@@ -12,7 +12,7 @@ from config import BMCConfig
# @allure.feature("信用分")
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_credit_score_20210513.xlsx')
# inData = get_excelData(workBook, '信用分', 'creditscore')[0]
def bmc_login_fixture(self):
......@@ -43,7 +43,7 @@ class TestCreditScore():
# print(expectData)
#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)
print(res['data']['canSignInToday'])
print(res)
# assert res['code'] == expectData['code']
......@@ -53,11 +53,11 @@ if __name__ == '__main__':
# r'--alluredir=D:\项目\接口自动化\InterfaceAutoTest\report', '--clean-alluredir'])
#
# os.system('allure serve D:\项目\接口自动化\InterfaceAutoTest\\report')
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_testcase01_20210513.xlsx')
inData = get_excelData(workBook, '积分商城', 'getsignIntegral')[0]
# print(inData)
TestCreditScore().bmc_login_fixture()
TestCreditScore().test_creditscore(inData)
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_vehicle_steward_29_39_20210513.xlsx')
inData = get_excelData(workBook, '出行服务', 'agreevehiclesteward')
print(inData)
# TestCreditScore().bmc_login_fixture()
# TestCreditScore().test_creditscore(inData)
# res = requests.get('http://testbmcapp.hikcreate.com/credit/myCredit/V2', params={"bCityCode":"520100","bNetTag":"trf_mgt"},
# headers= {
......
......@@ -10,7 +10,7 @@ from config import BMCConfig
@allure.feature("三车违法学习")
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_illegal_study_20210513.xlsx')
# @allure.story("查询最近成绩")
# @allure.link("http://yapi.hikcreate.com/project/32/interface/api/67503")
......@@ -43,12 +43,13 @@ class TestCreditScore():
@allure.description("/paper/getPaper")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '三车违法学习', 'getPaperIllegalstudy'))
def test_getPaperIllegalstudy(self, inData):
def test_get_paper_illegal_study(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)
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code']
@pytest.fixture()
......@@ -57,7 +58,7 @@ class TestCreditScore():
url = f"{BMCConfig().host}/paper/getPaper"
method = 'get'
req_data = None
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=False)
topic_lists = res['data']['topicList']
browsequestion = {}
......@@ -85,9 +86,9 @@ class TestCreditScore():
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
req_data['answerId'] = self.self.browsequestion['answerId']
req_data['topicId'] = self.browsequestion['topicId']
req_data['topicType'] = self.browsequestion['topicType']
req_data['answerId'] = browsequestion['answerId']
req_data['topicId'] = browsequestion['topicId']
req_data['topicType'] = browsequestion['topicType']
expectData = inData['expectData']
case_num = inData['caseNum']
if case_num == 'submitAnswerIllegalstudy001':
......@@ -115,7 +116,7 @@ class TestCreditScore():
req_data['answerId'] = choosequestion['answerId']
req_data['topicId'] = choosequestion['topicId']
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=False)
assert res['code'] == expectData['code']
# @allure.story("查询成绩(只有错题)")
......
......@@ -10,7 +10,7 @@ from config import BMCConfig
@allure.feature("积分商城")
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_integral_20210513.xlsx')
@allure.story("查询我的积分")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/55860")
......
__author__ = 'fanxun'
__data__ = "2021-05-18 14:41"
import allure, xlrd, pytest
from config import BMCConfig
from common.utils.getExcelData import get_excelData
from common.tools import request_main
@allure.feature("出行服务")
class TestCreditScore():
workBook = xlrd.open_workbook(f'{BMCConfig.root_path}/test_case_data/bmc/bmc_vehicle_steward_29_39_20210513.xlsx')
@allure.story("获取用户授权")
@allure.link("http://yapi.hikcreate.com/project/31/interface/api/75421")
@allure.description("/vehicle/steward/authorization/authorizationOfUse")
@allure.title("{inData[testPoint]}")
@pytest.mark.parametrize("inData", get_excelData(workBook, '出行服务', 'authorizationOfUsevehicle_steward'))
def test_my_integral(self,inData):
url = f"{BMCConfig().host}{inData['url']}"
method = inData['method']
req_data = inData['reqData']
expectData = inData['expectData']
headers = inData['headers']
res = request_main(url=url, headers=headers, method=method, data=req_data, has_token=False)
assert res['code'] == expectData['code']
\ No newline at end of file
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