diff --git a/2-Homepage/MarriageInfo/MateSelection.robot b/2-Homepage/MarriageInfo/MateSelection.robot index d85e128..1924cc8 100644 --- a/2-Homepage/MarriageInfo/MateSelection.robot +++ b/2-Homepage/MarriageInfo/MateSelection.robot @@ -19,3 +19,43 @@ Resource Selection.robot Given 查询婚介用户资料 When 查询婚介征婚人择偶条件数据 And 提交婚介征婚人的择偶条件-学历 + +提交征婚人的择偶条件-收入范围 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-收入范围 + +提交征婚人的择偶条件-婚姻状况 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-婚姻状况 + +提交征婚人的择偶条件-民族 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-民族 + +提交征婚人的择偶条件-户口类型 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-户口 + +提交征婚人的择偶条件-户籍 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-户籍 + +提交征婚人的择偶条件-职业要求 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-职业 + +提交征婚人的择偶条件-购车情况 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-购车情况 + +提交征婚人的择偶条件-购房情况 + Given 查询婚介用户资料 + When 查询婚介征婚人择偶条件数据 + And 提交婚介征婚人的择偶条件-购房情况 diff --git a/2-Homepage/MarriageInfo/Selection.robot b/2-Homepage/MarriageInfo/Selection.robot index 1863f93..fce9209 100644 --- a/2-Homepage/MarriageInfo/Selection.robot +++ b/2-Homepage/MarriageInfo/Selection.robot @@ -123,8 +123,155 @@ region 提交${dating}征婚人的择偶条件-婚姻状况 #查询婚姻状况,随机获取 - FOR ${client_header} IN ${Cheader_list} + FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-service/user/get/marital/status/list ${data_list} Get From Dictionary ${reps.json()} data ${maritalStatusData} Evaluate random.choice(${data_list}) random #随机获取 + ${maritalStatusCode} Get From Dictionary ${maritalStatusData} value #婚介状况编码 + ${maritalStatusName} Get From Dictionary ${maritalStatusData} desc #婚介状况名称 + Set Global Variable ${maritalStatusCode} + Set Global Variable ${maritalStatusName} + END + #提交择偶婚姻状况 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "maritalStatusName": ${maritalStatusName}, \ \ \ \ "maritalStatusCode": ${maritalStatusCode} } + ${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 + 111 + +提交${dating}征婚人的择偶条件-民族 + #查询民族数据并随机获取 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/nation/list + ${data} Get From Dictionary ${reps.json()} data + ${nationData} Evaluate random.choice(${data}) random #随机获取名族数据 + ${nation} Get From Dictionary ${nationData} cn #民族名称 + ${nationCode} Get From Dictionary ${nationData} id #民族编码 + Set Global Variable ${nation} + Set Global Variable ${nationCode} + END + #提交征婚人的择偶民族数据 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${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 + 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/account/type + ${data} Get From Dictionary ${reps.json()} data + ${accountData} Evaluate random.choice(${data}) random #随机获取户口类型 + ${accountTypeCode} Get From Dictionary ${accountData} value #户口编码 + ${accountTypeName} Get From Dictionary ${accountData} desc #户口名称 + Set Global Variable ${accountTypeCode} + Set Global Variable ${accountTypeName} + END + #提交征婚人择偶的户口类型 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${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 + END + +提交${dating}征婚人的择偶条件-户籍 + #提交征婚人的籍贯信息 + 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')} + ${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/occupation/list + ${data} Get From Dictionary ${reps.json()} data #获取职业字典 + ${industryData} Evaluate random.choice(${data}) random #随机获取职业一级分类 + ${industry} Get From Dictionary ${industryData} industry #职业大类名称 + ${industryCode} Get From Dictionary ${industryData} industryCode #职业大类编码 + ${occupationList} Get From Dictionary ${industryData} occupationList #获取职业二级分类 + ${occupationData} Evaluate random.choice(${occupationList}) random + ${occupation} Get From Dictionary ${occupationData} occupation #职业名称 + ${occupationCode} Get From Dictionary ${occupationData} occupationCode #职业编码 + Set Global Variable ${industry} + Set Global Variable ${occupation} + Set Global Variable ${industryCode} + Set Global Variable ${occupationCode} + END + #提交职业信息 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${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 + END + +提交${dating}征婚人的择偶条件-是否独生子女 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${onlyChild_list} Create List 1 0 + ${onlyChild} Evaluate random.choice(${onlyChild_list}) random + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "onlyChild": ${onlyChild} } + ${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} + ${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 ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "carPurchaseSituation": "${carPurchaseSituation}", \ \ \ \ "carPurchaseSituationCode": ${carPurchaseSituationCode} } + ${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} + ${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 ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "propertyPermits": "${propertyPermits}", \ \ \ \ "propertyPermitsCode": ${propertyPermitsCode} } + ${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