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

change: InitWDAClient with options

Browse Source
This commit is contained in:
debugtalk
2022-08-31 18:17:53 +08:00
parent 7f713c5be9
commit 3aed97eab1
7 changed files with 16 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hrp/internal/uixt/drag_test.go
View File

@@ -2,15 +2,10 @@ package uixt
import (
"testing"
"github.com/electricbubble/gwda"
)
func TestDriverExt_Drag(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_map.png"

7
hrp/internal/uixt/gesture_test.go
View File

@@ -4,8 +4,6 @@ import (
"strconv"
"strings"
"testing"
"github.com/electricbubble/gwda"
)
func TestDriverExt_GesturePassword(t *testing.T) {
@@ -15,10 +13,7 @@ func TestDriverExt_GesturePassword(t *testing.T) {
password[i], _ = strconv.Atoi(split[i])
}
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_5.png"

12
hrp/internal/uixt/init.go
View File

@@ -21,18 +21,8 @@ const (
dismissAlertButtonSelector = "**/XCUIElementTypeButton[`label IN {'不允许','暂不'}`]"
)
func InitWDAClient(udid string, port, mjpeg_port int) (*DriverExt, error) {
func InitWDAClient(options ...gwda.DeviceOption) (*DriverExt, error) {
// init wda device
var options []gwda.DeviceOption
if udid != "" {
options = append(options, gwda.WithSerialNumber(udid))
}
if port != 0 {
options = append(options, gwda.WithPort(port))
}
if mjpeg_port != 0 {
options = append(options, gwda.WithMjpegPort(mjpeg_port))
}
targetDevice, err := gwda.NewDevice(options...)
if err != nil {
return nil, err

9
hrp/internal/uixt/ocr_test.go
View File

@@ -2,20 +2,15 @@ package uixt
import (
"testing"
"github.com/electricbubble/gwda"
)
func TestDriverExtOCR(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
x, y, width, height, err := driverExt.FindTextByOCR("抖音")
checkErr(t, err)
t.Logf("x: %v, y: %v, width: %v, height: %v", x, y, width, height)
driver.TapFloat(x, y-20)
driverExt.WebDriver.TapFloat(x+width*0.5, y+height*0.5-20)
}

17
hrp/internal/uixt/tap_test.go
View File

@@ -2,15 +2,10 @@ package uixt
import (
"testing"
"github.com/electricbubble/gwda"
)
func TestDriverExt_TapWithNumber(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/flag7.png"
@@ -25,10 +20,7 @@ func TestDriverExt_TapWithNumber(t *testing.T) {
}
func TestDriverExt_TapXY(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
err = driverExt.TapXY(0.4, 0.5)
@@ -36,10 +28,7 @@ func TestDriverExt_TapXY(t *testing.T) {
}
func TestDriverExt_TapWithOCR(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
// 需要点击文字上方的图标

12
hrp/internal/uixt/touch_test.go
View File

@@ -2,15 +2,10 @@ package uixt
import (
"testing"
"github.com/electricbubble/gwda"
)
func TestDriverExt_ForceTouch(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_ft.png"
@@ -26,10 +21,7 @@ func TestDriverExt_ForceTouch(t *testing.T) {
}
func TestDriverExt_TouchAndHold(t *testing.T) {
driver, err := gwda.NewUSBDriver(nil)
checkErr(t, err)
driverExt, err := Extend(driver, 0.95)
driverExt, err := InitWDAClient()
checkErr(t, err)
pathSearch := "/Users/hero/Documents/temp/2020-05/opencv/IMG_ft.png"

7
hrp/step_ios_ui.go
View File

@@ -5,6 +5,7 @@ import (
"strings"
"time"
"github.com/electricbubble/gwda"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
@@ -427,7 +428,11 @@ func (r *HRPRunner) InitWDAClient(device WDADevice) (client *uiDriver, err error
}
}
driverExt, err := uixt.InitWDAClient(device.UDID, device.Port, device.MjpegPort)
driverExt, err := uixt.InitWDAClient(
gwda.WithSerialNumber(device.UDID),
gwda.WithPort(device.Port),
gwda.WithMjpegPort(device.MjpegPort),
)
if err != nil {
return nil, err
}