refactor: move ios options to pkg/uixt/options

This commit is contained in:
lilong.129
2025-02-06 14:54:10 +08:00
parent 0c5b60b94a
commit 14c81ea142
25 changed files with 203 additions and 186 deletions

View File

@@ -7,6 +7,7 @@ import (
"time"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
var (
@@ -28,7 +29,7 @@ func init() {
}
func launchAppDriver(pkgName string) (driver *uixt.DriverExt, err error) {
device, _ := uixt.NewIOSDevice(uixt.WithUDID(serial))
device, _ := uixt.NewIOSDevice(options.WithUDID(serial))
driver, err = device.NewDriver()
if err != nil {
return nil, err

View File

@@ -7,6 +7,7 @@ import (
hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func TestIOSDouyinFollowLive(t *testing.T) {
@@ -16,9 +17,9 @@ func TestIOSDouyinFollowLive(t *testing.T) {
"app_name": "抖音",
}).
SetIOS(
uixt.WithWDALogOn(true),
uixt.WithWDAPort(8700),
uixt.WithWDAMjpegPort(8800),
options.WithWDALogOn(true),
options.WithWDAPort(8700),
options.WithWDAMjpegPort(8800),
),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").

View File

@@ -7,6 +7,7 @@ import (
hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func TestIOSDouyinLive(t *testing.T) {
@@ -16,9 +17,9 @@ func TestIOSDouyinLive(t *testing.T) {
"app_name": "抖音",
}).
SetIOS(
uixt.WithWDALogOn(true),
uixt.WithWDAPort(8700),
uixt.WithWDAMjpegPort(8800),
options.WithWDALogOn(true),
options.WithWDAPort(8700),
options.WithWDAMjpegPort(8800),
),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").

View File

@@ -7,6 +7,7 @@ import (
hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func TestWDALog(t *testing.T) {
@@ -16,8 +17,9 @@ func TestWDALog(t *testing.T) {
"app_name": "抖音",
}).
SetIOS(
uixt.WithWDALogOn(true),
uixt.WithWDAPort(8700), uixt.WithWDAMjpegPort(8800),
options.WithWDALogOn(true),
options.WithWDAPort(8700),
options.WithWDAMjpegPort(8800),
),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").

View File

@@ -5,6 +5,7 @@ import (
hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func TestAndroidExpertTest(t *testing.T) {
@@ -151,10 +152,10 @@ func TestIOSExpertTest(t *testing.T) {
"app_name": "抖音",
}).
SetIOS(
uixt.WithUDID("$device"),
uixt.WithWDALogOn(true),
uixt.WithWDAPort(8700),
uixt.WithWDAMjpegPort(8800),
options.WithUDID("$device"),
options.WithWDALogOn(true),
options.WithWDAPort(8700),
options.WithWDAMjpegPort(8800),
),
TestSteps: []hrp.IStep{
// 温启动

View File

@@ -16,6 +16,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func convertTimeToSeconds(timeStr string) (int, error) {
@@ -38,9 +39,9 @@ func convertTimeToSeconds(timeStr string) (int, error) {
func initIOSDevice(uuid string) uixt.IDevice {
device, err := uixt.NewIOSDevice(
uixt.WithUDID(uuid),
uixt.WithWDAPort(8700), uixt.WithWDAMjpegPort(8800),
uixt.WithResetHomeOnStartup(false), // not reset home on startup
options.WithUDID(uuid),
options.WithWDAPort(8700), options.WithWDAMjpegPort(8800),
options.WithResetHomeOnStartup(false), // not reset home on startup
)
if err != nil {

View File

@@ -9,6 +9,7 @@ import (
hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func TestConvertTimeToSeconds(t *testing.T) {
@@ -55,10 +56,10 @@ func TestIOSDouyinWorldCupLive(t *testing.T) {
"appBundleID": "com.ss.iphone.ugc.Aweme",
}).
SetIOS(
uixt.WithUDID(uuid),
uixt.WithWDALogOn(true),
uixt.WithWDAPort(8700),
uixt.WithWDAMjpegPort(8800),
options.WithUDID(uuid),
options.WithWDALogOn(true),
options.WithWDAPort(8700),
options.WithWDAMjpegPort(8800),
),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").