条件搜索

0-Login/phone-test.txt

@@ -1,2 +1,2 @@
 手机号
-18898674523
+18873415690

1-Applet/2-Homepage/BlindDate/Blind.robot

@@ -12,5 +12,23 @@ Resource          BlindResource.robot
 用户搜索征婚资料-无条件
     Given 查询婚介征婚人的资料信息
     And 查询婚介征婚人资料
-    When 用户查询婚介搜索列表
-    Then 数据库查询征婚资料数量
+    When 用户查询婚介搜索列表-无条件
+    Then 数据库查询征婚资料数量-无条件
+
+用户搜索征婚资料-未婚
+    Given 查询婚介征婚人的资料信息
+    And 查询婚介征婚人资料
+    When 用户查询婚介搜索列表-未婚
+    Then 数据库查询征婚资料数量-未婚
+
+用户搜索征婚资料-现居地
+    Given 查询婚介征婚人的资料信息
+    And 查询婚介征婚人资料
+    When 用户查询婚介搜索列表-现居地
+    Then 数据库查询征婚资料数量-现居地
+
+用户搜索征婚资料-学历
+    Given 查询婚介征婚人的资料信息
+    And 查询婚介征婚人资料
+    When 用户查询婚介搜索列表-学历
+    Then 数据库查询征婚资料数量-学历

1-Applet/2-Homepage/BlindDate/BlindResource.robot

@@ -73,7 +73,8 @@ Library           DatabaseLibrary
     Set Global Variable    ${age_list}
     Set Global Variable    ${height_list}
 
-用户查询${dating}搜索列表
+用户查询${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&unlock=0&pageNum=1&pageSize=1000
@@ -81,10 +82,105 @@ Library           DatabaseLibrary
         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'    #查询数据库资料数量
     ${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/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
+        ${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 `marital_status_code` = '0'    #查询数据库资料数量
+    ${count}    Set Variable    ${check[0][0]}
+    Should Be Equal As Numbers    ${count}    ${total}
+    Disconnect From Database
+
+用户查询${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=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
+        ${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 `province_code` = '${provinceCode}' AND `province_name` = '${provinceName}' AND `city_code` = '${cityCode}' AND `city_name` = '${cityName}'    #查询数据库资料数量
+    ${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/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
+        ${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 `education_code` = '${educationCode}' AND `education` = '${education}'    #查询数据库资料数量
+    ${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/education/list
+        ${data_list}    Get From Dictionary    ${reps.json()}    data
+        ${education_data}    Evaluate    random.choice(${data_list})    random    #随机获取学历
+        #${education_data}    Get From List    ${data_list}    3    #0高中以下，1中专，2大专，3本科。4硕士，5博士
+        ${education}    Get From Dictionary    ${education_data}    desc    #学历名称
+        ${educationCode}    Get From Dictionary    ${education_data}    value    #学历编码
+        Set Global Variable    ${education}
+        Set Global Variable    ${educationCode}
+    END
+
+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}

1-Applet/2-Homepage/MarriageInfo/Authentication.robot

@@ -385,7 +385,7 @@ Resource          ../../../0-Login/LoginResource.robot
         Set Global Variable    ${education}
         Set Global Variable    ${educationCode}
     END
-    #提交择偶学历
+    #提交个人资料学历
     FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
         Create Session    dating    ${${dating}.dating域名}    ${client_header}
         ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "education": "${education}", \ \ \ \ "educationCode": ${educationCode} }

output/report.html

@@ -1629,22 +1629,22 @@ storage = function () {
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[1,0,1272],[[4,5,6,7,[],[1,18,591],[[8,9,10,11,[],[1,19,589],[],[[12,0,0,[],[1,311,297],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,610,661],[[16,17,18,0,[],[1,612,658],[[19,20,21,22,[],[1,613,657],[[23,24,25,0,[],[1,614,655],[],[[26,0,0,[],[1,624,644],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[2,2,0,0]];
+window.output["suite"] = [1,2,3,0,[],[1,0,3536],[[4,5,6,7,[],[1,16,475],[[8,9,10,11,[],[1,18,472],[],[[12,0,0,[],[1,276,213],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,492,3043],[[16,17,18,0,[],[1,493,3041],[[19,20,21,22,[],[1,495,3038],[[23,24,25,0,[],[1,496,3035],[],[[26,0,0,[],[1,511,271],[]],[27,0,0,[],[1,783,604],[]],[28,0,0,[],[1,1387,495],[]],[29,0,0,[],[1,1882,1232],[]],[30,0,0,[],[1,3114,416],[]]],[],[5,5,0,0]]],[],[],[5,5,0,0]]],[],[],[5,5,0,0]]],[],[],[5,5,0,0]]],[],[],[6,6,0,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
 </script>
 <script type="text/javascript">
-window.output["strings"] = window.output["strings"].concat(["*","*Dating-agency","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency","*..","*0-Login","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login","*../0-Login","*<p>用户登录婚介平台\x3c/p>","*Login-interface","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login\\Login-interface.robot","*../0-Login/Login-interface.robot","*<p>接口：短信验证码登录认证\x3c/p>","*手机号验证码登录-888888","*1-Applet","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet","*../1-Applet","*2-Homepage","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage","*../1-Applet/2-Homepage","*BlindDate","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\BlindDate","*../1-Applet/2-Homepage/BlindDate","*<p>相亲页面\x3c/p>","*Blind","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\BlindDate\\Blind.robot","*../1-Applet/2-Homepage/BlindDate/Blind.robot","*用户搜索征婚资料-无条件"]);
+window.output["strings"] = window.output["strings"].concat(["*","*Dating-agency","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency","*..","*0-Login","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login","*../0-Login","*<p>用户登录婚介平台\x3c/p>","*Login-interface","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login\\Login-interface.robot","*../0-Login/Login-interface.robot","*<p>接口：短信验证码登录认证\x3c/p>","*手机号验证码登录-888888","*1-Applet","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet","*../1-Applet","*2-Homepage","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage","*../1-Applet/2-Homepage","*BlindDate","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\BlindDate","*../1-Applet/2-Homepage/BlindDate","*<p>相亲页面\x3c/p>","*Blind","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\BlindDate\\Blind.robot","*../1-Applet/2-Homepage/BlindDate/Blind.robot","*用户查看相亲推荐页","*用户搜索征婚资料-无条件","*用户搜索征婚资料-未婚","*用户搜索征婚资料-现居地","*用户搜索征婚资料-学历"]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:00:01","fail":0,"label":"All Tests","pass":2,"skip":0}],[],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":2,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.2-Homepage","name":"2-Homepage","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate","name":"BlindDate","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate.Blind","name":"Blind","pass":1,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:03","fail":0,"label":"All Tests","pass":6,"skip":0}],[],[{"elapsed":"00:00:04","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":6,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0},{"elapsed":"00:00:03","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":5,"skip":0},{"elapsed":"00:00:03","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.2-Homepage","name":"2-Homepage","pass":5,"skip":0},{"elapsed":"00:00:03","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate","name":"BlindDate","pass":5,"skip":0},{"elapsed":"00:00:03","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate.Blind","name":"Blind","pass":5,"skip":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1712131336969;
+window.output["baseMillis"] = 1712136970299;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 1297;
+window.output["generated"] = 3630;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;