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

refactor: driver TapXY, TapAbsXY

Browse Source
This commit is contained in:
lilong.129
2025-02-11 17:34:59 +08:00
parent 0839ef5bd6
commit 30c0bd7488
9 changed files with 66 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/uixt/driver_utils.go
View File

@@ -8,11 +8,32 @@ import (
"github.com/httprunner/httprunner/v5/code"
)
func convertToAbsolutePoint(driver IDriver, x, y float64) (absX, absY float64, err error) {
if !assertRelative(x) || !assertRelative(y) {
err = errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("x(%f), y(%f) must be less than 1", x, y))
return
}
windowSize, err := driver.WindowSize()
if err != nil {
err = errors.Wrap(code.DeviceGetInfoError, err.Error())
return
}
absX = float64(windowSize.Width) * x
absY = float64(windowSize.Height) * y
return
}
func convertToAbsoluteCoordinates(driver IDriver, fromX, fromY, toX, toY float64) (
absFromX, absFromY, absToX, absToY float64, err error) {
err = assertCoordinatesRelative(fromX, fromY, toX, toY)
if err != nil {
if !assertRelative(fromX) || !assertRelative(fromY) ||
!assertRelative(toX) || !assertRelative(toY) {
err = errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("fromX(%f), fromY(%f), toX(%f), toY(%f) must be less than 1",
fromX, fromY, toX, toY))
return
}
@@ -32,16 +53,6 @@ func convertToAbsoluteCoordinates(driver IDriver, fromX, fromY, toX, toY float64
return absFromX, absFromY, absToX, absToY, nil
}
func assertCoordinatesRelative(fromX, fromY, toX, toY float64) error {
if !assertRelative(fromX) || !assertRelative(fromY) ||
!assertRelative(toX) || !assertRelative(toY) {
return errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("fromX(%f), fromY(%f), toX(%f), toY(%f) must be less than 1",
fromX, fromY, toX, toY))
}
return nil
}
func assertRelative(p float64) bool {
return p >= 0 && p <= 1
}