diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index d908fd9..443de94 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -18548157976 \ No newline at end of file +19128859944 \ No newline at end of file diff --git a/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot b/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot index c141958..bfd5418 100644 --- a/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot +++ b/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot @@ -1,5 +1,47 @@ *** Settings *** Documentation 高级搜索 +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml Resource AdvancedsearchResource.robot *** Test Cases *** +高级搜索条件-户口所在地 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 是否有婚介高级搜索权限 + Then 用户查询婚介高级搜索列表-户口所在地 + And 数据库查询征婚资料数量-户口所在地 + +高级搜索条件-已实名 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 是否有婚介高级搜索权限 + Then 用户查询婚介高级搜索列表-已实名 + And 数据库查询征婚资料数量-已实名 + +高级搜索条件-户口类型 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 是否有婚介高级搜索权限 + Then 用户查询婚介高级搜索列表-户口类型 + And 数据库查询征婚资料数量-户口类型 + +高级搜索条件-是否独生 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 是否有婚介高级搜索权限 + Then 用户查询婚介高级搜索列表-是否独生 + And 数据库查询征婚资料数量-是否独生 + +高级搜索条件-是否购车 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 是否有婚介高级搜索权限 + Then 用户查询婚介高级搜索列表-是否购车 + And 数据库查询征婚资料数量-是否购车 + +高级搜索条件-是否购房 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 是否有婚介高级搜索权限 + Then 用户查询婚介高级搜索列表-是否购房 + And 数据库查询征婚资料数量-是否购房 diff --git a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot index 53778cd..4c8f6fa 100644 --- a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot +++ b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot @@ -3,6 +3,7 @@ Library urllib3 Library Collections Library RequestsLibrary Library DatabaseLibrary +Library DateTime *** Keywords *** 查询${dating}征婚人的资料信息 @@ -29,35 +30,221 @@ Library DatabaseLibrary ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/details/byid params=miId=${miId} ${age} Get From Dictionary ${reps.json()['data']} age #年龄 ${height} Get From Dictionary ${reps.json()['data']} height #获取征婚人身高 - ${cityCode} Get From Dictionary ${reps.json()['data']} cityCode #现居城市 ${birthYear} Get From Dictionary ${reps.json()['data']} birthYear #出生年份 ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #性别 + ${cityCode} Get From Dictionary ${reps.json()['data']} domicilePlaceCityCode #户口所在市编码 + ${cityName} Get From Dictionary ${reps.json()['data']} domicilePlaceCityName #户口所在市名称 + ${provinceCode} Get From Dictionary ${reps.json()['data']} domicilePlaceProvinceCode #户口所在省编码 + ${provinceName} Get From Dictionary ${reps.json()['data']} domicilePlaceProvinceName #户口所在省名称 END Set Global Variable ${age} Set Global Variable ${height} Set Global Variable ${cityCode} + Set Global Variable ${cityName} Set Global Variable ${birthYear} Set Global Variable ${genderCode} + Set Global Variable ${provinceCode} + Set Global Variable ${provinceName} 是否有${dating}高级搜索权限 #高级搜索权益判断 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-mall/user/list/right/by/customer params=miId=${miId}&type=302 #302高级搜索 - ${data} Get From Dictionary ${reps.json()} data #获取权益信息 - Run Keyword If ${data}==[] 数据库添加高级搜索权益 + ${data_list} Get From Dictionary ${reps.json()} data #获取权益信息 + Set Global Variable ${data_list} + Run Keyword If ${data_list}==[] 数据库新增高级搜索权益 + ... ELSE 用户高级搜索权益 END +用户高级搜索权益 + FOR ${data} IN @{data_list} + ${enable} Get From Dictionary ${data} enable #判断是否可用 + Set Global Variable ${enable} + END + +用户查询${dating}高级搜索列表-户口所在地 + #户口所在地查询 + #region固定省市-广州 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&domicilePlaceProvinceCode=${provinceCode}&domicilePlaceProvinceName=${provinceName}&domicilePlaceCityCode=${cityCode}&domicilePlaceCityName=${cityName}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + Set Global Variable ${total} + END + +数据库查询征婚资料数量-户口所在地 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `domicile_place_province_code` = '${provinceCode}' AND `domicile_place_city_code` = '${cityCode}' #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database + +用户查询${dating}高级搜索列表-已实名 + #高级搜索是否已实名 + ${realNameAudit} Set Variable 1 #已实名 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&realNameAudit=${realNameAudit}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + END + Set Global Variable ${total} + Set Global Variable ${realNameAudit} + +数据库查询征婚资料数量-已实名 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `identity_card` IS NOT NULL #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database + +用户查询${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 #获取户口类型字典 + ${accounttypeData} Evaluate random.choice(${data}) random #随机获取户口类型 + #${accounttypeData} Get From List ${data} 1 #0城市，1农村 + ${accountTypeCode} Get From Dictionary ${accounttypeData} value #户口类型编码 + ${accountTypeName} Get From Dictionary ${accounttypeData} desc #户口类型名称 + END + #高级搜索-户口类型 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&accountTypeName=${accountTypeName}&accountTypeCode=${accountTypeCode}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + END + Set Global Variable ${total} + Set Global Variable ${accountTypeCode} + Set Global Variable ${accountTypeName} + +数据库查询征婚资料数量-户口类型 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `account_type_code` = '${accountTypeCode}' #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database + +用户查询${dating}高级搜索列表-是否独生 + #高级搜索-是否独生 + ${onlyChildList} Create List 0 1 #0否，1是 + ${onlyChild} Evaluate random.choice(${onlyChildList}) random #随机选择是否独生 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&onlyChild=${onlyChild}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + END + Set Global Variable ${total} + Set Global Variable ${onlyChild} + +数据库查询征婚资料数量-是否独生 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `only_child` = '${onlyChild}' #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database + +用户查询${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 #随机获取购车情况 + #${carPurchaseSituationData} Get From List ${data} 0 #0已购车，1未购车 + ${carPurchaseSituation} Get From Dictionary ${carPurchaseSituationData} desc #购车情况 + ${carPurchaseSituationCode} Get From Dictionary ${carPurchaseSituationData} value #购车编码 + END + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&carPurchaseSituation=${carPurchaseSituation}&carPurchaseSituationCode=${carPurchaseSituationCode}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + END + Set Global Variable ${total} + Set Global Variable ${carPurchaseSituation} + Set Global Variable ${carPurchaseSituationCode} + +数据库查询征婚资料数量-是否购车 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `car_purchase_situation_code` = '${carPurchaseSituationCode}' #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database + +用户查询${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 #随机获取购房情况 + #${propertyPermitsData} Get From List ${data} 0 #0家人同住，1已购房，2租房，3婚后购房，4单位宿舍 + ${propertyPermits} Get From Dictionary ${propertyPermitsData} desc #购房情况 + ${propertyPermitsCode} Get From Dictionary ${propertyPermitsData} value #购房编码 + END + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&propertyPermits=${propertyPermits}&propertyPermitsCode=${propertyPermitsCode}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + END + Set Global Variable ${total} + Set Global Variable ${propertyPermits} + Set Global Variable ${propertyPermitsCode} + +数据库查询征婚资料数量-是否购房 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `property_permits_code` = '${propertyPermitsCode}' #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database + +region固定省市-广州 + Disable Warnings + Create Session region http://qncloud.oss-cn-shenzhen.aliyuncs.com + ${reps} GET On Session region address.json + ${local_data} Get From Dictionary ${reps.json()} data + FOR ${province} IN @{local_data} #省列表数据 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + Exit For Loop If '${provinceName}'=='广东省' + END + ${city_data} Get From Dictionary ${province} children #广东省市列表数据 + FOR ${city} IN @{city_data} + ${cityCode} Get From Dictionary ${city} value #获取市编码 + ${cityName} Get From Dictionary ${city} label #获取市名称 + Exit For Loop If '${cityName}'=='广州市' + END + ${district_data} Get From Dictionary ${city} children #广州市列表数据 + log ${district_data} + ${district} Evaluate random.choice(${district_data}) random + ${districtCode} Get From Dictionary ${district} value #随机获取广州市区编码 + ${districtName} Get From Dictionary ${district} label #随机获取广州市区名称 + Set Global Variable ${cityCode} + Set Global Variable ${cityName} + Set Global Variable ${districtCode} + Set Global Variable ${districtName} + Set Global Variable ${provinceCode} + Set Global Variable ${provinceName} + 数据库新增高级搜索权益 FOR ${userId} ${miId} IN ZIP ${userid_list} ${miId_list} ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S ${Time} Add Time To Date ${dataTime} 30 days Connect To Database Using Custom Params pymysql database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 101, '${dataTime}', '${Time}', 1) #插入一条学历认证数据 - ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '101' #查询权益id + ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 302, '${dataTime}', '${Time}', 1) #插入一条高级搜索 + ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '302' #查询权益id ${right_id} Set Variable ${check_1[0][0]} ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '规格', 1, 102, NULL) - ${insert_3} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益上限额度', 2, 1, '10') - ${insert_4} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益剩余额度', 3, 1, '10') + ${insert_3} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益上限额度', 2, 1, '140') + ${insert_4} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益剩余额度', 3, 1, '130') Disconnect From Database END diff --git a/1-Applet/2-Homepage/BlindDate/NormalSearch.robot b/1-Applet/2-Homepage/BlindDate/NormalSearch.robot index 5ff742f..cc4c6a4 100644 --- a/1-Applet/2-Homepage/BlindDate/NormalSearch.robot +++ b/1-Applet/2-Homepage/BlindDate/NormalSearch.robot @@ -16,11 +16,11 @@ Resource NormalsearchResource.robot When 用户查询婚介搜索列表-无条件 Then 数据库查询征婚资料数量-无条件 -用户搜索征婚资料-未婚 +用户搜索征婚资料-婚姻状况 Given 查询婚介征婚人的资料信息 And 查询婚介征婚人资料 - When 用户查询婚介搜索列表-未婚 - Then 数据库查询征婚资料数量-未婚 + When 用户查询婚介搜索列表-婚姻状况 + Then 数据库查询征婚资料数量-婚姻状况 用户搜索征婚资料-现居地 Given 查询婚介征婚人的资料信息 diff --git a/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot index 0037e7c..89177d4 100644 --- a/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot +++ b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot @@ -1,5 +1,6 @@ *** Settings *** Library urllib3 +Library String Library Collections Library RequestsLibrary Library DatabaseLibrary @@ -29,15 +30,25 @@ Library DatabaseLibrary ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/details/byid params=miId=${miId} ${age} Get From Dictionary ${reps.json()['data']} age #年龄 ${height} Get From Dictionary ${reps.json()['data']} height #获取征婚人身高 - ${cityCode} Get From Dictionary ${reps.json()['data']} cityCode #现居城市 + ${cityCode} Get From Dictionary ${reps.json()['data']} cityCode #现居市编码 + ${cityName} Get From Dictionary ${reps.json()['data']} cityName #现居市名称 ${birthYear} Get From Dictionary ${reps.json()['data']} birthYear #出生年份 + ${education} Get From Dictionary ${reps.json()['data']} education #学历名称 ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #性别 + ${provinceCode} Get From Dictionary ${reps.json()['data']} provinceCode #现居省编码 + ${provinceName} Get From Dictionary ${reps.json()['data']} provinceName #现居省名称 + ${educationCode} Get From Dictionary ${reps.json()['data']} educationCode #学历编码 END Set Global Variable ${age} Set Global Variable ${height} Set Global Variable ${cityCode} + Set Global Variable ${cityName} Set Global Variable ${birthYear} + Set Global Variable ${education} Set Global Variable ${genderCode} + Set Global Variable ${provinceCode} + Set Global Variable ${provinceName} + Set Global Variable ${educationCode} 查看${dating}平台相亲列表 #相亲推荐页 @@ -90,26 +101,29 @@ Library DatabaseLibrary Should Be Equal As Numbers ${count} ${total} Disconnect From Database -用户查询${dating}搜索列表-未婚 +用户查询${dating}搜索列表-婚姻状况 #微醺条件搜索 + ${StatusCode} Create List 0 1 2 + ${maritalCode} Evaluate random.choice(${StatusCode}) random #随机获取多个婚姻状况 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=false&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&maritalStatusCode=0&unlock=0&pageNum=1&pageSize=1000 + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=false&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&maritalStatusCode=${maritalCode}&unlock=0&pageNum=1&pageSize=1000 ${total} Get From Dictionary ${reps.json()['data']} total Set Global Variable ${total} END + Set Global Variable ${maritalCode} -数据库查询征婚资料数量-未婚 +数据库查询征婚资料数量-婚姻状况 Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' ${genderCode} Set Variable If ${genderCode}==1 0 1 - ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `marital_status_code` = '0' #查询数据库资料数量 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `marital_status_code` = '${maritalCode}' #查询数据库资料数量 ${count} Set Variable ${check[0][0]} Should Be Equal As Numbers ${count} ${total} Disconnect From Database 用户查询${dating}搜索列表-现居地 #无条件搜索 - region固定省市-广州 + #region固定省市-广州 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=false&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&provinceCode=${provinceCode}&provinceName=${provinceName}&cityCode=${cityCode}&cityName=${cityName}&unlock=0&pageNum=1&pageSize=1000 @@ -120,7 +134,7 @@ Library DatabaseLibrary 数据库查询征婚资料数量-现居地 Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' ${genderCode} Set Variable If ${genderCode}==1 0 1 - ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `province_code` = '${provinceCode}' AND `province_name` = '${provinceName}' AND `city_code` = '${cityCode}' AND `city_name` = '${cityName}' #查询数据库资料数量 + ${check} Query SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `province_code` = '${provinceCode}' AND `city_code` = '${cityCode}' #查询数据库资料数量 ${count} Set Variable ${check[0][0]} Should Be Equal As Numbers ${count} ${total} Disconnect From Database @@ -155,7 +169,7 @@ region固定省市-广州 用户查询${dating}搜索列表-学历 #微醺条件搜索 - 选择婚介征婚人的学历 + #选择婚介征婚人的学历 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=false&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&educationCode=${educationCode}&education=${education}&unlock=0&pageNum=1&pageSize=1000 diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot index bba1212..47c7b3e 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -183,7 +183,7 @@ Resource ../../../0-Login/LoginResource.robot #${start-year} Evaluate 1950 #${end-year} Evaluate ${get_year}-18 #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 - ${birthYear} Evaluate ${get_year}-28 #固定年龄 + ${birthYear} Evaluate ${get_year}-29 #固定年龄 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable {"id":"${miId}","birthYear":${birthYear}} diff --git a/output/log.html b/output/log.html index 3000c4e..5a876cc 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,28 @@ function stopPropagation(event) { window.output = {}; +