diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index 999d328..a7347db 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -2,6 +2,7 @@ Documentation 接口:短信验证码登录认证 Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml Resource LoginResource.robot +Library String *** Test Cases *** 手机号验证码登录 @@ -26,5 +27,6 @@ Resource LoginResource.robot And 用户手机号错误验证码登录婚介平台 000 - Given 创建一个列表 - Then 同时执行多个参数的FOR循环 + #Given 创建一个列表 + #Then 同时执行多个参数的FOR循环 + ${NUM} Generate Random String 18 [NUMBERS] #随机生成18位的数字 diff --git a/2-Homepage/MarriageInfo/Authentication.robot b/2-Homepage/MarriageInfo/Authentication.robot index df0e86b..7d156a0 100644 --- a/2-Homepage/MarriageInfo/Authentication.robot +++ b/2-Homepage/MarriageInfo/Authentication.robot @@ -53,7 +53,7 @@ Library DatabaseLibrary Disconnect From Database 提价${dating}征婚人相册审核 - ${imgUrl_list} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/0c4daad4c119ccfd883355522d51965c.png","https://dating-agency-test.oss-accelerate.aliyuncs.com/8a5d712d621922dabae05f937d92789f.png","https://dating-agency-test.oss-accelerate.aliyuncs.com/7d95f8b0c73e02032b48c219a7670cd0.jpeg"] #相册图片 + ${imgUrl_list} Set Variable [ \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/f539fda976303cd09b075b23fb971a78.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/c3265d8bb35325df5394d8ef6023703c.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/7ad6e481c3d16edeb0847996263dcaba.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/5021ecbef987a7dbc2346f54d557606a.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/519894743f84aee6a4bc9f5f239b2439.jpg", \ \ \ \ \ \ \ \ "https://dating-agency-test.oss-accelerate.aliyuncs.com/b575529da68f06d90ec25633b80e1db1.jpg" \ \ \ \ ] #相册图片 ${Code} Evaluate 6 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} @@ -243,3 +243,19 @@ region ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "industry": "${industry}", \ \ \ \ "industryCode": "${industryCode}", \ \ \ \ "occupation": "${occupation}", \ \ \ \ "occupationCode": "${occupationCode}" } ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${data.encode('utf-8')} END + +提交${dating}征婚人的学历审核 + #提交征婚人学历审核 + ${value} Generate Random String 18 [NUMBERS] #随机生成18位数字 + ${authenticationCode} Evaluate 1 #学历编码 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable { \ \ \ \ "authenticationCode":"${authenticationCode}", \ \ \ \ "miId":"${miId}", \ \ \ \ "value":"${value}" } + ${reps} POST On Session dating dating-agency-service/user/save/certification/audit ${data.encode('utf-8')} + ${code} Get From Dictionary ${reps.json()} code + ${auditId} Get From Dictionary ${reps.json()} data #资料审核id + ${message} Get From Dictionary ${reps.json()} message + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + ... ELSE Should Be Equal As Strings ${message} 正在审核中!请等待审核完成。 + END + Set Global Variable ${auditId} diff --git a/2-Homepage/MarriageInfo/DataAuthentication.robot b/2-Homepage/MarriageInfo/DataAuthentication.robot index 4b5f6ce..682d0e6 100644 --- a/2-Homepage/MarriageInfo/DataAuthentication.robot +++ b/2-Homepage/MarriageInfo/DataAuthentication.robot @@ -52,3 +52,7 @@ Resource ../../0-Login/LoginResource.robot 提交征婚人的职业 Given 查询婚介征婚人的资料信息 Then 提交婚介征婚人的职业 + +提交征婚人学历认证 + Given 查询婚介征婚人的资料信息 + When 提交婚介征婚人的学历审核 diff --git a/Web/InfoAudit/AuditInfomation.robot b/Web/InfoAudit/AuditInfomation.robot index 48d0803..ae350bd 100644 --- a/Web/InfoAudit/AuditInfomation.robot +++ b/Web/InfoAudit/AuditInfomation.robot @@ -5,5 +5,14 @@ Resource Infomation.robot *** Test Cases *** 审核征婚人提交的资料-相册 Given 查询婚介平台用户资料数据 - When 查询婚介平台审核资料-相册审核通过 + When 查询婚介平台审核资料-审核通过 Then 查询数据库审核表数据 + +审核征婚人提交的资料-学历 + Given 查询婚介平台用户资料数据 + When 查询婚介平台审核资料-审核通过 + Then 查询数据库审核表数据 + +查询资料审核数据 + Given 查询婚介平台资料审核数据-待审核 + Then 数据库查询条件下的总数 diff --git a/Web/InfoAudit/Infomation.robot b/Web/InfoAudit/Infomation.robot index 01e39b9..98e609a 100644 --- a/Web/InfoAudit/Infomation.robot +++ b/Web/InfoAudit/Infomation.robot @@ -7,7 +7,7 @@ Library DatabaseLibrary *** Keywords *** 查询${dating}平台用户资料数据 - #查询相册审核数据 + #查询审核数据 FOR ${admin_header} IN @{Aheader_list} Create Session dating ${${dating}.dating域名} ${admin_header} ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/audit/page params=pageSize=10&name=${nickName}&pageNum=1 @@ -19,7 +19,7 @@ Library DatabaseLibrary END Set Global Variable ${InfoId} -查询${dating}平台审核资料-相册审核通过 +查询${dating}平台审核资料-审核通过 FOR ${admin_header} IN @{Aheader_list} Create Session dating ${${dating}.dating域名} ${admin_header} ${data} Set Variable {"id":"${InfoId}","status":1} @@ -30,10 +30,10 @@ Library DatabaseLibrary Set Global Variable ${data} END -查询${dating}平台审核资料-相册审核不通过 +查询${dating}平台审核资料-审核不通过 FOR ${admin_header} IN @{Aheader_list} Create Session dating ${${dating}.dating域名} ${admin_header} - ${data} Set Variable {"id":"${InfoId}","status":0} + ${data} Set Variable {"id":"${InfoId}","status":2} ${reps} POST On Session dating dating-agency-service/user/exe/certification/audit ${data.encode('utf-8')} ${data} Get From Dictionary ${reps.json()} data ${message} Get From Dictionary ${reps.json()} message @@ -46,3 +46,21 @@ Library DatabaseLibrary ${check} Query SELECT status FROM `dating_agency_service`.`da_marriage_information_certification_audit` WHERE `id` = '${data}' ${status} Set Variable ${check[0][0]} Should Be Equal As Numbers ${status} 1 + +查询${dating}平台资料审核数据-审核状态 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${status_list} Create List 0 1 2 + ${status} Evaluate random.choice(${status_list}) random + ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/audit/page params=pageSize=10&status=${status}&pageNum=1 + ${total_num} Get From Dictionary ${reps.json()['data']} total #获取查询结果总数 + END + Set Global Variable ${status} + Set Global Variable ${total_num} + +数据库查询条件下的总数 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT COUNT(*) FROM `da_marriage_information_certification_audit` WHERE `status`=${status} #查询待审核资料总数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total_num} + Disconnect From Database