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

refactor: ui validation

Browse Source
This commit is contained in:
buyuxiang
2023-07-31 19:39:59 +08:00
parent 1e43a827a2
commit 43dee8dc4a
2 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,31 +253,66 @@ func (dExt *DriverExt) FindUIRectInUIKit(search string, options ...ActionOption)
return dExt.FindImageRectInUIKit(search, options...)
}
func (dExt *DriverExt) IsOCRExist(text string) bool {
_, err := dExt.FindScreenText(text)
return err == nil
func (dExt *DriverExt) AssertOCR(text, assert string) bool {
var err error
switch assert {
case AssertionEqual:
_, err = dExt.FindScreenText(text)
return err == nil
case AssertionNotEqual:
_, err = dExt.FindScreenText(text)
return err != nil
case AssertionExists:
_, err = dExt.FindScreenText(text, WithRegex(true))
return err == nil
case AssertionNotExists:
_, err = dExt.FindScreenText(text, WithRegex(true))
return err != nil
default:
log.Warn().Str("assert method", assert).Msg("unexpected assert method")
}
return false
}
func (dExt *DriverExt) IsImageExist(text string) bool {
_, err := dExt.FindImageRectInUIKit(text)
return err == nil
func (dExt *DriverExt) AssertImage(imagePath, assert string) bool {
var err error
switch assert {
case AssertionExists:
_, err = dExt.FindImageRectInUIKit(imagePath)
return err == nil
case AssertionNotExists:
_, err = dExt.FindImageRectInUIKit(imagePath)
return err != nil
default:
log.Warn().Str("assert method", assert).Msg("unexpected assert method")
}
return false
}
func (dExt *DriverExt) AssertForegroundApp(appName, assert string) bool {
var err error
switch assert {
case AssertionEqual:
err = dExt.Driver.AssertForegroundApp(appName)
return err == nil
case AssertionNotEqual:
err = dExt.Driver.AssertForegroundApp(appName)
return err != nil
default:
log.Warn().Str("assert method", assert).Msg("unexpected assert method")
}
return false
}
func (dExt *DriverExt) DoValidation(check, assert, expected string, message ...string) bool {
var exp bool
if assert == AssertionExists || assert == AssertionEqual {
exp = true
} else {
exp = false
}
var result bool
switch check {
case SelectorOCR:
result = (dExt.IsOCRExist(expected) == exp)
result = dExt.AssertOCR(expected, assert)
case SelectorImage:
result = (dExt.IsImageExist(expected) == exp)
result = dExt.AssertImage(expected, assert)
case SelectorForegroundApp:
result = ((dExt.Driver.AssertForegroundApp(expected) == nil) == exp)
result = dExt.AssertForegroundApp(expected, assert)
}
if !result {

4
hrp/pkg/uixt/swipe.go
View File

@@ -141,14 +141,14 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
}
points, err := screenTexts.FindTexts(texts, dExt.ParseActionOptions(options...)...)
if err != nil {
log.Warn().Msgf("swipeToTapTexts failed: %s", err.Error())
log.Error().Err(err).Msg("swipeToTapTexts failed")
// target texts not found, try to auto handle popup
if e := dExt.AutoPopupHandler(screenTexts); e != nil {
log.Error().Err(e).Msg("auto handle popup failed")
}
return err
}
log.Info().Strs("tests", texts).Interface("results", points).Msg("swipeToTapTexts successful")
log.Info().Strs("texts", texts).Interface("results", points).Msg("swipeToTapTexts successful")
// target texts found, pick the first one
point = points[0].Center() // FIXME