no message

0-Login/Login-interface.robot

@@ -6,6 +6,10 @@ Library           String
 Library           Collections
 
 *** Test Cases ***
+游客使用婚介平台
+    #游客打开婚介平台
+    Given 游客登录婚介平台
+
 手机号验证码登录
     #登录婚介平台
     Given 读取TXT文件
@@ -77,10 +81,19 @@ Library           Collections
     #${img}    Evaluate    demjson.encode(${imgdata})    demjson
     #log    ${img}
     #追加字典
-    ${dictData}    Set Variable    [{"value":0,"desc":"偏瘦"},{"value":1,"desc":"正常"},{"value":2,"desc":"偏胖"},{"value":3,"desc":"肥胖"}]
+    #${dictData}    Set Variable    [{"value":0,"desc":"偏瘦"},{"value":1,"desc":"正常"},{"value":2,"desc":"偏胖"},{"value":3,"desc":"肥胖"}]
     #${dictData}    Evaluate    type(${dictData})
-    ${dict}    Set Variable    {"value":-1,"desc":"不限"}
-    Insert Into List    ${dictData}    0    [{"value":-1,"desc":"不限"}]
+    #${dict}    Set Variable    {"value":-1,"desc":"不限"}
+    #Insert Into List    ${dictData}    0    [{"value":-1,"desc":"不限"}]
+    #设置一个参数范围
+    ${age}    Evaluate    40
+    ${age_range}    Evaluate    list(range(${age}-9,${age}+10,1))
+    log    ${age_range}
+    ${Age}    Evaluate    [35,38,40,50]
+    FOR    ${i}    IN    @{Age}
+        Run Keyword If    ${i} in ${age_range}    log    在范围内
+        ...    ELSE    log    不在范围内
+    END
 
 数据库删除用户
     Given 读取TXT文件

0-Login/LoginResource.robot

@@ -25,6 +25,14 @@ Library           OperatingSystem
     ${phone}    Evaluate    ${num}${number}
     Set Global Variable    ${phone}
 
+游客登录${dating}平台
+    #游客登录婚介平台
+    Disable Warnings
+    Create Session    dating    ${${dating}.dating域名}    ${${dating}.CHeader}
+    ${reps}    GET On Session    dating    /dating-agency-service/user/get/marriage-information/tourist-recommend
+    ${message}    Get From Dictionary    ${reps.json()}    message
+    Should Be Equal As Strings    ${message}    successful
+
 用户获取${dating}平台短信验证码
     #用户获取婚介平台短信验证码
     Disable Warnings

0-Login/phone-test.txt

@@ -1,2 +1,2 @@
 手机号
-13977594623
+19128859944

1-Applet/1-WriteInfo/InfoResource.robot

@@ -138,7 +138,7 @@ Library           OperatingSystem
 选择${dating}征婚人的城市
     #选择城市
     #获取省市区
-    region固定省市-衡阳
+    region固定省市-广州
     #选择征婚人地区资料
     Disable Warnings
     ${Number}    Evaluate    1    #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
@@ -183,7 +183,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}-39    #固定年龄
+    ${year}    Evaluate    ${get_year}-42    #固定年龄
     ${Number}    Evaluate    3    #填写序号
     Create Session    dating    ${${dating}.dating域名}    ${client_header}
     ${Data}    Update Value To Json    ${Data}    $.id    ${DataId}

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

@@ -1,16 +0,0 @@
-*** Settings ***
-Library           urllib3
-Library           String
-Library           Collections
-Library           RequestsLibrary
-
-*** Keywords ***
-游客登录${dating}平台
-    #游客登录婚介平台
-    Disable Warnings
-    Create Session    dating    ${${dating}.dating域名}    ${${dating}.CHeader}
-    ${reps}    GET On Session    dating    /dating-agency-service/user/get/marriage-information/tourist-recommend
-    ${message}    Get From Dictionary    ${reps.json()}    message
-    Should Be Equal As Strings    ${message}    successful
-
-征婚人登录${dating}平台后查看相亲推荐页面

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

@@ -1,10 +0,0 @@
-*** Settings ***
-Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
-Resource          Blind.robot
-
-*** Test Cases ***
-游客使用婚介平台
-    #游客打开婚介平台
-    Given 游客登录婚介平台
-
-征婚人使用婚介平台-相亲页面

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

@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation     相亲主页

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

@@ -0,0 +1,10 @@
+*** Settings ***
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
+Resource          BlindResource.robot
+
+*** Test Cases ***
+用户查看相亲推荐页
+    #相亲推荐页
+    Given 查询婚介征婚人的资料信息
+    When 查询婚介征婚人资料
+    And 查看婚介平台相亲列表

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

