From c61a21446df7a29016094ea1d19bda8f2051806f Mon Sep 17 00:00:00 2001 From: LG_lai Date: Mon, 11 Mar 2024 17:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Login/Login.robot | 1 - Login/LoginResource.robot | 1 + WriteInfo/InfoResource.robot | 102 ++++++++++++++++++++++++++++++++--- WriteInfo/Infomation.robot | 31 ++++++----- 4 files changed, 113 insertions(+), 22 deletions(-) diff --git a/Login/Login.robot b/Login/Login.robot index 14e93cc..b01a7a1 100644 --- a/Login/Login.robot +++ b/Login/Login.robot @@ -13,7 +13,6 @@ Plogin Given 用户打开小程序 When 输入手机号获取验证码 Then 登录 - ${/} WLogin Given 用户打开小程序 diff --git a/Login/LoginResource.robot b/Login/LoginResource.robot index e0d3820..aa32ff2 100644 --- a/Login/LoginResource.robot +++ b/Login/LoginResource.robot @@ -59,3 +59,4 @@ Library String ${check} Execute Sql String UPDATE da_user SET app_from = 50325897884795880 WHERE id = ${userid} #更新da_user表app_from数据 Disconnect From Database END + BuiltIn.Set Global Variable ${userid} diff --git a/WriteInfo/InfoResource.robot b/WriteInfo/InfoResource.robot index 02c170e..1f70670 100644 --- a/WriteInfo/InfoResource.robot +++ b/WriteInfo/InfoResource.robot @@ -2,6 +2,7 @@ Library urllib3 Library String Library demjson +Library DateTime Library Collections Library JSONLibrary Library RequestsLibrary @@ -60,7 +61,9 @@ Library OperatingSystem Log To Console ${CURDIR} Disable Warnings #用户首次填写婚介资料 - ${SexCode} Evaluate 1 #男:0，女:1 + ${sex-code} Create List 0 1 + ${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号 + #${SexCode} Evaluate 1 #男:0，女:1 ${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.UEC域名} ${${dating}.Header} ${Data} Update Value To Json ${Data} $.genderCode ${SexCode} @@ -70,6 +73,8 @@ Library OperatingSystem log ${Data} ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${DataId} Get From Dictionary ${reps.json()} data #获取证婚人资料id + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful Set Global Variable ${DataId} #检查首次填写婚介资料序号 @@ -117,20 +122,101 @@ Library OperatingSystem ${Data} Evaluate demjson.encode(${DATA}) demjson ${Data} Replace String ${Data} "None" null ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} #检查首次填写婚介资料序号 - 用户首次填写婚介资料 + #用户首次填写婚介资料 -出生年份 +选择${dating}征婚人的出生年份 + #选择征婚人出生年份 + ${get_year} Get Current Date result_format=%Y + ${start-year} Evaluate 1950 + ${end-year} Evaluate ${get_year}-18 + ${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 + ${Number} Evaluate 2 #填写序号 + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.birthYear ${year} + ${Data} Evaluate demjson.encode(${DATA}) demjson + ${Data} Replace String ${Data} "None" null + ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} -身高 +选择${dating}征婚人的身高 + #选择征婚人身高 + ${low-height} Evaluate 120 + ${hight-height} Evaluate 207 + ${height} Evaluate random.randint(${low-height},${hight-height}) random + ${Number} Evaluate 3 + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.height ${height} + ${Data} Evaluate demjson.encode(${DATA}) demjson + ${Data} Replace String ${Data} "None" null + ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} -学历 +选择${dating}征婚人的学历 + #选择征婚人的学历 + ${code} Create List 0 1 2 3 4 5 #0：高中及以下，1：中专，2：大专，3：大学本科，4：硕士，5：硕士 + ${educode} Evaluate random.choice(${code}) random #随机获取学历编码 + ${Number} Evaluate 4 + Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.educationCode ${educode} + ${Data} Evaluate demjson.encode(${DATA}) demjson + ${Data} Replace String ${Data} "None" null + ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} -婚姻状况 +选择${dating}征婚人的婚姻状况 + #选择征婚人的婚姻状况 + ${code} Create List 0 1 2 #0：未婚，1：离异，2：丧偶的 + ${maritalCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码 + ${Number} Evaluate 5 + Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.maritalStatusCode ${maritalCode} + ${Data} Evaluate demjson.encode(${DATA}) demjson + ${Data} Replace String ${Data} "None" null + ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} -月收入 +选择${dating}征婚人的月收入 + #选择征婚人的月收入 + ${code} Create List 0 1 2 3 4 5 6 #0：3000以下，1：3001~5000，2：5001~8000，3：8001~12000，4：12001~20000，5：20001~50000，6：50000以上 + ${incomeCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码 + ${Number} Evaluate 6 + Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.incomeCode ${incomeCode} + ${Data} Evaluate demjson.encode(${DATA}) demjson + ${Data} Replace String ${Data} "None" null + ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} -昵称 +选择${dating}征婚人的昵称 + #填写征婚人昵称 + ${num} Evaluate random.randint(1,999) random #随机获取一个数字 + ${nickName} Set Variable 寻伴用户${num} + ${Number} Evaluate 7 + Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.nickName ${nickName} + ${Data} Evaluate demjson.encode(${DATA}) demjson + ${Data} Replace String ${Data} "None" null + ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} + ${id} Get From Dictionary ${reps.json()} data + Should Be Equal ${id} ${DataId} 返回上一步 diff --git a/WriteInfo/Infomation.robot b/WriteInfo/Infomation.robot index 11843af..aba1e3b 100644 --- a/WriteInfo/Infomation.robot +++ b/WriteInfo/Infomation.robot @@ -10,12 +10,12 @@ Info Given 用户打开小程序 Then 选择${dating}性别资料 And 选择${dating}证婚人的城市 - And 出生年份 - And 身高 - And 学历 - And 婚姻状况 + And 选择${dating}征婚人的出生年份 + And 选择${dating}征婚人的身高 + And 选择${dating}征婚人的学历 + And 选择${dating}征婚人的婚姻状况 And 月收入 - And 昵称 + And 选择${dating}征婚人的昵称 sex_info #选择性别 @@ -33,28 +33,28 @@ city_info age_info #选择出生年份 Given 用户打开小程序 - Then 出生年份 + Then 选择${dating}征婚人的出生年份 And 返回上一步 And 重新进入小程序 hight_info #选择身高 Given 用户打开小程序 - Then 身高 + Then 选择${dating}征婚人的身高 And 返回上一步 And 重新进入小程序 edu_info #选择学历 Given 用户打开小程序 - Then 学历 + Then 选择${dating}征婚人的学历 And 返回上一步 And 重新进入小程序 marry_info #选择婚姻状况 Given 用户打开小程序 - Then 婚姻状况 + Then 选择${dating}征婚人的婚姻状况 And 返回上一步 And 重新进入小程序 @@ -94,7 +94,12 @@ region Set Global Variable ${provinceName} test - #Given 用户首次填写婚介资料 - #Then 选择婚介性别资料 - #And 选择婚介征婚人的城市 - 测试婚介资料填写 + Given 用户首次填写婚介资料 + Then 选择婚介性别资料 + And 选择婚介征婚人的城市 + And 选择婚介征婚人的出生年份 + And 选择婚介征婚人的身高 + And 选择婚介征婚人的学历 + And 选择婚介征婚人的婚姻状况 + And 选择婚介征婚人的婚姻状况 + And 选择婚介征婚人的昵称