Commit 2b6d8c1c authored by 李光宇's avatar 李光宇
Browse files

Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6
parents e7e2bda7 58586362
......@@ -26,7 +26,10 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2")
request_body1 = commonFuc().get_business_data(module, "payload300")
# 发送请求
result1 = requests.post(url, json=request_body1, headers=headers)
# 获取接口响应时间
api_time = result1.elapsed.total_seconds()
result1 = json.loads(result1.content)
result1["api_time"] = api_time
# 获取预期结果
check_dict1 = commonFuc().get_business_data(module, "checkDict300")
# 断言实际结果中是否包含预期结果的内容
......@@ -42,7 +45,9 @@ request_body = commonFuc().get_business_data(module, "payload301")
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
result = json.loads(result.content)
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict300")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -52,7 +52,10 @@ request_body1 = commonFuc().get_business_data(module, "payload10", product_id, p
"""
# 发送请求
result1 = requests.post(url1, json=request_body1, headers=headers1)
# 获取接口响应时间
api_time = result1.elapsed.total_seconds()
result1 = json.loads(result1.content)
result1["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict10")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -33,7 +33,10 @@ request_body = commonFuc().get_business_data(module, "payload1")
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
result["api_time"] = api_time
# print(result)
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict1")
......
......@@ -2,7 +2,7 @@
__author__ = "liguangyu"
"""
case_tag:cmdc_api,cmdc用户购物车商品移除,2252,2252-9,sit,bs
case_tag:cmdc_api,cmdc购物车商品移除,2252,2252-9,sit,bs
主数据平台:多采商城购物车列表商品删除接口
"""
......@@ -70,8 +70,11 @@ if result_product_id == product_id:
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict2")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
commonFuc().check_result(check_dict, result)
\ No newline at end of file
......@@ -43,7 +43,10 @@ if invalid_sign == 0:
# print(request_body1)
# 发送请求
result1 = requests.post(url1, json=request_body1, headers=headers)
# 获取接口响应时间
api_time = result1.elapsed.total_seconds()
result1 = json.loads(result1.content)
result1["api_time"] = api_time
# 获取预期结果
check_dict1 = commonFuc().get_business_data(module, "checkDict80")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -57,8 +57,10 @@ request_body1 = commonFuc().get_business_data(module, "payload2", product_id, pr
"""
# 发送请求
result1 = requests.post(url1, json=request_body1, headers=headers1)
# 获取接口响应时间
api_time = result1.elapsed.total_seconds()
result1 = json.loads(result1.content)
# print(result1)
result1["api_time"] = api_time
if result1["success"]:
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict2")
......
......@@ -35,8 +35,10 @@ request_body = commonFuc().get_business_data(module, "payload24", company_id)
"""
# 发送请求
result = requests.post(url_batch, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# print(result)
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict24")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -33,8 +33,10 @@ request_body = commonFuc().get_business_data(module, "payload22")
"""
# 发送请求
result = requests.post(url_batch, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# print(result)
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict22")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -35,8 +35,10 @@ request_body = commonFuc().get_business_data(module, "payload21", product_code)
"""
# 发送请求
result = requests.post(url_batch, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# print(result)
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict21")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -31,7 +31,8 @@ result_body_user_websites = requests.post(url_user_websites, json=request_body_u
result_body_user_websites = json.loads(result_body_user_websites.content)
# 获取站点对应的id
company_id = result_body_user_websites["data"][3]["companyId"]
company_id = result_body_user_websites["data"][2]["companyId"]
# print(company_id)
# 第三步切换至站点
url_switch_website = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url_switch_website")
......@@ -47,10 +48,11 @@ request_body_website_product = commonFuc().get_business_data(module, "payload_we
# 发送请求
result_body_website_product = requests.post(url_website_product, json=request_body_website_product, headers=headers)
result_body_website_product = json.loads(result_body_website_product.content)
# print(result_body_website_product)
# 获取站点的商品信息
product_code = result_body_website_product["data"]["list"][0]["productcode"]
# 第五步获取通过Excel复制添加商品
# 获取通过Excel复制添加商品接口地址
url_batch = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url_batch")
......@@ -65,8 +67,10 @@ request_body = commonFuc().get_business_data(module, "payload23", product_code,
"""
# 发送请求
result = requests.post(url_batch, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# print(result)
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict23")
# 断言实际结果中是否包含预期结果的内容
......
......@@ -40,11 +40,13 @@ request_body = commonFuc().get_business_data(module, "payload8")
# print(request_body)
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# 获取查询结果中商品id
result = {"productId": result["data"]["list"][0]["list"][0]["productId"]}
result["api_time"] = api_time
# # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict3")
# # 断言实际结果中是否包含预期结果的内容
......
......@@ -31,10 +31,10 @@ result1 = requests.post(url_add, json=request_body1, headers=headers)
request_body2 = commonFuc().get_business_data(module, "payload2")
result2 = requests.post(url_add, json=request_body2, headers=headers)
result2 = json.loads(result2.content)
# 获取预期结果
check_dict1 = commonFuc().get_business_data(module, "checkDict1")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict1, result2)
# # 获取预期结果
# check_dict1 = commonFuc().get_business_data(module, "checkDict1")
# # 断言实际结果中是否包含预期结果的内容
# commonFuc().check_result(check_dict1, result2)
"""
场景:购物车支持跨站商品下单验证
......@@ -79,8 +79,10 @@ request_body = commonFuc().get_business_data(module, "payload30", buyercart_id_1
# print(request_body)
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# print(result)
result["api_time"] = api_time
if result["success"]:
if result["data"]:
# # 获取预期结果
......
# -*- encoding=utf8 -*-
__author__ = "liguangyu"
"""
case_tag:cmdc_api,cmdc促销活动新增功能验证,2262,2262-43,sit,bs
主数据平台:运营后台管理系统促销活动新增接口
"""
from common.common_func import commonFuc
from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
import requests
import json
module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
# 第二步促销活动新增
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url43")
request_body = commonFuc().get_business_data(module, "payload43")
"""
场景:促销活动新增功能验证
用例名称:促销活动新增功能验证
输出:{"success":true,"code":"200","message":"OK"}
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
# 将接口响应时间添加至结果中
result = json.loads(result.content)
# print(result)
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict43")
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
# -*- encoding=utf8 -*-
__author__ = "liguangyu"
"""
case_tag:cmdc_api,cmdc促销活动编辑更新功能验证,2262,2262-44,sit,bs
主数据平台:运营后台管理系统促销活动编辑更新接口
"""
from common.common_func import commonFuc
from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
import requests
import json
module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
# 第二步获取活动列表
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url44_1")
request_body = commonFuc().get_business_data(module, "payload44_1")
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
result = json.loads(result.content)
# 获取活动信息
activityBasicId = result["data"]["list"][0]["activityBasicId"]
# 第三步进行活动编辑更新操作
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url44")
request_body = commonFuc().get_business_data(module, "payload44", activityBasicId)
"""
场景:促销活动编辑更新功能验证
用例名称:促销活动编辑更新功能验证
输出:{"activityBasicId":"%s"}
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
# 获取活动信息
result = json.loads(result.content)
result = {"activityBasicId": result["data"]["activityBasicId"]}
# 将接口响应时间添加至结果中
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict44", activityBasicId)
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
# -*- encoding=utf8 -*-
__author__ = "liguangyu"
"""
case_tag:cmdc_api,cmdc促销活动终止功能验证,2262,2262-45,sit,bs
主数据平台:运营后台管理系统促销活动终止接口
"""
from common.common_func import commonFuc
from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
import requests
import json
module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
# 第二步获取活动列表
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url44_1")
request_body = commonFuc().get_business_data(module, "payload44_1")
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
result = json.loads(result.content)
# 获取活动信息
activityBasicId = result["data"]["list"][0]["activityBasicId"]
# 第三步促销活动终止
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url45")
request_body = commonFuc().get_business_data(module, "payload45", activityBasicId)
"""
场景:促销活动终止功能验证
用例名称:促销活动终止功能验证
输出:{"activityBasicId":"%s"}
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
# 获取活动信息
result = json.loads(result.content)
result = {"activityBasicId": result["data"]["activityBasicId"]}
# 将接口响应时间添加至结果中
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict45", activityBasicId)
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
......@@ -9,14 +9,15 @@ case_tag:cmdc_api,cmdc促销活动列表查询条件验证,2262,2262-39,sit,bs
from common.common_func import commonFuc
from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
import requests
import random
import json
module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username1")
password = commonFuc().get_business_data(module, "password1")
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
......@@ -28,15 +29,18 @@ request_body = commonFuc().get_business_data(module, "payload1")
result = requests.post(url, json=request_body, headers=headers)
result = json.loads(result.content)
# 生成随机数
activity_random = random.randint(0, len(result["data"]["list"]) - 1)
# 获取促销活动信息activityBasicId、activityName、activityStatus、activityType、startTime、endTime、cStartTime、cEndTime
activity_basic_id = result["data"]["list"][0]["activityBasicId"]
activity_name = result["data"]["list"][0]["activityName"]
activity_status = result["data"]["list"][0]["activityStatus"]
activity_type = result["data"]["list"][0]["activityType"]
start_time = result["data"]["list"][0]["effectiveDate"]
end_time = result["data"]["list"][0]["expirationDate"]
c_start_time = result["data"]["list"][0]["createTime"]
c_end_time = result["data"]["list"][0]["expirationDate"]
activity_basic_id = result["data"]["list"][activity_random]["activityBasicId"]
activity_name = result["data"]["list"][activity_random]["activityName"]
activity_status = result["data"]["list"][activity_random]["activityStatus"]
activity_type = result["data"]["list"][activity_random]["activityType"]
start_time = result["data"]["list"][activity_random]["effectiveDate"]
end_time = result["data"]["list"][activity_random]["expirationDate"]
c_start_time = result["data"]["list"][activity_random]["createTime"]
c_end_time = result["data"]["list"][activity_random]["expirationDate"]
# 第三步促销活动管理列表查询条件验证
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
......@@ -51,9 +55,12 @@ request_body = commonFuc().get_business_data(module, "payload_list", activity_ba
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
# print(result)
result = {"activityBasicId": result["data"]["list"][0]["activityBasicId"]}
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict_list", activity_basic_id)
# 断言实际结果中是否包含预期结果的内容
......
......@@ -8,6 +8,7 @@ case_tag:cmdc_api,cmdc促销活动列表获取,2262,2262-38,sit,bs
from common.common_func import commonFuc
from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
from common.db.db import mySql
import requests
import json
......@@ -17,8 +18,8 @@ module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username1")
password = commonFuc().get_business_data(module, "password1")
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
......@@ -29,13 +30,30 @@ request_body = commonFuc().get_business_data(module, "payload1")
"""
场景:查询促销活动列表
用例名称:查询促销活动列表
输出:{"success":true,"code":"200","message":"OK"}
输出:{"total":"%s"}
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
# 获取列表中促销活动数量
result = json.loads(result.content)
result = {"total": result["data"]["total"]}
# 将接口响应时间添加至result
result["api_time"] = api_time
# 数据库操作
mysql_handle = mySql()
# 获取conf.ini文件中配置的数据库信息
host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
# 查询数据库中促销活动数量
sql = "SELECT count(t.activityBasicId) FROM `cmdc-order`.tc_activity_basic t WHERE companyCode = 00102"
total = mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict1")
check_dict = commonFuc().get_business_data(module, "checkDict1", total)
# 断言实际结果中是否包含预期结果的内容
commonFuc().check_result(check_dict, result)
......@@ -15,8 +15,8 @@ module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username1")
password = commonFuc().get_business_data(module, "password1")
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
......@@ -27,7 +27,7 @@ request_body = commonFuc().get_business_data(module, "payload15")
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
result = json.loads(result.content)
# print(result)
# 获取活动对应的activityBasicId和activityType
activity_basic_id = result["data"]["list"][0]["activityBasicId"]
activity_type = result["data"]["list"][0]["activityType"]
......@@ -43,7 +43,7 @@ result = json.loads(result.content)
product_id = result["data"][0]["productId"]
company_code = result["data"][0]["companyCode"]
product_code = result["data"][0]["productCode"]
# print(product_code)
# 第四步获取对应商品详情
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url7")
request_body = commonFuc().get_business_data(module, "payload7", product_id, company_code, product_code)
......@@ -51,13 +51,17 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, com
"""
场景:商品参与买赠活动验证
用例名称:商品参与买赠活动验证
输出:{"activityBasicId": 10135}
输出:{"productCode": 10146174}
"""
# 发送请求
result = requests.get(url, params=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
result = {"productId": result["data"]["zero"]["purchaseZeroProductList"][0]["productId"]}
# print(result)
result = {"productCode": result["data"]["zero"]["purchaseZeroProductList"][0]["productCode"]}
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict15")
print(check_dict)
......
......@@ -17,8 +17,8 @@ module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username1")
password = commonFuc().get_business_data(module, "password1")
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
......@@ -68,8 +68,11 @@ request_body = [
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
result = {"purchaseZeroProductList": result["data"][0]["purchaseZeroProductList"]}
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict17")
......
......@@ -17,8 +17,8 @@ module = "cmdc_commodity_activity"
# 第一步登录后台运营平台获取cmdc_access_token
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username1")
password = commonFuc().get_business_data(module, "password1")
username = commonFuc().get_business_data(module, "username30")
password = commonFuc().get_business_data(module, "password30")
# 获取登录后Cmdc_access_token
cmdc_access_token = CmdcDoLogin(username, password).get_token()
headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
......@@ -44,7 +44,7 @@ result = json.loads(result.content)
# 获取活动商品id、companyCode、productCode
company_code = result["data"][0]["companyCode"]
product_code = result["data"][0]["productCode"]
purchase_quantity = random.randint(3, 10)
purchase_quantity = random.randint(5, 10)
# 获取登录所需账号密码
username = commonFuc().get_business_data(module, "username")
......@@ -63,13 +63,16 @@ request_body = [
"""
场景:购买满足条件买赠商品验证赠品是否赠送
用例名称:购买满足条件买赠商品验证赠品是否赠送
输出:{"productId": 7670}
输出:{"productCode": 10000841}
"""
# 发送请求
result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content)
result = {"productId": result["data"][0]["purchaseZeroProductList"][0]["productId"]}
result = {"productCode": result["data"][0]["purchaseZeroProductList"][0]["productCode"]}
result["api_time"] = api_time
# 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict15")
......
Supports Markdown
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