diff --git a/Dating/DA_data.yaml b/Dating/DA_data.yaml deleted file mode 100644 index d13d5e0..0000000 --- a/Dating/DA_data.yaml +++ /dev/null @@ -1,10 +0,0 @@ -婚介: - dating域名: https://dating-agency-api-test.qniao.cn - Client域名: - CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} - - - -用户: - 手机号: 15014242835 - 验证码: 888888 \ No newline at end of file diff --git a/Dating/__init__.robot b/Dating/__init__.robot deleted file mode 100644 index 48df7b9..0000000 --- a/Dating/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation 相亲页面 diff --git a/Dating/dating.robot b/Homepage/Blind/Blind.robot similarity index 100% rename from Dating/dating.robot rename to Homepage/Blind/Blind.robot diff --git a/Dating/Dating_data.robot b/Homepage/Blind/BlindDate.robot similarity index 54% rename from Dating/Dating_data.robot rename to Homepage/Blind/BlindDate.robot index 9a1204f..3b002a2 100644 --- a/Dating/Dating_data.robot +++ b/Homepage/Blind/BlindDate.robot @@ -1,6 +1,6 @@ *** Settings *** -Suite Setup Import Variables ${CURDIR}\\DA_data.yaml -Resource dating.robot +Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml +Resource Blind.robot *** Test Cases *** 游客使用婚介平台 diff --git a/Homepage/Blind/__init__.robot b/Homepage/Blind/__init__.robot new file mode 100644 index 0000000..18f63c1 --- /dev/null +++ b/Homepage/Blind/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 主页 diff --git a/Homepage/MarriageInfo/MarriageInfo.robot b/Homepage/MarriageInfo/MarriageInfo.robot new file mode 100644 index 0000000..0d40ada --- /dev/null +++ b/Homepage/MarriageInfo/MarriageInfo.robot @@ -0,0 +1,17 @@ +*** Settings *** +Library urllib3 +Library String +Library Collections +Library RequestsLibrary + +*** Keywords *** +查询${dating}征婚人的资料信息 + #获取征婚人的资料 + 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} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + +上传${dating}征婚人头像 diff --git a/Homepage/MarriageInfo/MarryInfo.robot b/Homepage/MarriageInfo/MarryInfo.robot new file mode 100644 index 0000000..22ac34c --- /dev/null +++ b/Homepage/MarriageInfo/MarryInfo.robot @@ -0,0 +1,8 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml +Resource MarriageInfo.robot +Resource ../../Login/LoginResource.robot + +*** Test Cases *** +征婚人头像信息 + Given 查询婚介征婚人的资料信息 diff --git a/Homepage/MarriageInfo/__init__.robot b/Homepage/MarriageInfo/__init__.robot new file mode 100644 index 0000000..cae2ebe --- /dev/null +++ b/Homepage/MarriageInfo/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 征婚人资料 diff --git a/InsertData.robot b/InsertData.robot deleted file mode 100644 index c9f3852..0000000 --- a/InsertData.robot +++ /dev/null @@ -1,22 +0,0 @@ -*** Settings *** -Library Collections -Library ExcelLibrary -Library DatabaseLibrary - -*** Test Cases *** -ReadData - Import Variables ${CURDIR}\\用户资料\\Execl.py - #${DList} Set Variable ${cap} - log ${phone_list} - LOG ${phone} - FOR ${P} IN RANGE ${phone_list} - END - LOG ${P} - -Connect_Database - [Documentation] 连接数据库 - #连接数据库 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${UserData} Query SELECT * FROM `uec`.`qn_account` WHERE `tid` = '13517986787' AND `is_delete` = '0' - ${accountId} Set Variable ${UserData[0][0]} - Disconnect From Database diff --git a/Login/DA_data.yaml b/Login/DA_data.yaml deleted file mode 100644 index c48254c..0000000 --- a/Login/DA_data.yaml +++ /dev/null @@ -1,10 +0,0 @@ -婚介: - dating域名: https://dating-agency-api-test.qniao.cn - Client域名: - CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} - AHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795881'} - - -用户: - 手机号: 15014242835 - 验证码: 888888 \ No newline at end of file diff --git a/Login/Login-interface.robot b/Login/Login-interface.robot index cc5d325..a20a2ed 100644 --- a/Login/Login-interface.robot +++ b/Login/Login-interface.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation 接口：短信验证码登录认证 Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml -Resource resource.robot +Resource LoginResource.robot *** Test Cases *** 手机号验证码登录 @@ -9,9 +9,8 @@ Resource resource.robot Given 读取TXT文件 When 用户获取婚介平台短信验证码 Then 数据库查询用户生效且未过期的验证码 - #And 依次获取验证码 And 用户手机号验证码登录婚介平台 - #And 查询用户的婚介组织 + And 查询用户的婚介组织 手机号验证码已过期登录 #验证码已过期 diff --git a/Login/resource.robot b/Login/LoginResource.robot similarity index 84% rename from Login/resource.robot rename to Login/LoginResource.robot index c494421..b0535e7 100644 --- a/Login/resource.robot +++ b/Login/LoginResource.robot @@ -59,14 +59,11 @@ Library OperatingSystem Set Global Variable ${captcha} Set Global Variable ${captcha_list} -依次获取验证码 - #多用户时依次获取对应的验证码 - FOR ${captcha} IN @{captcha_list} - Set Global Variable ${captcha} - END - 用户手机号验证码登录${dating}平台 #用户手机号验证码登录婚介平台 + ${userid_list} Create List + ${Cheader_list} Create List + ${Lheader_list} Create List FOR ${account} ${captcha} IN ZIP ${id} ${captcha_list} Disable Warnings Create Session dating ${${dating}.dating域名} ${${dating}.AHeader} @@ -78,9 +75,15 @@ Library OperatingSystem ${message} Get From Dictionary ${reps.json()} message ${login_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795881','Authorization':'QNT ${token}'} #更新header ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} - Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + Append To List ${userid_list} ${userId} + Append To List ${Cheader_list} ${client_header} + Append To List ${Lheader_list} ${login_header} + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！ END + Set Global Variable ${userid_list} + Set Global Variable ${Lheader_list} + Set Global Variable ${Cheader_list} Set Global Variable ${login_header} Set Global Variable ${client_header} @@ -93,17 +96,19 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-uec/authorize/by-captcha ${data.encode('utf-8')} ${code} Get From Dictionary ${reps.json()} code #获取相应状态码 ${message} Get From Dictionary ${reps.json()} message - Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！ END 查询用户的${dating}组织 #查询用户在婚介的组织数据 - Disable Warnings - Create Session dating ${${dating}.dating域名} ${login_header} - ${reps} GET On Session dating /dating-agency-uec/user/list/own-organization params=userId=${userid} - ${message} Get From Dictionary ${reps.json()} message - Should Be Equal As Strings ${message} successful + FOR ${userId} ${login_header} IN ZIP ${userid_list} ${Lheader_list} + Disable Warnings + Create Session dating ${${dating}.dating域名} ${login_header} + ${reps} GET On Session dating /dating-agency-uec/user/list/own-organization params=userId=${userid} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END 000 ${result} Create List 4 5 6 diff --git a/Login/phone-test.txt b/Login/phone-test.txt index 4be3daa..75cdb36 100644 --- a/Login/phone-test.txt +++ b/Login/phone-test.txt @@ -1,3 +1,3 @@ 手机号 -15014242835 -19128859944 \ No newline at end of file +19128859944 +15014242835 \ No newline at end of file diff --git a/WriteInfo/DA_data.yaml b/WriteInfo/DA_data.yaml deleted file mode 100644 index a4b7e7a..0000000 --- a/WriteInfo/DA_data.yaml +++ /dev/null @@ -1,12 +0,0 @@ -婚介: - dating域名: http://dating-agency-api-test.qniao.cn - Client域名: - CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} - Header: {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'iHP4V/g6O5DXHixyNrf7tn7+VIdU5Zwq5m1fgO3jm5PtMrj2OlLQWd+AfAy9eJMn9vowK3P78Iz93vXw55+blg=='} - AHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795881'} - - - -用户: - 手机号: 15014242835 - 验证码: 888888 \ No newline at end of file diff --git a/WriteInfo/InfoResource.robot b/WriteInfo/InfoResource.robot index 0167fd4..67ad62a 100644 --- a/WriteInfo/InfoResource.robot +++ b/WriteInfo/InfoResource.robot @@ -9,14 +9,20 @@ Library RequestsLibrary Library OperatingSystem *** Keywords *** -用户首次填写${dating}资料 - Disable Warnings +首次查询${dating}征婚人资料 #获取首次婚介资料信息 - Create Session dating ${${dating}.dating域名} ${client_header} - ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} - ${Data} Get From Dictionary ${reps.json()} data - log ${Data} - Set Global Variable ${Data} + FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} + Disable Warnings + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} + ${Data} Get From Dictionary ${reps.json()} data + ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #查询资料填写序号 + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + Set Global Variable ${Data} + Run Keyword If ${fillSerialNumber}==0 填写婚介征婚人的基础资料 + ... ELSE 查询婚介征婚人的资料信息 + END 检查首次填写${dating}资料序号 #检查首次填写序号 @@ -25,14 +31,22 @@ Library OperatingSystem ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #填写序号 Set Global Variable ${fillSerialNumber} +填写${dating}征婚人的基础资料 + 选择婚介性别资料 + 选择婚介征婚人的城市 + 选择婚介征婚人的出生年份 + 选择婚介征婚人的身高 + 选择婚介征婚人的学历 + 选择婚介征婚人的婚姻状况 + 选择婚介征婚人的月收入 + 选择婚介征婚人的昵称 + 选择${dating}性别资料 #选择性别 Log To Console ${CURDIR} #打印当前路径 Disable Warnings - #用户首次填写婚介资料 ${sex-code} Create List 0 1 ${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号 - #${SexCode} Evaluate 1 #男:0，女:1 ${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.genderCode ${SexCode} @@ -45,7 +59,6 @@ Library OperatingSystem ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful Set Global Variable ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的城市 #选择城市 @@ -92,7 +105,6 @@ 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} - 用户首次填写婚介资料 选择${dating}征婚人的出生年份 #选择征婚人出生年份 @@ -110,7 +122,6 @@ 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} - 用户首次填写婚介资料 选择${dating}征婚人的身高 #选择征婚人身高 @@ -127,7 +138,6 @@ 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} - 用户首次填写婚介资料 选择${dating}征婚人的学历 #选择征婚人的学历 @@ -143,7 +153,6 @@ 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} - 用户首次填写婚介资料 选择${dating}征婚人的婚姻状况 #选择征婚人的婚姻状况 @@ -159,7 +168,6 @@ 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} - 用户首次填写婚介资料 选择${dating}征婚人的月收入 #选择征婚人的月收入 @@ -175,7 +183,6 @@ 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} - 用户首次填写婚介资料 选择${dating}征婚人的昵称 #填写征婚人昵称 @@ -191,9 +198,12 @@ 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} - 查询首次填写的婚介资料信息 -查询首次填写的${dating}资料信息 - #获取用户首次填写的资料 - Create Session dating ${${dating}.dating域名} ${client_header} - ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} +查询${dating}征婚人的资料信息 + #获取征婚人的资料 + 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} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END diff --git a/WriteInfo/Infomation.robot b/WriteInfo/Infomation.robot index 9b1fc66..474dbc5 100644 --- a/WriteInfo/Infomation.robot +++ b/WriteInfo/Infomation.robot @@ -1,21 +1,21 @@ *** Settings *** Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml Resource InfoResource.robot -Resource ../Login/resource.robot +Resource ../Login/LoginResource.robot Library Collections Library RequestsLibrary *** Test Cases *** 用户首次填写资料 - Given 用户首次填写婚介资料 - Then 选择婚介性别资料 - And 选择婚介征婚人的城市 - And 选择婚介征婚人的出生年份 - And 选择婚介征婚人的身高 - And 选择婚介征婚人的学历 - And 选择婚介征婚人的婚姻状况 - And 选择婚介征婚人的月收入 - And 选择婚介征婚人的昵称 + Given 首次查询婚介征婚人资料 + #Then 选择婚介性别资料 + #And 选择婚介征婚人的城市 + #And 选择婚介征婚人的出生年份 + #And 选择婚介征婚人的身高 + #And 选择婚介征婚人的学历 + #And 选择婚介征婚人的婚姻状况 + #And 选择婚介征婚人的月收入 + #And 选择婚介征婚人的昵称 region Disable Warnings diff --git a/相亲用户资料.xls b/相亲用户资料.xls deleted file mode 100644 index 25ddbb3..0000000 Binary files a/相亲用户资料.xls and /dev/null differ diff --git a/用户资料/DataBase.py b/资料/DataBase.py similarity index 100% rename from 用户资料/DataBase.py rename to 资料/DataBase.py diff --git a/用户资料/Execl.py b/资料/Execl.py similarity index 100% rename from 用户资料/Execl.py rename to 资料/Execl.py diff --git a/用户资料/WXlogin.py b/资料/WXlogin.py similarity index 100% rename from 用户资料/WXlogin.py rename to 资料/WXlogin.py diff --git a/用户资料/__pycache__/Execl.cpython-36.pyc b/资料/__pycache__/Execl.cpython-36.pyc similarity index 100% rename from 用户资料/__pycache__/Execl.cpython-36.pyc rename to 资料/__pycache__/Execl.cpython-36.pyc diff --git a/用户资料/input.py b/资料/input.py similarity index 100% rename from 用户资料/input.py rename to 资料/input.py diff --git a/用户资料/phone.py b/资料/phone.py similarity index 100% rename from 用户资料/phone.py rename to 资料/phone.py