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

change: add capabilities for driver

Browse Source
This commit is contained in:
debugtalk
2022-10-11 18:16:48 +08:00
parent 3683589b37
commit acb9c80a93
11 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ func (dev *AndroidDevice) UUID() string {
return dev.SerialNumber
}
func (dev *AndroidDevice) NewDriver() (driverExt *DriverExt, err error) {
func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error) {
var deviceOptions []AndroidDeviceOption
if dev.SerialNumber != "" {
deviceOptions = append(deviceOptions, WithSerialNumber(dev.SerialNumber))
@@ -122,11 +122,11 @@ func (dev *AndroidDevice) NewDriver() (driverExt *DriverExt, err error) {
if err != nil {
return nil, err
}
return androidDevice.InitUIAClient()
return androidDevice.initUIAClient(capabilities)
}
func (dev *AndroidDevice) InitUIAClient() (*DriverExt, error) {
driver, err := dev.NewUSBDriver(nil)
func (dev *AndroidDevice) initUIAClient(capabilities Capabilities) (*DriverExt, error) {
driver, err := dev.NewUSBDriver(capabilities)
if err != nil {
return nil, errors.Wrap(err, "failed to init UIA driver")
}

5
hrp/pkg/uixt/demo/main_test.go
View File

@@ -12,7 +12,10 @@ func TestIOSDemo(t *testing.T) {
if err != nil {
t.Fatal(err)
}
driverExt, err := device.InitWDAClient()
capabilities := uixt.NewCapabilities()
capabilities.WithDefaultAlertAction(uixt.AlertActionAccept) // or uixt.AlertActionDismiss
driverExt, err := device.NewDriver(capabilities)
if err != nil {
t.Fatal(err)
}

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

@@ -7,9 +7,7 @@ import (
)
func TestDriverExt_Drag(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_map.png"

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

@@ -15,9 +15,7 @@ func TestDriverExt_GesturePassword(t *testing.T) {
password[i], _ = strconv.Atoi(split[i])
}
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_5.png"

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

@@ -802,7 +802,7 @@ func WithFrequency(frequency int) DataOption {
// current implemeted device: IOSDevice, AndroidDevice
type Device interface {
UUID() string
NewDriver() (driverExt *DriverExt, err error)
NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error)
}
// WebDriver defines methods supported by WebDriver drivers.

14
hrp/pkg/uixt/ios_device.go
View File

@@ -140,7 +140,7 @@ func (dev *IOSDevice) UUID() string {
return dev.UDID
}
func (dev *IOSDevice) NewDriver() (driverExt *DriverExt, err error) {
func (dev *IOSDevice) NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error) {
var deviceOptions []IOSDeviceOption
if dev.UDID != "" {
deviceOptions = append(deviceOptions, WithUDID(dev.UDID))
@@ -156,15 +156,17 @@ func (dev *IOSDevice) NewDriver() (driverExt *DriverExt, err error) {
if err != nil {
return nil, err
}
return iosDevice.InitWDAClient()
return iosDevice.initWDAClient(capabilities)
}
func (dev *IOSDevice) InitWDAClient() (driverExt *DriverExt, err error) {
func (dev *IOSDevice) initWDAClient(capabilities Capabilities) (driverExt *DriverExt, err error) {
// init WDA driver
capabilities := NewCapabilities()
capabilities.WithDefaultAlertAction(AlertActionAccept)
var driver WebDriver
if capabilities == nil {
capabilities = NewCapabilities()
capabilities.WithDefaultAlertAction(AlertActionAccept)
}
var driver WebDriver
if env.WDA_USB_DRIVER == "" {
// default use http driver
driver, err = dev.NewHTTPDriver(capabilities)

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

@@ -7,9 +7,7 @@ import (
)
func TestDriverExtOCR(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
x, y, width, height, err := driverExt.FindTextByOCR("抖音")

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

@@ -7,9 +7,7 @@ import (
)
func TestSwipeUntil(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
var point PointF

22
hrp/pkg/uixt/tap_test.go
View File

@@ -6,10 +6,14 @@ import (
"testing"
)
var iosDevice *IOSDevice
func init() {
iosDevice, _ = NewIOSDevice()
}
func TestDriverExt_TapWithNumber(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/flag7.png"
@@ -22,9 +26,7 @@ func TestDriverExt_TapWithNumber(t *testing.T) {
}
func TestDriverExt_TapXY(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
err = driverExt.TapXY(0.4, 0.5, "")
@@ -32,9 +34,7 @@ func TestDriverExt_TapXY(t *testing.T) {
}
func TestDriverExt_TapAbsXY(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
err = driverExt.TapAbsXY(100, 300, "")
@@ -42,9 +42,7 @@ func TestDriverExt_TapAbsXY(t *testing.T) {
}
func TestDriverExt_TapWithOCR(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
// 需要点击文字上方的图标

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

@@ -7,9 +7,7 @@ import (
)
func TestDriverExt_ForceTouch(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_ft.png"
@@ -25,9 +23,7 @@ func TestDriverExt_ForceTouch(t *testing.T) {
}
func TestDriverExt_TouchAndHold(t *testing.T) {
device, err := NewIOSDevice()
checkErr(t, err)
driverExt, err := device.InitWDAClient()
driverExt, err := iosDevice.NewDriver(nil)
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_ft.png"

2
hrp/step_ios_ui.go
View File

@@ -503,7 +503,7 @@ func (r *HRPRunner) initUIClient(device uixt.Device) (client *uixt.DriverExt, er
}
}
client, err = device.NewDriver()
client, err = device.NewDriver(nil)
if err != nil {
return nil, err
}