GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-09 06:23:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move android options to pkg/uixt/options

Browse Source
This commit is contained in:
lilong.129
2025-02-06 15:34:36 +08:00
parent 14c81ea142
commit 8a78ba6477
14 changed files with 124 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/uitest/android_e2e_delay_test.go
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 TestAndroidDouyinE2E(t *testing.T) {
@@ -14,7 +15,9 @@ func TestAndroidDouyinE2E(t *testing.T) {
"device": "${ENV(SerialNumber)}",
"ups": "${ENV(LIVEUPLIST)}",
}).
SetAndroid(uixt.WithSerialNumber("$device"), uixt.WithAdbLogOn(true)),
SetAndroid(
options.WithSerialNumber("$device"),
options.WithAdbLogOn(true)),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").
Android().

3
examples/uitest/bili/android/cli.go
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.NewAndroidDevice(uixt.WithSerialNumber(serial))
device, _ := uixt.NewAndroidDevice(options.WithSerialNumber(serial))
driver, err = device.NewDriver()
if err != nil {
return nil, err

3
examples/uitest/demo_android_feed_swipe_test.go
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 TestAndroidDouyinFeedTest(t *testing.T) {
@@ -15,7 +16,7 @@ func TestAndroidDouyinFeedTest(t *testing.T) {
WithVariables(map[string]interface{}{
"device": "${ENV(SerialNumber)}",
}).
SetAndroid(uixt.WithSerialNumber("$device")),
SetAndroid(options.WithSerialNumber("$device")),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").
Android().

3
examples/uitest/demo_android_live_swipe_test.go
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 TestAndroidLiveSwipeTest(t *testing.T) {
@@ -15,7 +16,7 @@ func TestAndroidLiveSwipeTest(t *testing.T) {
WithVariables(map[string]interface{}{
"device": "${ENV(SerialNumber)}",
}).
SetAndroid(uixt.WithSerialNumber("$device")),
SetAndroid(options.WithSerialNumber("$device")),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").
Android().

4
examples/uitest/demo_harmony_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
hrp "github.com/httprunner/httprunner/v5"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
func TestHamonyDouyinFeedTest(t *testing.T) {
@@ -16,7 +16,7 @@ func TestHamonyDouyinFeedTest(t *testing.T) {
"device": "a38c2c5c",
"query": "${ENV(query)}",
}).
SetAndroid(uixt.WithSerialNumber("$device")),
SetAndroid(options.WithSerialNumber("$device")),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").
Android().

6
examples/uitest/expert_test.go
View File

@@ -18,9 +18,9 @@ func TestAndroidExpertTest(t *testing.T) {
"app_name": "抖音",
}).
SetAndroid(
uixt.WithSerialNumber("$device"),
uixt.WithAdbLogOn(true),
uixt.WithUIA2(true),
options.WithSerialNumber("$device"),
options.WithAdbLogOn(true),
options.WithUIA2(true),
),
TestSteps: []hrp.IStep{
// 温启动

2
examples/worldcup/main.go
View File

@@ -51,7 +51,7 @@ func initIOSDevice(uuid string) uixt.IDevice {
}
func initAndroidDevice(uuid string) uixt.IDevice {
device, err := uixt.NewAndroidDevice(uixt.WithSerialNumber(uuid))
device, err := uixt.NewAndroidDevice(options.WithSerialNumber(uuid))
if err != nil {
log.Fatal().Err(err).Msg("failed to init android device")
}