diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot
index 9be02a7..297aa33 100644
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -125,6 +125,7 @@ Library ImageHorizonLibrary
${userId} Get From Dictionary ${reps.json()['data']} userId #获取用户id
${message} Get From Dictionary ${reps.json()} message
${login_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795881','Authorization':'QNT ${token}','X-Organization-Id':'963432943739605555'} #更新header
+ log ${login_header}
${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'}
Append To List ${userid_list} ${userId}
Append To List ${Cheader_list} ${client_header}
@@ -145,7 +146,6 @@ Library ImageHorizonLibrary
${userid_list} Create List
${Cheader_list} Create List
${Aheader_list} Create List
- ${phoneList} Create List
Disable Warnings
FOR ${phone} IN @{phoneList}
Create Session dating ${${dating}.dating域名} ${${dating}.AHeader}
@@ -200,14 +200,17 @@ Library ImageHorizonLibrary
获取${dating}平台用户baseinfo
#获取baseinfo
+ ${matchmakerFlagList} Create List
FOR ${admin_header} IN @{Aheader_list}
Create Session dating ${${dating}.dating域名} ${admin_header}
${reps} GET On Session dating dating-agency-uec/user/get/base-info
${phone} Get From Dictionary ${reps.json()['data']} phone #登录用户手机号
${matchmakerFlag} Get From Dictionary ${reps.json()['data']} matchmakerFlag #登录用户是否是红娘
+ Append To List ${matchmakerFlagList} ${matchmakerFlag}
END
Set Global Variable ${phone}
Set Global Variable ${matchmakerFlag}
+ Set Global Variable ${matchmakerFlagList}
扫描${dating}红娘二维码
#解析二维码图片
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index fbb6571..2bc1b8d 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,3 +1,3 @@
手机号
-13448902715
-13525397706
\ No newline at end of file
+15121074365
+13630297765
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index c7a1079..3edc2c9 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -9,6 +9,11 @@ Library RequestsLibrary
Library OperatingSystem
*** Keywords ***
+多次执行测试用例
+ FOR ${item} IN RANGE 2
+ 首次查询婚介征婚人资料
+ END
+
首次查询${dating}征婚人资料
#获取首次婚介资料信息
FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list}
@@ -147,8 +152,7 @@ Library OperatingSystem
#选择性别
Log To Console ${CURDIR} #打印当前路径
Disable Warnings
- ${sex-code} Create List 0 1
- ${genderCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
+ ${genderCode} Evaluate random.randint(0,1) random #随机获取男女序号
#${genderCode} Evaluate 1 #固定性别，男：0，女：1
${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
Create Session dating ${${dating}.dating域名} ${client_header}
diff --git a/1-Applet/1-WriteInfo/Infomation.robot b/1-Applet/1-WriteInfo/Infomation.robot
index 83ab43e..4dfd663 100644
--- a/1-Applet/1-WriteInfo/Infomation.robot
+++ b/1-Applet/1-WriteInfo/Infomation.robot
@@ -8,14 +8,10 @@ Library RequestsLibrary
*** Test Cases ***
用户首次填写资料
Given 首次查询婚介征婚人资料
- #Then 选择婚介性别资料
- #And 选择婚介征婚人的城市
- #And 选择婚介征婚人的出生年份
- #And 选择婚介征婚人的身高
- #And 选择婚介征婚人的学历
- #And 选择婚介征婚人的婚姻状况
- #And 选择婚介征婚人的月收入
- #And 选择婚介征婚人的昵称
+ Then 查询婚介用户资料
+
+一个用户创建多条征婚数据
+ 多次执行测试用例
region
Disable Warnings
diff --git a/1-Applet/2-Homepage/BlindDate/NormalSearch.robot b/1-Applet/2-Homepage/BlindDate/NormalSearch.robot
index cc4c6a4..8f7aac9 100644
--- a/1-Applet/2-Homepage/BlindDate/NormalSearch.robot
+++ b/1-Applet/2-Homepage/BlindDate/NormalSearch.robot
@@ -12,24 +12,20 @@ Resource NormalsearchResource.robot
用户搜索征婚资料-无条件
Given 查询婚介征婚人的资料信息
- And 查询婚介征婚人资料
When 用户查询婚介搜索列表-无条件
Then 数据库查询征婚资料数量-无条件
用户搜索征婚资料-婚姻状况
Given 查询婚介征婚人的资料信息
- And 查询婚介征婚人资料
When 用户查询婚介搜索列表-婚姻状况
Then 数据库查询征婚资料数量-婚姻状况
用户搜索征婚资料-现居地
Given 查询婚介征婚人的资料信息
- And 查询婚介征婚人资料
When 用户查询婚介搜索列表-现居地
Then 数据库查询征婚资料数量-现居地
用户搜索征婚资料-学历
Given 查询婚介征婚人的资料信息
- And 查询婚介征婚人资料
When 用户查询婚介搜索列表-学历
Then 数据库查询征婚资料数量-学历
diff --git a/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot
index 89177d4..92d0f92 100644
--- a/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot
+++ b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot
@@ -8,20 +8,22 @@ Library DatabaseLibrary
*** Keywords ***
查询${dating}征婚人的资料信息
#通过userid获取征婚人的资料
+ ${miId_list} Create List
+ ${genderCodeList} Create List
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}
+ Append To List ${genderCodeList} ${genderCode}
Should Be Equal As Strings ${message} successful
END
Set Global Variable ${nickName}
Set Global Variable ${miId_list}
- Set Global Variable ${genderCode}
+ Set Global Variable ${genderCodeList}
查询${dating}征婚人资料
#通过miId查询征婚人资料
@@ -86,58 +88,78 @@ Library DatabaseLibrary
用户查询${dating}搜索列表-无条件
#无条件搜索
- FOR ${client_header} IN @{Cheader_list}
+ ${totalList} Create List
+ FOR ${client_header} ${matchmakerFlag} IN ZIP ${Cheader_list} ${matchmakerFlagList}
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
+ ${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&matchmakerFlag=${matchmakerFlag}
${total} Get From Dictionary ${reps.json()['data']} total
- Set Global Variable ${total}
+ Append To List ${totalList} ${total}
+ Set Global Variable ${totalList}
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
+ FOR ${genderCode} ${total} IN ZIP ${genderCodeList} ${totalList}
+ Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+ ${checkData} Set Variable If ${genderCode}==None SELECT COUNT(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `profile_photo` <> 'null' AND `is_delete` = '0' #查询数据库资料数量
+ ... ${genderCode}==1 SELECT COUNT(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '0' AND `profile_photo` <> 'null' AND `is_delete` = '0'
+ ... ${genderCode}==0 SELECT COUNT(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '1' AND `profile_photo` <> 'null' AND `is_delete` = '0'
+ ${check} Query ${checkData}
+ ${count} Set Variable ${check[0][0]}
+ Should Be Equal As Numbers ${count} ${total}
+ Disconnect From Database
+ END
用户查询${dating}搜索列表-婚姻状况
#微醺条件搜索
${StatusCode} Create List 0 1 2
- ${maritalCode} Evaluate random.choice(${StatusCode}) random #随机获取多个婚姻状况
- FOR ${client_header} IN @{Cheader_list}
+ ${totalList} Create List
+ ${maritalCodeList} Create List
+ FOR ${client_header} ${matchmakerFlag} IN ZIP ${Cheader_list} ${matchmakerFlagList}
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=${maritalCode}&unlock=0&pageNum=1&pageSize=1000
+ ${maritalCode} Evaluate random.choice(${StatusCode}) random #随机获取多个婚姻状况
+ ${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=${maritalCode}&unlock=0&pageNum=1&pageSize=1000&matchmakerFlag=${matchmakerFlag}
${total} Get From Dictionary ${reps.json()['data']} total
- Set Global Variable ${total}
+ Append To List ${totalList} ${total}
+ Append To List ${maritalCodeList} ${maritalCode}
+ Set Global Variable ${totalList}
+ Set Global Variable ${maritalCodeList}
END
- Set Global Variable ${maritalCode}
数据库查询征婚资料数量-婚姻状况
- 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` = '${maritalCode}' #查询数据库资料数量
- ${count} Set Variable ${check[0][0]}
- Should Be Equal As Numbers ${count} ${total}
- Disconnect From Database
+ FOR ${maritalCode} ${genderCode} ${total} IN ZIP ${maritalCodeList} ${genderCodeList} ${totalList}
+ Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+ ${checkData} Set Variable If ${genderCode}==None SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `profile_photo` <> 'null' AND `is_delete` = '0' AND `marital_status_code` = '${maritalCode}'
+ ... ${genderCode}==0 SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = 1 AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `marital_status_code` = '${maritalCode}'
+ ... ${genderCode}==1 SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = 0 AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `marital_status_code` = '${maritalCode}'
+ ${check} Query ${checkData} #查询数据库资料数量
+ ${count} Set Variable ${check[0][0]}
+ Should Be Equal As Numbers ${count} ${total}
+ Disconnect From Database
+ END
用户查询${dating}搜索列表-现居地
#无条件搜索
- #region固定省市-广州
- FOR ${client_header} IN @{Cheader_list}
+ region固定省市-广州
+ ${totalList} Create List
+ FOR ${client_header} ${matchmakerFlag} IN ZIP ${Cheader_list} ${matchmakerFlagList}
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
+ ${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&matchmakerFlag=${matchmakerFlag}
${total} Get From Dictionary ${reps.json()['data']} total
- Set Global Variable ${total}
+ Append To List ${totalList} ${total}
+ Set Global Variable ${totalList}
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 `city_code` = '${cityCode}' #查询数据库资料数量
- ${count} Set Variable ${check[0][0]}
- Should Be Equal As Numbers ${count} ${total}
- Disconnect From Database
+ FOR ${genderCode} ${total} IN ZIP ${genderCodeList} ${totalList}
+ Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+ ${checkData} Set Variable If ${genderCode}==None SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE \ `profile_photo` <> 'null' AND `is_delete` = '0' AND `province_code` = '${provinceCode}' AND `city_code` = '${cityCode}'
+ ... ${genderCode}==0 SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '1' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `province_code` = '${provinceCode}' AND `city_code` = '${cityCode}'
+ ... ${genderCode}==1 SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '$1' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `province_code` = '${provinceCode}' AND `city_code` = '${cityCode}'
+ ${check} Query ${checkData} #查询数据库资料数量
+ ${count} Set Variable ${check[0][0]}
+ Should Be Equal As Numbers ${count} ${total}
+ Disconnect From Database
+ END
region固定省市-广州
Disable Warnings
@@ -169,21 +191,27 @@ region固定省市-广州
用户查询${dating}搜索列表-学历
#微醺条件搜索
- #选择婚介征婚人的学历
- FOR ${client_header} IN @{Cheader_list}
+ 选择婚介征婚人的学历
+ ${totalList} Create List
+ FOR ${client_header} ${matchmakerFlag} IN ZIP ${Cheader_list} ${matchmakerFlagList}
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
+ ${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&matchmakerFlag=${matchmakerFlag}
${total} Get From Dictionary ${reps.json()['data']} total
- Set Global Variable ${total}
+ Append To List ${totalList} ${total}
+ Set Global Variable ${totalList}
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
+ FOR ${genderCode} ${total} IN ZIP ${genderCodeList} ${totalList}
+ Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+ ${checkData} Set Variable If ${genderCode}==None SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `profile_photo` <> 'null' AND `is_delete` = '0' AND `education_code` = '${educationCode}' AND `education` = '${education}'
+ ... ${genderCode}==0 SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '1' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `education_code` = '${educationCode}' AND `education` = '${education}'
+ ... ${genderCode}==1 SELECT count(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '0' AND `profile_photo` <> 'null' AND `is_delete` = '0' AND `education_code` = '${educationCode}' AND `education` = '${education}'
+ ${check} Query ${checkData} #查询数据库资料数量
+ ${count} Set Variable ${check[0][0]}
+ Should Be Equal As Numbers ${count} ${total}
+ Disconnect From Database
+ END
选择${dating}征婚人的学历
#获取学历列表
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index f2098d4..4b8ee74 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -99,7 +99,6 @@ Resource ../../../0-Login/LoginResource.robot
${womanvalue_list} Create List 赖勇兰,441481199509213863 赖敏怡,441521199410142320
#男生身份证
${manvalue_list} Create List 王颖勋,44058319951227041X 李博,429006198410300956 臧琨,654001198103171417 张山,522328199807132811
- ${man_value} Evaluate random.choice(${value_list}) random
${code} Evaluate 0
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
diff --git a/Phone.txt b/Phone.txt
index 0dcaf7b..5c3f3fc 100644
--- a/Phone.txt
+++ b/Phone.txt
@@ -107,3 +107,5 @@
13669248735,888888
13525397706,888888
13448902715,888888
+15139157247,888888
+13630297765,888888
diff --git a/output/log.html b/output/log.html
index 82c4eef..e46f80b 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,28 +1806,25 @@ function stopPropagation(event) {
window.output = {};
-