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

change: remove duplicate code

Browse Source
This commit is contained in:
lilong.129
2024-09-01 17:05:38 +08:00
parent 50e21ce390
commit f1e4caeef8
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hrp/pkg/uixt/ext.go
View File

@@ -104,23 +104,6 @@ func (dExt *DriverExt) GetStepCacheData() map[string]interface{} {
return cacheData return cacheData
} }
// isPathExists returns true if path exists, whether path is file or dir
func isPathExists(path string) bool {
if _, err := os.Stat(path); os.IsNotExist(err) {
return false
}
return true
}
func (dExt *DriverExt) FindUIRectInUIKit(search string, options ...ActionOption) (point PointF, err error) {
// click on text, using OCR
if !isPathExists(search) {
return dExt.FindScreenText(search, options...)
}
err = errors.New("ocr text not found")
return
}
func (dExt *DriverExt) AssertOCR(text, assert string) bool { func (dExt *DriverExt) AssertOCR(text, assert string) bool {
var err error var err error
switch assert { switch assert {

9
hrp/pkg/uixt/screenshot.go
View File

@@ -108,6 +108,15 @@ func (dExt *DriverExt) GetScreenTexts() (ocrTexts OCRTexts, err error) {
return screenResult.Texts, nil return screenResult.Texts, nil
} }
func (dExt *DriverExt) FindUIRectInUIKit(search string, options ...ActionOption) (point PointF, err error) {
// click on text, using OCR
if !builtin.IsPathExists(search) {
return dExt.FindScreenText(search, options...)
}
err = errors.New("ocr text not found")
return
}
func (dExt *DriverExt) FindScreenText(text string, options ...ActionOption) (point PointF, err error) { func (dExt *DriverExt) FindScreenText(text string, options ...ActionOption) (point PointF, err error) {
ocrTexts, err := dExt.GetScreenTexts() ocrTexts, err := dExt.GetScreenTexts()
if err != nil { if err != nil {