diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index babccb1..854e3f5 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -15873078264 \ No newline at end of file +13213049527 \ No newline at end of file diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot index f43a5ae..6d6724f 100644 --- a/1-Applet/1-WriteInfo/InfoResource.robot +++ b/1-Applet/1-WriteInfo/InfoResource.robot @@ -30,7 +30,7 @@ Library OperatingSystem ... ELSE IF ${fillSerialNumber}==5 填写婚介征婚人的资料-学历开始 ... ELSE IF ${fillSerialNumber}==6 填写婚介征婚人的资料-月收入开始 ... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始 - ... ELSE 查询婚介资料 + ... ELSE 查询婚介用户资料 END Sleep 1 @@ -41,7 +41,7 @@ Library OperatingSystem ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #填写序号 Set Global Variable ${fillSerialNumber} -查询${dating}资料 +查询${dating}用户资料 FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} Disable Warnings Create Session dating ${${dating}.dating域名} ${client_header} @@ -73,6 +73,7 @@ Library OperatingSystem 填写${dating}征婚人的资料-家乡开始 查询婚介用户资料 + 选择婚介征婚人的家乡 选择婚介征婚人的出生年份 选择婚介征婚人的身高 选择婚介征婚人的学历 @@ -112,7 +113,7 @@ Library OperatingSystem 选择婚介征婚人的昵称 填写${dating}征婚人的资料-昵称开始 - 查询婚介资料 + 查询婚介用户资料 选择婚介征婚人的昵称 选择${dating}性别资料 @@ -134,13 +135,16 @@ Library OperatingSystem ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful Set Global Variable ${DataId} + ${percentage} Evaluate 3 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的城市 #选择城市 #获取省市区 region固定省市-广州 #选择征婚人地区资料 - Disable Warnings + 查询婚介用户资料百分比 ${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} @@ -156,12 +160,16 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+2 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的家乡 #选择城市 #获取省市区 region固定省市-汕头 #选择征婚人地区资料 + 查询婚介用户资料百分比 Disable Warnings ${Number} Evaluate 2 #0:"性别",1:"所在城市",2:"家乡"3:"出生年份",4:"身高",5:"学历",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.dating域名} ${client_header} @@ -176,9 +184,13 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+0 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的出生年份 #选择征婚人出生年份 + 查询婚介用户资料百分比 ${get_year} Get Current Date result_format=%Y #${start-year} Evaluate 1950 #${end-year} Evaluate ${get_year}-18 @@ -194,9 +206,13 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+2 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的身高 #选择征婚人身高 + 查询婚介用户资料百分比 ${low-height} Evaluate 150 ${hight-height} Evaluate 175 ${height} Evaluate random.randint(${low-height},${hight-height}) random @@ -210,9 +226,13 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+1 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的学历 #选择征婚人的学历 + 查询婚介用户资料百分比 ${code} Create List 0 1 2 3 4 5 #0:高中及以下,1:中专,2:大专,3:大学本科,4:硕士,5:硕士 ${educode} Evaluate random.choice(${code}) random #随机获取学历编码 #${educode} Evaluate 0 #固定学历 @@ -226,9 +246,13 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+1 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的婚姻状况 #选择征婚人的婚姻状况 + 查询婚介用户资料百分比 #${code} Create List 0 1 2 #0:未婚,1:离异,2:丧偶的 #${maritalCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码 ${maritalCode} Evaluate 2 #固定婚姻状况 @@ -242,9 +266,13 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+2 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的月收入 #选择征婚人的月收入 + 查询婚介用户资料百分比 ${code} Create List 0 1 2 3 4 5 6 #0:3000以下,1:3001~5000,2:5001~8000,3:8001~12000,4:12001~20000,5:20001~50000,6:50000以上 ${incomeCode} Evaluate random.choice(${code}) random #随机月收入 #${incomeCode} Evaluate 0 #固定月收入 @@ -258,6 +286,9 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+1 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} 选择${dating}征婚人的昵称 #填写征婚人昵称 @@ -272,6 +303,7 @@ Library OperatingSystem #${name} Set Variable ${name}${secondName} #${nickName} Set Variable ${firstName}${name} #END + 查询婚介用户资料百分比 ${Name} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","冲浪boy","王小帅","牛仔","张先生","就等你了","故乡的原风景","万里&长城","禁忌女孩","如果当时...","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","村里在逃翠花❀","诺贝尔可爱奖","虚天渊","死于脚气攻心","发型不乱,一切好办","朝颜","茯苓","不4辣妹好烦","满山的猴子我腚最红","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","北极甜虾","社交悍匪","西红柿炖前男友","骑猪追帅哥","^.^心碎小饭包","美女也会emo","妈莎拉蒂","爸道总裁","去银行整点金条","我的人间鬼火","观input萨","冰糖葫芦娃","记忆煎成饼","4.435km/s","炉火糖粥","十一是亿","半截的诗","DokiDoki","该昵称已存在","出桃公主","量贩草莓果泡","风止何安","钟于的尽头是终于","Komorebi","Agoni","Miratowa","Coisini","是牛奶味呀","偷走月亮的o(=•ェ•=)m","一口吃成大胖次","转角撞到小花花","恰似惊鸿落人间","阿啾啾","只吃一口不会胖滴","难过就收拾房间","辣条董事长","一贫如喜羊羊","鸭鸭进京赶烤","bug鸭陆","我愿嫁给财神爷哪怕是妾","富婆与低保皆失","满圈猪猪我最肥","☀日落也会跑","不掉小珍🐖","快乐的刘油果","小地瓜🍠","火鸡味锅巴","晕头小🐕","钞票收割机","吃土豆长大的马铃薯","Tony带水","古塔拉黑暗之神","换胃思烤","你没好果汁吃","元气少女锅德缸","对方正在长头发","关你peace","狂炫老板画的大饼","皮蛋solo粥","梁山伯与祝英抬杠","讨一身可爱","半口奶酪","一丢丢可爱","小不忍则卖大萌","春风十里吹不动你","夏目友人赖账","狂踹瘸子那条好腿","三条腿瘸了两条","蛋黄派来的","BOB!!!","激萌美少女李逵","老衲我不用飘柔"] ${nickName} Evaluate random.choice(${Name}) random ${Number} Evaluate 7 @@ -284,6 +316,16 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + ${percentage} Evaluate ${percentData}+5 + 查询婚介用户资料百分比 + Should Be Equal As Numbers ${percentage} ${percentData} + +查询${dating}用户资料百分比 + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/data/scoring params=miId=${DataId} + ${percentData} Get From Dictionary ${reps.json()} data #资料进度百分比 + ${percentData} Set Variable If '${percentData}'=='null' 0 ${percentData} #如果为null设置为0 + Set Global Variable ${percentData} region #获取户口所在地 @@ -404,7 +446,7 @@ region固定省市-汕头 FOR ${province} IN @{local_data} #省列表数据 ${provinceCode} Get From Dictionary ${province} value #获取省编码 ${provinceName} Get From Dictionary ${province} label #获取省名称 - Exit For Loop If '${provinceName}'=='广州省' + Exit For Loop If '${provinceName}'=='广东省' END ${city_data} Get From Dictionary ${province} children #广东省市列表数据 FOR ${city} IN @{city_data} diff --git a/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot index 4d8fd8b..dd138bf 100644 --- a/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot @@ -70,6 +70,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 9a37852..cc3a66b 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Selection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Selection.robot @@ -6,26 +6,6 @@ Library RequestsLibrary Library DatabaseLibrary *** Keywords *** -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 - #随机获取省 - ${province} Evaluate random.choice(${local_data}) random #随机获取省区域 - ${provinceCode} Get From Dictionary ${province} value #获取省编码 - ${provinceName} Get From Dictionary ${province} label #获取省名称 - ${Children} Get From Dictionary ${province} children #获取省市 - #随机获取市 - ${city_data} Evaluate random.choice(${Children}) random #随机获取市区域 - ${cityCode} Get From Dictionary ${city_data} value #获取市编码 - ${cityName} Get From Dictionary ${city_data} label #获取市名称 - Set Global Variable ${cityCode} - Set Global Variable ${cityName} - Set Global Variable ${provinceCode} - Set Global Variable ${provinceName} - 查询${dating}用户资料 #通过userid获取征婚人资料 FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} @@ -243,6 +223,28 @@ region 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/constellation/list + ${data} Get From Dictionary ${reps.json()} data + ${constellationData} Evaluate random.choice(${data}) random #随机获取星座json + #${ConstellationData} Get From List ${data} 2 #0摩羯,1水瓶,2双鱼,3白羊,4金牛,5双子,6巨蟹,7狮子,8处女,9天秤,10天蝎,11射手 + ${constellation} Get From Dictionary ${constellationData} desc #星座名称 + ${constellationCode} Get From Dictionary ${constellationData} value #星座编码 + Set Global Variable ${constellation} + Set Global Variable ${constellationCode} + END + #提交择偶条件--星座 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable {"miId":"${miId}","constellation":"${constellation}","constellationCode":${constellationCode}} + ${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} diff --git a/Phone.txt b/Phone.txt index d3b889e..196c212 100644 --- a/Phone.txt +++ b/Phone.txt @@ -92,4 +92,8 @@ 13710986989,888888 13826185220,888888 15615974780,888888 -13445717869,888888 \ No newline at end of file +13445717869,888888 +13207267941,888888 +15121074365,888888 +15810277849,888888 +13213049527,888888 diff --git a/UI-Testing/Login.robot b/UI-Testing/Login.robot index 82b2cb6..24dc144 100644 --- a/UI-Testing/Login.robot +++ b/UI-Testing/Login.robot @@ -3,8 +3,9 @@ Library AppiumLibrary *** Test Cases *** LoginTest - Open Application http://127.0.0.1:4723/wd/hub platformName=Android platformVersion=9 deviceName=emulator-5554 + Open Application http://127.0.0.1:4723/wd/hub platformName=Android platformVersion=9 deviceName=emulator-5554 automationName=uiautomator2 #Wait Until Element Is Visible xpath=//android.webkit.WebView 10s Click Element xpath=//android.webkit.WebView - Wait Until Element Is Visible xpath=//android.view.View[@text=\"去认证\"] + Click Element class=uni-icons uniui-circle + Click Button class=l-button-box-text data-v-3bacddd2 l-button-primary-text Close Application diff --git a/output/log.html b/output/log.html index e5a39df..ec9196c 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};