diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 8f28038..fbdb1fc 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -4,6 +4,10 @@ Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
Resource LoginResource.robot
Library String
Library Collections
+Library OperatingSystem
+Library ImageHorizonLibrary
+
+*** Variables ***
*** Test Cases ***
游客使用婚介平台
@@ -41,7 +45,15 @@ Library Collections
删除已浏览数据次数
+用户扫描红娘二维码注册登录
+ Given 读取TXT文件
+ And 用户手机号验证码登录婚介平台-888888
+ And 查询用户的婚介组织
+ When 扫描婚介红娘二维码
+ Then 获取婚介平台用户baseinfo并判断是否是红娘
+
000
+ [Template]
#Given 创建一个列表
#Then 同时执行多个参数的FOR循环
#${NUM} Generate Random String 18 [NUMBERS] #随机生成18位的数字
@@ -89,14 +101,19 @@ Library Collections
#${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
+ #${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
+ #解析二维码图片
+ ${filepath} Evaluate open(r'./matchmaker.png')
+ Set Reference Folder ${EXECDIR}
+ #${img} Copy From The Above Of ${filepath} 20
数据库删除用户
Given 读取TXT文件
diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot
index 63b1998..6978ede 100644
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -6,6 +6,7 @@ Library Collections
Library RequestsLibrary
Library DatabaseLibrary
Library OperatingSystem
+Library ImageHorizonLibrary
*** Keywords ***
读取TXT文件
@@ -195,6 +196,53 @@ Library OperatingSystem
Set Global Variable ${phone}
Set Global Variable ${matchmakerFlag}
+扫描${dating}红娘二维码
+ #解析二维码图片
+ #${filepath} Evaluate open('./matchmaker.png','rb')
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-uec/user/verify/qrcode params=&qrCodeRecordId=972625695282958336
+ ${code} Get From Dictionary ${reps.json()} code
+ END
+
+获取${dating}平台用户baseinfo并判断是否是红娘
+ #获取baseinfo
+ 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 #登录用户是否是红娘
+ Run Keyword If ${matchmakerFlag}==False 注册婚介红娘
+ ... ELSE 查询婚介平台红娘列表
+ END
+ Set Global Variable ${phone}
+ Set Global Variable ${matchmakerFlag}
+
+注册${dating}红娘
+ #注册成为红娘
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} POST On Session dating dating-agency-uec/user/create/matchmaker
+ ${matchmakerId} Get From Dictionary ${reps.json()} data
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ END
+
+查询${dating}平台红娘列表
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${reps} GET On Session dating dating-agency-uec/user/page/matchmaker params=pageSize=10&pageNum=1
+ ${matchmaker_list} Get From Dictionary ${reps.json()['data']} records #红娘列表
+ Set Global Variable ${matchmaker_list}
+ 红娘列表
+ END
+
+红娘列表
+ FOR ${matchmaker} IN @{matchmaker_list}
+ ${Phone} Get From Dictionary ${matchmaker} phone
+ Exit For Loop If ${Phone}==19128859944
+ END
+
数据库删除用户数据
FOR ${userId} IN @{userid_list}
Connect To Database Using Custom Params pymysql database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221'
@@ -221,3 +269,10 @@ FOR循环
FOR ${i} IN @{L1}
${output} Set Variable {'item':${data}}
END
+
+通用组件 等待图形
+ [Arguments] ${图片名称} ${图片所在文件夹} ${等待时间}=${默认等待时间} ${鼠标是否挪开}=是
+ Set Reference Folder ${图片所在文件夹}
+ Run Keyword If '${鼠标是否挪开}'=='是' Mouse Move 0 500
+ Display Img ${图片所在文件夹}/${图片名称}
+ wait for ${图片名称} ${等待时间}
diff --git a/matchmaker.png b/matchmaker.png
new file mode 100644
index 0000000..f0aa862
Binary files /dev/null and b/matchmaker.png differ
diff --git a/output/log.html b/output/log.html
index 0d407df..10ffa40 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};