GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-11 02:39:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor-hrp-interface' into 'feat/yuhongzheng/harmony'

Browse Source 
# Conflicts:
#   hrp/internal/version/VERSION
This commit is contained in:
李隆
2024-09-20 10:04:58 +00:00
parent a63a575c37 f84aa615b0
commit 369a30b378
11 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hrp/pkg/uixt/android_adb_driver.go
View File

@@ -117,15 +117,17 @@ func (ad *adbDriver) WindowSize() (size Size, err error) {
ad.windowSize = &size
}
orientation, err := ad.Orientation()
if err != nil {
log.Warn().Err(err).Msgf("window size get orientation failed, use default orientation")
orientation, err2 := ad.Orientation()
if err2 != nil {
orientation = OrientationPortrait
log.Warn().Err(err2).Msgf(
"get window orientation failed, use default %s", orientation)
}
if orientation != OrientationPortrait {
size.Width, size.Height = size.Height, size.Width
}
return
// Notice: do not return err if get window orientation failed
return size, nil
}
func (ad *adbDriver) Screen() (screen Screen, err error) {
@@ -535,7 +537,7 @@ func (ad *adbDriver) Screenshot() (raw *bytes.Buffer, err error) {
if err == nil {
return bytes.NewBuffer(resp), nil
}
return nil, err
return nil, errors.Wrap(err, "adb screencap failed")
}
func (ad *adbDriver) Source(srcOpt ...SourceOption) (source string, err error) {

8
hrp/pkg/uixt/android_test.go
View File

@@ -42,14 +42,6 @@ func TestAndroidDevice_GetPackageInfo(t *testing.T) {
t.Log(appInfo)
}
func TestIOSDevice_GetPackageInfo(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
appInfo, err := device.GetPackageInfo("com.apple.Preferences")
checkErr(t, err)
t.Log(appInfo)
}
func TestDriver_NewSession(t *testing.T) {
driver, err := NewUIADriver(nil, uiaServerURL)
if err != nil {

2
hrp/pkg/uixt/ios_driver.go
View File

@@ -564,7 +564,7 @@ func (wd *wdaDriver) DragFloat(fromX, fromY, toX, toY float64, options ...Action
// update data options in post data for extra WDA configurations
actionOptions.updateData(data)
// wda 43 version
_, err = wd.httpPOST(data, "/session", wd.session.ID, "/wda/drag")
_, err = wd.httpPOST(data, "/session", wd.session.ID, "/wda/dragfromtoforduration")
return
}

10
hrp/pkg/uixt/ios_test.go
View File

@@ -71,7 +71,7 @@ func TestNewIOSDevice(t *testing.T) {
}
func TestNewWDAHTTPDriver(t *testing.T) {
device, _ := NewIOSDevice()
device, _ := NewIOSDevice(WithWDAPort(8700), WithWDAMjpegPort(8800))
var err error
_, err = device.NewHTTPDriver(nil)
if err != nil {
@@ -85,6 +85,14 @@ func TestNewUSBDriver(t *testing.T) {
// t.Log(driver.IsWdaHealthy())
}
func TestIOSDevice_GetPackageInfo(t *testing.T) {
device, err := NewIOSDevice(WithWDAPort(8700))
checkErr(t, err)
appInfo, err := device.GetPackageInfo("com.apple.Preferences")
checkErr(t, err)
t.Log(appInfo)
}
func TestDriver_DeviceScaleRatio(t *testing.T) {
setup(t)

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

@@ -62,7 +62,7 @@ func (dExt *DriverExt) GetScreenResult(options ...ActionOption) (screenResult *S
windowSize, err = dExt.Driver.WindowSize()
if err != nil {
lastErr = errors.Wrap(code.MobileUIDriverError, err.Error())
lastErr = errors.Wrap(code.DeviceGetInfoError, err.Error())
continue
}

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

@@ -19,14 +19,14 @@ func assertRelative(p float64) bool {
func (dExt *DriverExt) SwipeRelative(fromX, fromY, toX, toY float64, options ...ActionOption) error {
if !assertRelative(fromX) || !assertRelative(fromY) ||
!assertRelative(toX) || !assertRelative(toY) {
return errors.Wrap(code.MobileUISwipeError,
return errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("fromX(%f), fromY(%f), toX(%f), toY(%f) must be less than 1",
fromX, fromY, toX, toY))
}
windowSize, err := dExt.Driver.WindowSize()
if err != nil {
return errors.Wrap(code.MobileUISwipeError, err.Error())
return errors.Wrap(code.DeviceGetInfoError, err.Error())
}
width := windowSize.Width
height := windowSize.Height