diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 36a7bb7..56de67d 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -18772953460 \ No newline at end of file +18024004975 \ No newline at end of file diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot index c55cf43..7934a33 100644 --- a/1-Applet/1-WriteInfo/InfoResource.robot +++ b/1-Applet/1-WriteInfo/InfoResource.robot @@ -16,19 +16,21 @@ Library OperatingSystem Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} ${Data} Get From Dictionary ${reps.json()} data + ${DataId} Get From Dictionary ${reps.json()['data']} id #资料id ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #查询资料填写序号 ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful Set Global Variable ${Data} + Set Global Variable ${DataId} Run Keyword If ${fillSerialNumber}==0 填写婚介征婚人的基础资料 ... ELSE IF ${fillSerialNumber}==1 填写婚介征婚人资料-城市开始 - ... ELSE IF ${fillSerialNumber}==2 填写婚介征婚人的资料-出生年份开始 - ... ELSE IF ${fillSerialNumber}==3 填写婚介征婚人的资料-身高开始 - ... ELSE IF ${fillSerialNumber}==4 填写婚介征婚人的资料-学历开始 - ... ELSE IF ${fillSerialNumber}==5 填写婚介征婚人的资料-婚姻状况开始 + ... ELSE IF ${fillSerialNumber}==2 填写婚介征婚人的资料-家乡开始 + ... ELSE IF ${fillSerialNumber}==3 填写婚介征婚人的资料-出生年份开始 + ... ELSE IF ${fillSerialNumber}==4 填写婚介征婚人的资料-身高开始 + ... ELSE IF ${fillSerialNumber}==5 填写婚介征婚人的资料-学历开始 ... ELSE IF ${fillSerialNumber}==6 填写婚介征婚人的资料-月收入开始 ... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始 - ... ELSE 查询婚介征婚人的资料信息 + ... ELSE 查询婚介用户资料 END Sleep 1 @@ -39,56 +41,78 @@ Library OperatingSystem ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #填写序号 Set Global Variable ${fillSerialNumber} +查询${dating}用户资料 + FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} + Disable Warnings + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} + ${Data} Get From Dictionary ${reps.json()} data + ${DataId} Get From Dictionary ${reps.json()['data']} id #资料id + Set Global Variable ${DataId} + END + 填写${dating}征婚人的基础资料 选择婚介性别资料 选择婚介征婚人的城市 + 选择婚介征婚人的家乡 选择婚介征婚人的出生年份 选择婚介征婚人的身高 选择婚介征婚人的学历 - 选择婚介征婚人的婚姻状况 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人资料-城市开始 + 查询婚介用户资料 选择婚介征婚人的城市 + 选择婚介征婚人的家乡 + 选择婚介征婚人的出生年份 + 选择婚介征婚人的身高 + 选择婚介征婚人的学历 + 选择婚介征婚人的月收入 + 选择婚介征婚人的昵称 + +填写${dating}征婚人的资料-家乡开始 + 查询婚介用户资料 选择婚介征婚人的出生年份 选择婚介征婚人的身高 选择婚介征婚人的学历 - 选择婚介征婚人的婚姻状况 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人的资料-出生年份开始 + 查询婚介用户资料 选择婚介征婚人的出生年份 选择婚介征婚人的身高 选择婚介征婚人的学历 - 选择婚介征婚人的婚姻状况 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人的资料-身高开始 + 查询婚介用户资料 选择婚介征婚人的身高 选择婚介征婚人的学历 - 选择婚介征婚人的婚姻状况 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人的资料-学历开始 + 查询婚介用户资料 选择婚介征婚人的学历 - 选择婚介征婚人的婚姻状况 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人的资料-婚姻状况开始 + 查询婚介用户资料 选择婚介征婚人的婚姻状况 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人的资料-月收入开始 + 查询婚介用户资料 选择婚介征婚人的月收入 选择婚介征婚人的昵称 填写${dating}征婚人的资料-昵称开始 + 查询婚介用户资料 选择婚介征婚人的昵称 选择${dating}性别资料 @@ -133,6 +157,26 @@ Library OperatingSystem ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} +选择${dating}征婚人的家乡 + #选择城市 + #获取省市区 + region + #选择征婚人地区资料 + Disable Warnings + ${Number} Evaluate 2 #0:"性别",1:"所在城市",2:"家乡"3:"出生年份",4:"身高",5:"学历",6:"月收入",7:"昵称",8:"首次填写完成" + Create Session dating ${${dating}.dating域名} ${client_header} + ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} + ${Data} Update Value To Json ${Data} $.hometownCityCode ${cityCode} + ${Data} Update Value To Json ${Data} $.hometownCityName ${cityName} + ${Data} Update Value To Json ${Data} $.hometownProvinceCode ${provinceCode} + ${Data} Update Value To Json ${Data} $.hometownProvinceName ${provinceName} + ${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 @@ -140,7 +184,7 @@ Library OperatingSystem #${end-year} Evaluate ${get_year}-18 #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 ${year} Evaluate ${get_year}-41 #固定年龄 - ${Number} Evaluate 2 #填写序号 + ${Number} Evaluate 3 #填写序号 Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} @@ -156,7 +200,7 @@ Library OperatingSystem ${low-height} Evaluate 150 ${hight-height} Evaluate 175 ${height} Evaluate random.randint(${low-height},${hight-height}) random - ${Number} Evaluate 3 + ${Number} Evaluate 4 Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} @@ -172,7 +216,7 @@ Library OperatingSystem ${code} Create List 0 1 2 3 4 5 #0:高中及以下,1:中专,2:大专,3:大学本科,4:硕士,5:硕士 ${educode} Evaluate random.choice(${code}) random #随机获取学历编码 #${educode} Evaluate 0 #固定学历 - ${Number} Evaluate 4 + ${Number} Evaluate 5 Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot index 9911463..6231a11 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -135,7 +135,7 @@ Resource ../../../0-Login/LoginResource.robot Disconnect From Database 提交${dating}征婚人的户口所在地 - #region + region固定省市 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "domicilePlaceProvinceCode": ${provinceCode}, \ \ \ \ "domicilePlaceProvinceName": "${provinceName}", \ \ \ \ "domicilePlaceCityCode": ${cityCode}, \ \ \ \ "domicilePlaceCityName": "${cityName}" } @@ -153,12 +153,37 @@ Resource ../../../0-Login/LoginResource.robot Should Be Equal As Strings ${city_name} ${cityName} #断言 Disconnect From Database +提交${dating}征婚人的家乡 + #家乡 + region + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "hometownProvinceCode": ${provinceCode}, \ \ \ \ "hometownProvinceName": "${provinceName}", \ \ \ \ "hometownCityCode": ${cityCode}, \ \ \ \ "hometownCityName": "${cityName}" } + ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${data.encode('utf-8')} + ${miId} Get From Dictionary ${reps.json()} data + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + Set Global Variable ${miId} + END + +修改${dating}征婚人的身高 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${man_height} Evaluate random.randint(165,207) random #男生身高 + ${woman_height} Evaluate random.randint(140,180) random #女生身高 + ${height_data} Set Variable If ${genderCode}==0 {"id":"${miId}","weight":null,"height":${man_height}} {"id":"${miId}","weight":null,"height":${woman_height}} + ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${height_data.encode('utf-8')} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + 提交${dating}征婚人的体重 查询婚介征婚人资料 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${weight} Evaluate random.randint(30,149) random #获取随机体重 - ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "weight": "${weight}", \ \ \ \ "height": "${height}" } + ${man_weight} Evaluate random.randint(45,120) random #获取随机体重-男 + ${woman_weight} Evaluate random.randint(35,100) random #获取随机体重-女 + ${weight_data} Set Variable If ${genderCode}==0 { \ \ \ \ "id": "${miId}", \ \ \ \ "weight": "${man_weight}", \ \ \ \ "height": "${height}" } { \ \ \ \ "id": "${miId}", \ \ \ \ "weight": "${woman_weight}", \ \ \ \ "height": "${height}" } ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${data.encode('utf-8')} ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful diff --git a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot index 29bfef8..64e0166 100644 --- a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot @@ -33,6 +33,14 @@ Resource ../../../0-Login/LoginResource.robot When 提交婚介征婚人的户口所在地 Then 查询数据库户口所在地数据 +提交征婚人的家乡 + Given 查询婚介征婚人的资料信息 + When 提交婚介征婚人的家乡 + +修改征婚人的身高 + Given 查询婚介征婚人的资料信息 + When 修改婚介征婚人的身高 + 提交征婚人的体重 Given 查询婚介征婚人的资料信息 Then 提交婚介征婚人的体重 diff --git a/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot index 67ecfcf..9eb9c47 100644 --- a/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot @@ -10,6 +10,11 @@ Resource Selection.robot And 提交婚介征婚人择偶条件-户口所在地 Then 查询数据库择偶表的数据 +提交征婚人择偶数据-家乡 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人择偶条件-家乡 + 提交征婚人的择偶条件-身高范围 Given 查询婚介用户资料 When 查询婚介征婚人择偶条件数据 diff --git a/1-Applet/2-Homepage/MarriageInfo/Selection.robot b/1-Applet/2-Homepage/MarriageInfo/Selection.robot index 428669e..1276041 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Selection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Selection.robot @@ -72,6 +72,16 @@ region Disconnect From Database END +提交${dating}征婚人择偶条件-家乡 + #region固定省市 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "hometownProvinceCode": ${provinceCode}, \ \ \ \ "hometownProvinceName": "${provinceName}", \ \ \ \ "hometownCityCode": ${cityCode}, \ \ \ \ "hometownCityName": "${cityName}" } + ${reps} POST On Session dating dating-agency-service/user/save/demand/marriage ${data.encode('utf-8')} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + 提交${dating}征婚人择偶条件-年龄范围 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} diff --git a/output/log.html b/output/log.html index b93b32d..c069c20 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};