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

refactor: NewDataOptions and NewData

Browse Source
This commit is contained in:
debugtalk
2022-11-23 23:36:52 +08:00
parent f34027a63c
commit 9888cea3e5
10 changed files with 127 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/tap.go
+6 -6
View File
@@ -65,11 +65,11 @@ func (dExt *DriverExt) GetImageXY(imagePath string, options ...DataOption) (poin
}
func (dExt *DriverExt) TapByOCR(ocrText string, options ...DataOption) error {
data := NewData(map[string]interface{}{}, options...)
dataOptions := NewDataOptions(options...)
point, err := dExt.GetTextXY(ocrText, options...)
if err != nil {
if data.IgnoreNotFoundError {
if dataOptions.IgnoreNotFoundError {
return nil
}
return err
@@ -79,11 +79,11 @@ func (dExt *DriverExt) TapByOCR(ocrText string, options ...DataOption) error {
}
func (dExt *DriverExt) TapByCV(imagePath string, options ...DataOption) error {
data := NewData(map[string]interface{}{}, options...)
dataOptions := NewDataOptions(options...)
point, err := dExt.GetImageXY(imagePath, options...)
if err != nil {
if data.IgnoreNotFoundError {
if dataOptions.IgnoreNotFoundError {
return nil
}
return err
@@ -103,11 +103,11 @@ func (dExt *DriverExt) TapOffset(param string, xOffset, yOffset float64, options
return ele.Click()
}
data := NewData(map[string]interface{}{}, options...)
dataOptions := NewDataOptions(options...)
x, y, width, height, err := dExt.FindUIRectInUIKit(param, options...)
if err != nil {
if data.IgnoreNotFoundError {
if dataOptions.IgnoreNotFoundError {
return nil
}
return err