@@ -0,0 +1,73 @@
+*** Settings ***
+Library           urllib3
+Library           Collections
+Library           RequestsLibrary
+
+*** Keywords ***
+查询${dating}征婚人的资料信息
+    #通过userid获取征婚人的资料
+    FOR    ${userId}    ${client_header}    IN ZIP    ${userid_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    GET On Session    dating    /dating-agency-service/user/get/marriage/information/details    params=userId=${userId}
+        ${miId}    Get From Dictionary    ${reps.json()['data']}    id    #获取资料id
+        ${nickName}    Get From Dictionary    ${reps.json()['data']}    nickName    #获取用户名称
+        ${miId_list}    Create List
+        ${genderCode}    Get From Dictionary    ${reps.json()['data']}    genderCode    #用户性别
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Append To List    ${miId_list}    ${miId}
+        Should Be Equal As Strings    ${message}    successful
+    END
+    Set Global Variable    ${nickName}
+    Set Global Variable    ${miId_list}
+    Set Global Variable    ${genderCode}
+
+查询${dating}征婚人资料
+    #通过miId查询征婚人资料
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${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    #性别
+    END
+    Set Global Variable    ${age}
+    Set Global Variable    ${height}
+    Set Global Variable    ${cityCode}
+    Set Global Variable    ${birthYear}
+    Set Global Variable    ${genderCode}
+
+查看${dating}平台相亲列表
+    #相亲推荐页
+    ${ageRange}    Evaluate    list(range(${age}-9,${age}+10,1))    #年龄范围
+    ${heightRange}    Evaluate    list(range(${height}-20,${height}+15,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=queryType=0&pageNum=1&pageSize=30
+        ${records}    Get From Dictionary    ${reps.json()['data']}    records    #推荐列表
+        Set Global Variable    ${records}
+        遍历推荐列表
+    END
+    #判断年龄是否在范围内
+    FOR    ${a}    IN    @{age_list}
+        Run Keyword If    ${a} in ${ageRange}    log    ${a}存在于${ageRange}中
+        ...    ELSE    log    ${a}不存在于${ageRange}中
+    END
+    #判断身高是否在范围内
+    FOR    ${h}    IN    @{height_list}
+        Run Keyword If    ${h} in ${heightRange}    log    ${h}存在于${heightRange}中
+        ...    ELSE    log    ${h}不存在于${heightRange}中
+    END
+
+遍历推荐列表
+    ${age_list}    Create List
+    ${height_list}    Create List
+    FOR    ${data}    IN    @{records}
+        ${age}    Get From Dictionary    ${data}    age
+        ${height}    Get From Dictionary    ${data}    height
+        Append To List    ${age_list}    ${age}
+        Append To List    ${height_list}    ${height}
+    END
+    Set Global Variable    ${age_list}
+    Set Global Variable    ${height_list}

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

@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation     相亲页面

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

@@ -93,7 +93,7 @@ Resource          ../../../0-Login/LoginResource.robot
     #提交征婚人身份证审核
     #${value_list}    Create List    李博,429006198410300956    王颖勋,44058319951227041X    就是不吃饭,441481199509213863    王颖勋,4400
     #女生身份证
-    ${woman_value}    Set Variable    赖勇兰,441481199509213863
+    ${woman_value}    Set Variable    尤名雅,420101198605250747
     #男生身份证
     ${value_list}    Create List    王颖勋,44058319951227041X
     ${man_value}    Evaluate    random.choice(${value_list})    random
@@ -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}-25    #固定年龄
+    ${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}}

1-Applet/Logout/LogoutResource.robot

@@ -0,0 +1,14 @@
+*** Settings ***
+Library           urllib3
+Library           Collections
+Library           RequestsLibrary
+
+*** Keywords ***
+用户退出登录${dating}平台
+    #退出登录
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    POST On Session    dating    dating-agency-uec/user/logout    json={}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END

1-Applet/Logout/logout.robot

@@ -0,0 +1,7 @@
+*** Settings ***
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
+Resource          LogoutResource.robot
+
+*** Test Cases ***
+用户退出登录
+    Given 用户退出登录婚介平台

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,1137],[[4,5,6,7,[],[1,16,279],[[8,9,10,11,[],[1,16,278],[],[[12,0,0,[],[1,142,152],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,296,556],[[16,17,18,0,[],[1,297,555],[[19,20,21,22,[],[1,299,553],[[23,24,25,26,[],[1,300,552],[],[[27,0,0,[],[1,340,512],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]],[28,29,30,0,[],[1,852,285],[[31,32,33,34,[],[1,852,269],[[35,36,37,0,[],[1,869,252],[],[[38,0,0,[],[1,869,252],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[3,3,0,0]];
+window.output["suite"] = [1,2,3,0,[],[1,0,2134],[[4,5,6,7,[],[1,15,261],[[8,9,10,11,[],[1,15,261],[],[[12,0,0,[],[1,110,166],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,276,1858],[[16,17,18,0,[],[1,276,1857],[[19,20,21,22,[],[1,276,1856],[[23,24,25,0,[],[1,276,1856],[],[[26,0,0,[],[1,292,1838],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[2,2,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","*MarriageInfo","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\MarriageInfo","*../1-Applet/2-Homepage/MarriageInfo","*<p>征婚人资料\x3c/p>","*DataAuthentication","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\MarriageInfo\\DataAuthentication.robot","*../1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot","*<p>资料认证\x3c/p>","*提交征婚人头像审核信息-无审核中","*2-Web","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\2-Web","*../2-Web","*InfoAudit","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\2-Web\\InfoAudit","*../2-Web/InfoAudit","*<p>资料审核\x3c/p>","*AuditInfomation","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\2-Web\\InfoAudit\\AuditInfomation.robot","*../2-Web/InfoAudit/AuditInfomation.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":3,"skip":0}],[],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":3,"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: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.MarriageInfo","name":"MarriageInfo","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.MarriageInfo.DataAuthentication","name":"DataAuthentication","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s3","label":"Dating-agency.2-Web","name":"2-Web","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s3-s1","label":"Dating-agency.2-Web.InfoAudit","name":"InfoAudit","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s3-s1-s1","label":"Dating-agency.2-Web.InfoAudit.AuditInfomation","name":"AuditInfomation","pass":1,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:02","fail":0,"label":"All Tests","pass":2,"skip":0}],[],[{"elapsed":"00:00:02","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":2,"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:02","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.2-Homepage","name":"2-Homepage","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate","name":"BlindDate","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate.Blind","name":"Blind","pass":1,"skip":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1711702032440;
+window.output["baseMillis"] = 1711964125713;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 1153;
+window.output["generated"] = 2154;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;