diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index 9ccd698..2d607f7 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -68,7 +68,14 @@ Library Collections #${get_list} Evaluate random.choice(${list}) random #log ${get_list} #生成手机号 - ${phone} Evaluate "".join(random.sample("01234567897",8)) random,string + #${phone} Evaluate "".join(random.sample("01234567897",8)) random,string + #生成1000的整数倍数 + #${number} Evaluate random.randrange(9000,50000,1000) random + #随机获取多个值 + ${imgList} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/30464b28455d6ddbc1f049ce4adfda7a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c7c968a93cff69375df767aefe112da4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e1c238e45a3c9264b83c0b1d4054019.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/0c1e15d1c956cb8bb678b2a1f7992f76.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/aea0caca25438b7490305cd4c704d515.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/14eee17ccd0333cda335d68004885f1f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/863db444113cabe238ce37e1ff12d8c8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/42e77d2434934a6fc24638fd5bf130d6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/122668a4d1cc4fcffd91fc3d2934fc8b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/24ef3e3c4e781b97c9e3da52cc2a6a88.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c91757deace453ee22c3d12ea9913bd0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b2b34146d7354dab2d7a7c6e65395762.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/905cbc906449e997be51c6b129c9481e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/18a7ce70dbba030da53442f0ad55e63b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/991c4bc6f06c1c3fb1d6a9a5178ee34c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/df8705ac114d936428d0765f78fc3af8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5d4eeebbf9f7df899a8964d3c802a2b7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/61971786fabc9be4718e10f9323649ef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f99a80033c77b990f9d2c75c2e6b6c1e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6647f59b5f8057c9aa67324261153cdd.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/fde465e0db7e83a6a29ad133c270c8ba.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/647e941c007594cd32d977b172efe58a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ca8faec9558e2aae046f8620fd21fed6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82e53568724f2010025231a600fd78b2.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e40ca792f19cb70f045ebfe04c57c52c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e62e2e3ad1b53d20a933a651c958201.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7f7e09f9c1f83b68de7967df210716d4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/3d9ccb6c9206e28c3dd6104d38eccd19.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ccc7a8fea47b80921b7cc790c87d6bc1.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/71a5453ecfd81a21c7fbbbcea50ec6ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bc07ad3c778a592b48a48a01a6e6bcee.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/228b58091bcdac00789bcefd77886cf2.jpg"] + ${imgdata} Evaluate random.sample(${imgList},2) random,string + ${img} Evaluate demjson.encode(${imgdata}) demjson + log ${img} 数据库删除用户 Given 读取TXT文件 diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 6f9f5cd..7621695 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -18888888888 \ No newline at end of file +18745960237 \ No newline at end of file diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot index 46d2a3e..74b6f9e 100644 --- a/1-Applet/1-WriteInfo/InfoResource.robot +++ b/1-Applet/1-WriteInfo/InfoResource.robot @@ -139,7 +139,7 @@ Library OperatingSystem #${start-year} Evaluate 1950 #${end-year} Evaluate ${get_year}-18 #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 - ${year} Evaluate ${get_year}-32 #固定年龄 + ${year} Evaluate ${get_year}-37 #固定年龄 ${Number} Evaluate 2 #填写序号 Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} @@ -153,8 +153,8 @@ Library OperatingSystem 选择${dating}征婚人的身高 #选择征婚人身高 - ${low-height} Evaluate 120 - ${hight-height} Evaluate 195 + ${low-height} Evaluate 170 + ${hight-height} Evaluate 207 ${height} Evaluate random.randint(${low-height},${hight-height}) random ${Number} Evaluate 3 Create Session dating ${${dating}.dating域名} ${client_header} @@ -280,7 +280,7 @@ region固定省市 FOR ${city} IN @{city_data} ${cityCode} Get From Dictionary ${city} value #获取市编码 ${cityName} Get From Dictionary ${city} label #获取市名称 - Exit For Loop If '${cityName}'=='广州市' + Exit For Loop If '${cityName}'=='深圳市' END ${district_data} Get From Dictionary ${city} children #广州市列表数据 log ${district_data} diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot index cbd74b4..5627a7b 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -63,11 +63,19 @@ Resource ../../../0-Login/LoginResource.robot Disconnect From Database 提价${dating}征婚人相册审核 - ${imgUrl_list} Set Variable [ \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/f539fda976303cd09b075b23fb971a78.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/c3265d8bb35325df5394d8ef6023703c.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/7ad6e481c3d16edeb0847996263dcaba.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/5021ecbef987a7dbc2346f54d557606a.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/519894743f84aee6a4bc9f5f239b2439.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/b575529da68f06d90ec25633b80e1db1.jpg" \ \ \ \ ] #相册图片 + #男生相册 + ${man_imgUrllist} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/30464b28455d6ddbc1f049ce4adfda7a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c7c968a93cff69375df767aefe112da4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e1c238e45a3c9264b83c0b1d4054019.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/0c1e15d1c956cb8bb678b2a1f7992f76.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/aea0caca25438b7490305cd4c704d515.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/14eee17ccd0333cda335d68004885f1f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/863db444113cabe238ce37e1ff12d8c8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/42e77d2434934a6fc24638fd5bf130d6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/122668a4d1cc4fcffd91fc3d2934fc8b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/24ef3e3c4e781b97c9e3da52cc2a6a88.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c91757deace453ee22c3d12ea9913bd0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b2b34146d7354dab2d7a7c6e65395762.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/905cbc906449e997be51c6b129c9481e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/18a7ce70dbba030da53442f0ad55e63b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/991c4bc6f06c1c3fb1d6a9a5178ee34c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/df8705ac114d936428d0765f78fc3af8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5d4eeebbf9f7df899a8964d3c802a2b7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/61971786fabc9be4718e10f9323649ef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f99a80033c77b990f9d2c75c2e6b6c1e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6647f59b5f8057c9aa67324261153cdd.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/fde465e0db7e83a6a29ad133c270c8ba.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/647e941c007594cd32d977b172efe58a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ca8faec9558e2aae046f8620fd21fed6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82e53568724f2010025231a600fd78b2.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e40ca792f19cb70f045ebfe04c57c52c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e62e2e3ad1b53d20a933a651c958201.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7f7e09f9c1f83b68de7967df210716d4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/3d9ccb6c9206e28c3dd6104d38eccd19.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ccc7a8fea47b80921b7cc790c87d6bc1.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/71a5453ecfd81a21c7fbbbcea50ec6ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bc07ad3c778a592b48a48a01a6e6bcee.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/228b58091bcdac00789bcefd77886cf2.jpg"] + ${manimgUrl_data} Evaluate random.sample(${man_imgUrllist},2) random,string #随机获取3张图片 + ${manimgUrl_List} Evaluate demjson.encode(${manimgUrl_data}) demjson + #女生相册 + ${woman_imgUrllist} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/71e2ac4806378e5c6f29e2e9d01f1b3b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/cd5dda0a1f539861cc78f1bef4a8e8ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82d51050e13fea977a054a0208d1e616.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c6fc977ab1effc2f57c1b61ea0b4a10b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/59aae418037d0bf103f63de805eeb86b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/960b3d371ed4af8788c1fc4a8c889933.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/884c65f91e6b346bb7c9e26e750ce4d3.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c5e4bca3b533fdfbcc2557e83512215c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bbef238ab2bea9bd3e831d0e9d9557e4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/1c771bf0c01eb0e5fab3fede9dab7608.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6df02f3978e72f14fb2b33b9a3e56fe9.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c9525ae0873fe94a5dd15a01717c07a0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/417ebe61e78592b42d212eb00a2ec23c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/1adabba412cc81d3fa40fdf78eba46d7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/afcf0ad64c7224a8a08163cc98ef6cb6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/84b55bb41fcf7350d2c86d0d518bf546.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/80d9c390581014ea327efabc749cf042.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7ea11516b07156a1bcfa227c4fef9207.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/abae88e4e07536531d0ac7d03f7f576b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/a2826ad22aab2d082bb3598b387f1689.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b26399e635fa7dd44808342595fa334a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b3a641d16e9e547228a8ccbc8e7e5aef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/cc28a387d249a8673a0cd24cf9e49896.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7615cc23bd2cf922e50e5fb3810e749f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/d0d15693e059e2525d4ea469451e4387.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f43b18d37584c0797d8ef3606d578a11.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/55f9f41f1ff9f2b71837af94ec02126a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/af74f07f326842a4c958f855ce11544b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/753745c3d3bdbffc9fecff9b3869d880.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5e3fb99b37448612749dd8b3fc5cf917.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/91b79f1e3eb2b13fa334de8157a6b9be.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/94ebc0dc461bea0feea8876620a922fb.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e94e9f29216a38527dbdc3aa75f7f415.jpg"] + ${womanimgUrl_data} Evaluate random.sample(${woman_imgUrllist},3) random,string #随机获取5张图片 + ${womanimgUrl_List} Evaluate demjson.encode(${womanimgUrl_data}) demjson ${Code} Evaluate 6 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable { \ \ \ \ "authenticationCode": "${Code}", \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${imgUrl_list} } + ${data} Set Variable If ${genderCode}==1 { \ \ \ \ "authenticationCode": "${Code}", \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${womanimgUrl_List} } { \ \ \ \ "authenticationCode": "${Code}", \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${manimgUrl_List} } + #${data} Set Variable { \ \ \ \ "authenticationCode": "${Code}", \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${imgUrl_list} } ${reps} POST On Session dating dating-agency-service/user/save/certification/audit ${data.encode('utf-8')} ${auditId} Get From Dictionary ${reps.json()} data #相册审核id ${message} Get From Dictionary ${reps.json()} message @@ -184,8 +192,8 @@ Resource ../../../0-Login/LoginResource.robot ${reps} GET On Session dating dating-agency-service/user/get/constellation/list ${data} Get From Dictionary ${reps.json()} data ${ConstellationData} Evaluate random.choice(${data}) random #随机获取星座json - ${constellation} Get From Dictionary ${ConstellationData} constellation #获取星座名称 - ${constellationCode} Get From Dictionary ${ConstellationData} constellationCode #获取星座编码 + ${constellation} Get From Dictionary ${ConstellationData} desc #获取星座名称 + ${constellationCode} Get From Dictionary ${ConstellationData} value #获取星座编码 Set Global Variable ${constellation} Set Global Variable ${constellationCode} END @@ -205,8 +213,8 @@ Resource ../../../0-Login/LoginResource.robot ${reps} GET On Session dating dating-agency-service/user/get/account/type ${data} Get From Dictionary ${reps.json()} data #获取户口类型字典 ${accounttypeData} Evaluate random.choice(${data}) random #随机获取户口类型 - ${accountTypeCode} Get From Dictionary ${accounttypeData} accountTypeCode #户口类型编码 - ${accountTypeName} Get From Dictionary ${accounttypeData} accountTypeName #户口类型名称 + ${accountTypeCode} Get From Dictionary ${accounttypeData} value #户口类型编码 + ${accountTypeName} Get From Dictionary ${accounttypeData} desc #户口类型名称 Set Global Variable ${accountTypeCode} Set Global Variable ${accountTypeName} END @@ -221,11 +229,11 @@ Resource ../../../0-Login/LoginResource.robot 提交${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}", \ \ \ \ "nativePlaceName": "${provinceName}", \ \ \ \ "nativePlaceCode": "${provinceCode}" } - ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${data.encoede('utf-8')} + ${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 END @@ -315,3 +323,45 @@ Resource ../../../0-Login/LoginResource.robot Should Be Equal As Strings ${message} successful END [Return] ${phone} #返回获取的值 + +提交${dating}征婚人的购车情况 + #购车数据 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/car/purchase/situation + ${data} Get From Dictionary ${reps.json()} data + ${carPurchaseSituationData} Evaluate random.choice(${data}) random #随机获取购车情况 + ${carPurchaseSituation} Get From Dictionary ${carPurchaseSituationData} desc #购车情况 + ${carPurchaseSituationCode} Get From Dictionary ${carPurchaseSituationData} value #购车编码 + Set Global Variable ${carPurchaseSituation} + Set Global Variable ${carPurchaseSituationCode} + END + #提交征婚人购车情况 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "carPurchaseSituation": "${carPurchaseSituation}", \ \ \ \ "carPurchaseSituationCode": ${carPurchaseSituationCode} } + ${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 + END + +提交${dating}征婚人的购房情况 + #购房数据 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/property/permits + ${data} Get From Dictionary ${reps.json()} data + ${propertyPermitsData} Evaluate random.choice(${data}) random #随机获取购房情况 + ${propertyPermits} Get From Dictionary ${propertyPermitsData} desc #购房情况 + ${propertyPermitsCode} Get From Dictionary ${propertyPermitsData} value #购房编码 + Set Global Variable ${propertyPermits} + Set Global Variable ${propertyPermitsCode} + END + #提交征婚人购房情况 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "propertyPermits": "${propertyPermits}", \ \ \ \ "propertyPermitsCode": ${propertyPermitsCode} } + ${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 + END diff --git a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot index 0a5ffe4..29bfef8 100644 --- a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot @@ -68,3 +68,11 @@ Resource ../../../0-Login/LoginResource.robot 添加征婚人联系方式 Given 查询婚介征婚人的资料信息 When 提交婚介征婚人的联系方式 + +提交征婚人的购车情况 + Given 查询婚介征婚人的资料信息 + When 提交婚介征婚人的购车情况 + +提交征婚人的购房情况 + Given 查询婚介征婚人的资料信息 + When 提交婚介征婚人的购房情况 diff --git a/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot index a1837fd..67ecfcf 100644 --- a/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot @@ -50,6 +50,11 @@ Resource Selection.robot When 查询婚介征婚人择偶条件数据 And 提交婚介征婚人的择偶条件-户籍 +提交征婚人的择偶条件-体型 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-体型 + 提交征婚人的择偶条件-职业要求 Given 查询婚介用户资料 When 查询婚介征婚人择偶条件数据 diff --git a/1-Applet/2-Homepage/MarriageInfo/Selection.robot b/1-Applet/2-Homepage/MarriageInfo/Selection.robot index e23425e..db5e44b 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Selection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Selection.robot @@ -4,6 +4,7 @@ Library String Library Collections Library RequestsLibrary Library DatabaseLibrary +Resource ../../1-WriteInfo/InfoResource.robot *** Keywords *** region @@ -51,7 +52,7 @@ region END 提交${dating}征婚人择偶条件-户口所在地 - region + region固定省市 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "domicilePlaceProvinceCode": ${provinceCode}, \ \ \ \ "domicilePlaceProvinceName": "${provinceName}", \ \ \ \ "domicilePlaceCityCode": ${cityCode}, \ \ \ \ "domicilePlaceCityName": "${cityName}" } @@ -73,7 +74,7 @@ region FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${minAge} Evaluate random.randint(18,28) random #随机获取最小择偶年龄 - ${maxAge} Evaluate random.randint(${minAge},28) random #随机获取最大择偶年龄 + ${maxAge} Evaluate random.randint(${minAge},48) random #随机获取最大择偶年龄 ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "minAge": ${minAge}, \ \ \ \ "maxAge": ${maxAge} } ${reps} POST On Session dating dating-agency-service/user/save/demand/marriage ${data.encode('utf-8')} ${message} Get From Dictionary ${reps.json()} message @@ -115,8 +116,8 @@ region 提交${dating}征婚人的择偶条件-收入范围 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${minIncome} Evaluate random.randint(9000,10000) random #随机获取最小择偶收入 - ${maxIncome} Evaluate random.randint(${minIncome},50000) random #随机获取最大择偶收入 + ${minIncome} Evaluate random.randrange(9000,10000,1000) random #随机获取最小择偶收入,1000的倍数 + ${maxIncome} Evaluate random.randrange(${minIncome},50000,1000) random #随机获取最大择偶收入 ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "minIncome": ${minIncome}, \ \ \ \ "maxIncome": ${maxIncome} } ${reps} POST On Session dating dating-agency-service/user/save/demand/marriage ${data.encode('utf-8')} ${message} Get From Dictionary ${reps.json()} message @@ -159,7 +160,7 @@ region #提交征婚人的择偶民族数据 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "nation": ${nation}, \ \ \ \ "nationCode": ${nationCode} } + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "nation": "${nation}", \ \ \ \ "nationCode": ${nationCode} } ${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 @@ -180,7 +181,7 @@ region #提交征婚人择偶的户口类型 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "accountTypeName": ${accountTypeName}, \ \ \ \ "accountTypeCode": ${accountTypeCode} } + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "accountTypeName": "${accountTypeName}", \ \ \ \ "accountTypeCode": ${accountTypeCode} } ${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 @@ -188,11 +189,11 @@ region 提交${dating}征婚人的择偶条件-户籍 #提交征婚人的籍贯信息 - region + #region FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "nativePlaceName": "${provinceName}", \ \ \ \ "nativePlaceCode": "${provinceCode}" } - ${reps} POST On Session dating dating-agency-service/user/save/demand/marriage ${data.encoede('utf-8')} + ${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 @@ -218,7 +219,7 @@ region #提交职业信息 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "occupation": "${industry}~${occupation}", \ \ \ \ "occupationCode": "occupationCode" } + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "occupation": "${industry}~${occupation}", \ \ \ \ "occupationCode":${occupationCode}} ${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 @@ -276,3 +277,22 @@ region ${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} + ${reps} GET On Session dating dating-agency-service/user/get/bodily/form/list + ${data} Get From Dictionary ${reps.json()} data + ${shapeData} Evaluate random.choice(${data}) random + ${bodilyForm} Get From Dictionary ${shapeData} desc #体型 + ${bodilyFormCode} Get From Dictionary ${shapeData} value #体型编号 + END + #提交择偶要求-体型 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${Data} Set Variable {"miId":"${miId}","bodilyForm":"${bodilyForm}","bodilyFormCode":${bodilyFormCode}} + ${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 diff --git a/output/log.html b/output/log.html index 27d1f14..b8668fb 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};