Commit e55893e6 authored by 邓莹莹's avatar 邓莹莹

增加case

parent dce4cb54
...@@ -14,7 +14,8 @@ class answer_request(BaseRequest): ...@@ -14,7 +14,8 @@ class answer_request(BaseRequest):
return self.api_send(self.abc["detail"]) return self.api_send(self.abc["detail"])
# 回答详情页点赞 # 回答详情页点赞
def vote(self, answer_id=""): def vote(self, current_city_id,answer_id=""):
self.params["current_city_id"] = current_city_id
self.params["answer_id"] = answer_id self.params["answer_id"] = answer_id
return self.api_send(self.abc["vote"]) return self.api_send(self.abc["vote"])
......
...@@ -4,20 +4,20 @@ detail: ...@@ -4,20 +4,20 @@ detail:
url: /api/answer/detail url: /api/answer/detail
params: params:
current_city_id: ${current_city_id} current_city_id: ${current_city_id}
data:
answer_id: ${answer_id} answer_id: ${answer_id}
data: {}
json: {} json: {}
# isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段 # isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段
#回答详情页——点赞 #回答详情页——点赞
#vote: vote:
# method: post method: post
# url: /api/answer/vote url: /api/answer/vote
# params: params:
# current_city_id: ${current_city_id} current_city_id: ${current_city_id}
# data: data:
# answer_id: ${answer_id} answer_id: ${answer_id}
# json: {} json: {}
# isLogin: 1 # isLogin: 1
#回答详情页——取消点赞 #回答详情页——取消点赞
......
...@@ -8,11 +8,9 @@ class common_request(BaseRequest): ...@@ -8,11 +8,9 @@ class common_request(BaseRequest):
print("00000000000000",self.data) print("00000000000000",self.data)
# 日记贴评论列表--一级评论列表 # 日记贴评论列表--一级评论列表
def diary_common_reply(self, id, type, data_type, offset ,start_num): def diary_common_reply(self, id, type,start_num):
self.params["id"] = id self.params["id"] = id
self.params["type"] = type self.params["type"] = type
self.params["data_type"] = data_type
self.params["offset"] = offset
self.params["start_num"] = start_num self.params["start_num"] = start_num
return self.api_send(self.data["reply_detail"]) return self.api_send(self.data["reply_detail"])
......
...@@ -5,9 +5,7 @@ reply_detail: ...@@ -5,9 +5,7 @@ reply_detail:
params: params:
id: ${id} id: ${id}
type: ${type} type: ${type}
offset: ${offset}
start_num: ${start_num} start_num: ${start_num}
data_type: ${data_type}
data: {} data: {}
json: {} json: {}
isLogin: 0 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段 isLogin: 0 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段
......
...@@ -6,12 +6,12 @@ class conversation_request(BaseRequest): ...@@ -6,12 +6,12 @@ class conversation_request(BaseRequest):
def __init__(self): def __init__(self):
self.messageread = self.api_load(path_setting.MESSAGE_READ_CONFIG) self.messageread = self.api_load(path_setting.MESSAGE_READ_CONFIG)
# def message_read(self,current_city_id,release,message_ids): def message_read(self,current_city_id,release,message_ids):
# self.params["current_city_id"] = current_city_id self.params["current_city_id"] = current_city_id
# self.params["release"] = release self.params["release"] = release
# #self.params["uqid"] = uqid #self.params["uqid"] = uqid
# self.params["message_ids"] = message_ids self.params["message_ids"] = message_ids
# return self.api_send(self.messageread["message_read"]) return self.api_send(self.messageread["message_read"])
def detail_messageid(self, os_version, last_msg_id, offset_msg_id): def detail_messageid(self, os_version, last_msg_id, offset_msg_id):
self.params["os_version"] = os_version self.params["os_version"] = os_version
......
#message_read: message_read:
# method: post method: post
# url: /api/conversation/message/read url: /api/conversation/message/read
# params: params:
# current_city_id: ${current_city_id} current_city_id: ${current_city_id}
# release: ${release} release: ${release}
# #uqid: ${uqid} #uqid: ${uqid}
# data: data:
# message_ids: ${message_ids} message_ids: ${message_ids}
#
# json: {} json: {}
# isLogin: 1 #需要登录的接口 isLogin: 1 #需要登录的接口
detail_messageid: detail_messageid:
method: get method: get
......
...@@ -45,6 +45,6 @@ class diary_request(BaseRequest): ...@@ -45,6 +45,6 @@ class diary_request(BaseRequest):
return self.api_send(self.data["update"]) return self.api_send(self.data["update"])
def diary_pre_create_topic(self,diary_id): # def diary_pre_create_topic(self,diary_id):
self.params["diary_id"] = diary_id # self.params["diary_id"] = diary_id
return self.api_send(self.data["diary_pre_create_topic"]) # return self.api_send(self.data["diary_pre_create_topic"])
#日记本收藏 #日记本收藏
#isfavor: isfavor:
# method: post method: post
# url: /api/diary/favor/17586195 url: /api/diary/favor/17586195
# params: params:
# data: {} data: {}
# json: {} json: {}
# isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段 isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段
#日记本取消收藏 #日记本取消收藏
#cancelfavor: cancelfavor:
# method: delete method: delete
# url: /api/diary/favor/17586195 url: /api/diary/favor/17586195
# params: params:
# data: {} data: {}
# json: {} json: {}
# isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段 isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段
#
#日记本修改信息 #日记本修改信息
#operation: operation:
# method: post method: post
# url: /api/diary/additional_info/v2 url: /api/diary/additional_info/v2
# params: params:
# data: data:
# diary_id: ${diary_id} diary_id: ${diary_id}
# title: ${title} title: ${title}
# operation_timestamp: ${operation_timestamp} operation_timestamp: ${operation_timestamp}
# doctor_name: ${doctor_name} doctor_name: ${doctor_name}
# hospital_name: ${hospital_name} hospital_name: ${hospital_name}
#
# json: {} json: {}
# isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段 isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段
#详情页内容 #详情页内容
...@@ -59,14 +59,15 @@ diary_service: ...@@ -59,14 +59,15 @@ diary_service:
#更新日记本的修改信息 #更新日记本的修改信息
#update: update:
# method: post method: post
# url: /api/diary/update_v2/17586198 url: /api/diary/update_v2/17586198
# params: params:
# data: data:
# topic_list: ${topic_list} topic_list: ${topic_list}
# json: {} json: {}
# isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段 isLogin: 1 #需要登录添加这个字段,值为1 0是不需要登录的情况,如不需要登录,可以不添加这个字段
diary_operation: diary_operation:
method: get method: get
url: /api/diary/operation/17878325 url: /api/diary/operation/17878325
...@@ -76,14 +77,14 @@ diary_operation: ...@@ -76,14 +77,14 @@ diary_operation:
current_city_id: beijing current_city_id: beijing
data: {} data: {}
json: {} json: {}
isLogin: 1
diary_pre_create_topic:
method: get #diary_pre_create_topic:
url: /api/diary/pre_create_topic/v2 # method: get
params: # url: /api/diary/pre_create_topic/v2
current_city_id: beijing # params:
diary_id: ${diary_id} # current_city_id: beijing
data: {} # diary_id: ${diary_id}
json: {} # data: {}
isLogin: 1 # json: {}
\ No newline at end of file # isLogin: 1
\ No newline at end of file
#医生主页商品列表 #医生主页商品列表
services: services:
method: get method: get
url: /api/doctor_v2/5bd9f05cad51403d853ba8c881989e23/services url: /api/doctor_v2/7b884b96f43c47279d9e0cb2cec86780/services
params: params:
offset: 0 offset: 0
show_tag_distro: 1 show_tag_distro: 1
tag_id: all tag_id: all
size: 10 size: 10
cpc_referrer: 8
version: 7.47.1
current_city_id: "guangzhou"
client_source: app
platform: iPhone
device_id: 0B4E4C72-FF01-4670-9C45-B0DF1ACF0917
data: {} data: {}
json: {} json: {}
\ No newline at end of file
_gtid=a5dc3a8ff66a11eba9bbfa6400b8dbcd9180;sessionid=qaoahf1vwrxsumc6vl1ok4tx9lckf12f _gtid=fccfd619f9da11eb8dcfee9261893a462776;sessionid=0n0mgkmdyog3a4zlxwwujbuatp3pm737
\ No newline at end of file \ No newline at end of file
...@@ -3,20 +3,16 @@ import pytest ...@@ -3,20 +3,16 @@ import pytest
from ids_list import get_ids from ids_list import get_ids
import path_setting import path_setting
from in_common.base_request import BaseRequest from in_common.base_request import BaseRequest
from all_backend_api.account_request import account_request from all_backend_api.answer_request import answer_request
class TestLoginVfc: class TestDetail:
data = BaseRequest().api_load(path_setting.LOGIN_VFC) data = BaseRequest().api_load(path_setting.DETAIL)
loginvfc_case, loginvfc_data = get_ids(data, "login_vfc") detail_case, detail_data = get_ids(data, "detail")
@pytest.mark.parametrize("param",loginvfc_data,ids=loginvfc_case) @pytest.mark.parametrize("param",detail_data,ids=detail_case)
def test_login_vfc(self,param): def test_detail(self,param):
print(param["vfc_code"]) r = answer_request().detail(param["current_city_id"], param["answer_id"])
r = account_request().login_vfc(param["current_city_id"], param["phone_num"], param["vfc_code"]) assert r["error"] == 0
if r["error"] == 0:
assert r["data"]["account_phone"] == param["assert"]
if r["error"] == 1:
assert r["message"] == param["assert"]
...@@ -9,9 +9,9 @@ class TestVote: ...@@ -9,9 +9,9 @@ class TestVote:
data = BaseRequest().api_load(path_setting.VOTE) data = BaseRequest().api_load(path_setting.VOTE)
vote_case, vote_data = get_ids(data, "vote") vote_case, vote_data = get_ids(data, "vote")
@pytest.mark.skip # @pytest.mark.skip
@pytest.mark.parametrize("param", vote_data, ids=vote_case) @pytest.mark.parametrize("param", vote_data, ids=vote_case)
def test_vote(self, param): def test_vote(self, param):
r = answer_request().vote(param["answer_id"]) r = answer_request().vote(param["current_city_id"],param["answer_id"])
if r["error"] == 1: if r["error"] == 1:
assert r["message"] == param["assert"] assert r["message"] == "已经赞过啦"
...@@ -13,15 +13,8 @@ class TestReply: ...@@ -13,15 +13,8 @@ class TestReply:
@pytest.mark.parametrize("param", diary_common_reply_data, ids=diary_common_reply_case) @pytest.mark.parametrize("param", diary_common_reply_data, ids=diary_common_reply_case)
def test_reply(self, param): def test_reply(self, param):
# 日记贴的评论列表 # 日记贴的评论列表
r = common_request().diary_common_reply(param["id"], param["type"],param["data_type"],param["offset"],param["start_num"]) r = common_request().diary_common_reply(param["id"], param["type"],param["start_num"])
# print(r) assert r["error"] == 0
if r["error"] == 0:
assert r["error"] == param["assert1"]
# 先判断有没有评论,然后判断里面需要的那些字段,如点赞字段,评论总数等,不传值,传空值
if r["data"]["reply_data"]:
assert r["data"]["reply_data"][0]["user"]["user_portrait"] is not None and r["data"]["reply_data"][0]["user"]["user_portrait"] is not "" # 用户头像
......
...@@ -12,9 +12,8 @@ class TestRrplySubReply: ...@@ -12,9 +12,8 @@ class TestRrplySubReply:
@pytest.mark.parametrize("param", topic_sub_common_data, ids=topic_sub_common_case) @pytest.mark.parametrize("param", topic_sub_common_data, ids=topic_sub_common_case)
def test_reply_sub_reply(self, param): def test_reply_sub_reply(self, param):
r = common_request().topic_sub_common(param["id"], param["type"], param["reply_id"],param["start_num"],param["offset"]) r = common_request().topic_sub_common(param["id"], param["type"], param["reply_id"],param["offset"],param["start_num"])
if r["error"] == 0: assert r["error"] == 0
assert r["error"] == param["assert1"]
......
...@@ -9,6 +9,7 @@ from all_backend_api.diary_request import diary_request ...@@ -9,6 +9,7 @@ from all_backend_api.diary_request import diary_request
class TestDiaryOperation: class TestDiaryOperation:
data = BaseRequest().api_load(path_setting.DIARY_OPERATION) data = BaseRequest().api_load(path_setting.DIARY_OPERATION)
diary_operation_case, diary_operation_data = get_ids(data, "diary_operation") diary_operation_case, diary_operation_data = get_ids(data, "diary_operation")
@pytest.mark.skip
@pytest.mark.parametrize("param", diary_operation_data, ids=diary_operation_case) @pytest.mark.parametrize("param", diary_operation_data, ids=diary_operation_case)
def test_diary_operation(self, param): def test_diary_operation(self, param):
r = diary_request().diary_operation(param["start_num"], param["count"]) r = diary_request().diary_operation(param["start_num"], param["count"])
......
...@@ -9,6 +9,7 @@ from all_backend_api.diary_request import diary_request ...@@ -9,6 +9,7 @@ from all_backend_api.diary_request import diary_request
class TestDiaryPreCreateTop: class TestDiaryPreCreateTop:
data = BaseRequest().api_load(path_setting.DIARY_PRE_CREATE_TOPIC_DATE) data = BaseRequest().api_load(path_setting.DIARY_PRE_CREATE_TOPIC_DATE)
diary_pre_create_topic_case, diary_pre_create_topic_data = get_ids(data, "pre_create_topic") diary_pre_create_topic_case, diary_pre_create_topic_data = get_ids(data, "pre_create_topic")
@pytest.mark.skip
@pytest.mark.parametrize("param", diary_pre_create_topic_data, ids=diary_pre_create_topic_case) @pytest.mark.parametrize("param", diary_pre_create_topic_data, ids=diary_pre_create_topic_case)
def test_diary_pre_create_topic(self, param): def test_diary_pre_create_topic(self, param):
r = diary_request().diary_pre_create_topic(param["diary_id"]) r = diary_request().diary_pre_create_topic(param["diary_id"])
......
login_vfc: login_vfc:
#成功登录case #成功登录case
- # -
case: "成功登录case--验证码正常登录case" # case: "成功登录case--验证码正常登录case"
current_city_id: "beijing" # current_city_id: "beijing"
phone_num: "+8612345678912" # phone_num: "+8612345654321"
vfc_code: 1234 # vfc_code: 1234
assert: "12345678912" # assert: "12345678912"
#登录失败case #登录失败case
- -
case: "登录失败case--手机号错误" case: "登录失败case--手机号错误"
......
...@@ -3,6 +3,6 @@ detail: ...@@ -3,6 +3,6 @@ detail:
- -
case: "接口正常case" case: "接口正常case"
current_city_id: "beijing" current_city_id: "beijing"
answer_id: "868312" answer_id: "563385"
assert: "" assert: ""
vote: vote:
- case: "接口正常case" -
case: "已经赞过了"
current_city_id: "beijing"
answer_id: "868312" answer_id: "868312"
assert: "" assert: ""
...@@ -2,11 +2,8 @@ common_reply: ...@@ -2,11 +2,8 @@ common_reply:
#日记本列表评论列表--校验 #日记本列表评论列表--校验
- -
case: "日记本列表评论列表--校验" case: "日记本列表评论列表--校验"
id: 75636 id: 711187
type: 4 type: 1
assert1: 0
data_type: "user_post"
offset:
start_num: 0 start_num: 0
# - # -
# case: "帖子列表评论列表--校验" # case: "帖子列表评论列表--校验"
......
...@@ -2,14 +2,12 @@ topic_sub_common: ...@@ -2,14 +2,12 @@ topic_sub_common:
#二级评论列表展示-多数为字段判空校验-因为评论本身并不确定 #二级评论列表展示-多数为字段判空校验-因为评论本身并不确定
- -
case: "日记贴二级评论列表--展示--用户信息校验" case: "日记贴二级评论列表--展示--用户信息校验"
id: 20583023 id: 706110
type: 2 type: 1
reply_id: 35348521 reply_id: 824805
start_num: 0 start_num: 0
offset: 0 offset:
assert1: 0
assert2: "请登录后再试"
assert3: "已经赞过啦"
......
...@@ -5,5 +5,5 @@ message_read: ...@@ -5,5 +5,5 @@ message_read:
current_city_id: "beijing" current_city_id: "beijing"
release: 1 release: 1
#uqid: "1B519701-A4F5-453E-9D99-140B5AF697A0" #uqid: "1B519701-A4F5-453E-9D99-140B5AF697A0"
message_ids: [10622,10626,10646,10651] message_ids: "[10622,10626,10646,10651]"
assert: "true" assert: "true"
\ No newline at end of file
services: services:
- -
case: "校验接口返回成功case" case: "校验接口返回成功case"
offset: 0
show_tag_distro: 1
tag_id: all
size: 10
assert_error: 0 assert_error: 0
\ 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