GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 23:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: update DataOptions

Browse Source
This commit is contained in:
xucong.053
2022-10-17 14:32:28 +08:00
parent bb7674c960
commit 299a5b2c65
10 changed files with 159 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/tap.go
+11 -24
View File
@@ -65,16 +65,12 @@ func (dExt *DriverExt) GetImageXY(imagePath string, options ...DataOption) (poin
}
func (dExt *DriverExt) TapByOCR(ocrText string, options ...DataOption) error {
data := map[string]interface{}{}
for _, option := range options {
option(data)
}
data := NewData(options...)
point, err := dExt.GetTextXY(ocrText, options...)
if err != nil {
if d, ok := data["ignoreNotFoundError"]; ok {
if b, ok := d.(bool); b && ok {
return nil
}
if data.IgnoreNotFoundError {
return nil
}
return err
}
@@ -83,16 +79,12 @@ func (dExt *DriverExt) TapByOCR(ocrText string, options ...DataOption) error {
}
func (dExt *DriverExt) TapByCV(imagePath string, options ...DataOption) error {
data := map[string]interface{}{}
for _, option := range options {
option(data)
}
data := NewData(options...)
point, err := dExt.GetImageXY(imagePath, options...)
if err != nil {
if d, ok := data["ignoreNotFoundError"]; ok {
if b, ok := d.(bool); b && ok {
return nil
}
if data.IgnoreNotFoundError {
return nil
}
return err
}
@@ -111,17 +103,12 @@ func (dExt *DriverExt) TapOffset(param string, xOffset, yOffset float64, options
return ele.Click()
}
data := map[string]interface{}{}
for _, option := range options {
option(data)
}
data := NewData(options...)
x, y, width, height, err := dExt.FindUIRectInUIKit(param, options...)
if err != nil {
if d, ok := data["ignoreNotFoundError"]; ok {
if b, ok := d.(bool); b && ok {
return nil
}
if data.IgnoreNotFoundError {
return nil
}
return err
}