mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-24 17:59:58 +08:00
refactor: XTDriver
This commit is contained in:
@@ -97,7 +97,7 @@ func TestDriver_DeviceSize(t *testing.T) {
|
||||
func TestDriver_Source(t *testing.T) {
|
||||
setupAndroidUIA2Driver(t)
|
||||
|
||||
source, err := driverExt.GetDriver().Source()
|
||||
source, err := driverExt.Source()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -134,7 +134,7 @@ func TestDriver_DeviceInfo(t *testing.T) {
|
||||
|
||||
func TestDriver_Tap(t *testing.T) {
|
||||
setupAndroidUIA2Driver(t)
|
||||
driverExt.GetDriver().StartCaptureLog("")
|
||||
driverExt.StartCaptureLog("")
|
||||
err := driverExt.TapXY(0.5, 0.5,
|
||||
option.WithIdentifier("test"),
|
||||
option.WithPressDuration(4))
|
||||
@@ -143,18 +143,18 @@ func TestDriver_Tap(t *testing.T) {
|
||||
}
|
||||
//time.Sleep(time.Second)
|
||||
//
|
||||
//err = driverExt.GetDriver().Tap(60.5, 125.5, WithIdentifier("test"))
|
||||
//err = driverExt.Tap(60.5, 125.5, WithIdentifier("test"))
|
||||
//if err != nil {
|
||||
// t.Fatal(err)
|
||||
//}
|
||||
//time.Sleep(time.Second)
|
||||
//result, _ := driverExt.GetDriver().StopCaptureLog()
|
||||
//result, _ := driverExt.StopCaptureLog()
|
||||
//t.Log(result)
|
||||
}
|
||||
|
||||
func TestDriver_Swipe(t *testing.T) {
|
||||
setupAndroidUIA2Driver(t)
|
||||
err := driverExt.GetDriver().Swipe(400, 1000, 400, 500,
|
||||
err := driverExt.Swipe(400, 1000, 400, 500,
|
||||
option.WithPressDuration(0.5))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -186,7 +186,7 @@ func TestDriver_Drag(t *testing.T) {
|
||||
func TestDriver_SendKeys(t *testing.T) {
|
||||
setupAndroidUIA2Driver(t)
|
||||
|
||||
err := driverExt.GetDriver().SendKeys("辽宁省沈阳市新民市民族街36-4",
|
||||
err := driverExt.SendKeys("辽宁省沈阳市新民市民族街36-4",
|
||||
option.WithIdentifier("test"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -224,10 +224,10 @@ func TestDriver_SetRotation(t *testing.T) {
|
||||
|
||||
func TestDriver_GetOrientation(t *testing.T) {
|
||||
setupAndroidUIA2Driver(t)
|
||||
_, _ = driverExt.GetDriver().AppTerminate("com.quark.browser")
|
||||
_ = driverExt.GetDriver().AppLaunch("com.quark.browser")
|
||||
_, _ = driverExt.AppTerminate("com.quark.browser")
|
||||
_ = driverExt.AppLaunch("com.quark.browser")
|
||||
time.Sleep(2 * time.Second)
|
||||
_ = driverExt.GetDriver().Homescreen()
|
||||
_ = driverExt.Homescreen()
|
||||
}
|
||||
|
||||
func Test_getFreePort(t *testing.T) {
|
||||
@@ -262,10 +262,10 @@ func TestDriver_IsAppInForeground(t *testing.T) {
|
||||
setupAndroidUIA2Driver(t)
|
||||
// setupAndroidAdbDriver(t)
|
||||
|
||||
err := driverExt.GetDriver().AppLaunch("com.android.settings")
|
||||
err := driverExt.AppLaunch("com.android.settings")
|
||||
checkErr(t, err)
|
||||
|
||||
app, err := driverExt.GetDriver().GetForegroundApp()
|
||||
app, err := driverExt.GetForegroundApp()
|
||||
checkErr(t, err)
|
||||
if app.PackageName != "com.android.settings" {
|
||||
t.FailNow()
|
||||
@@ -274,18 +274,18 @@ func TestDriver_IsAppInForeground(t *testing.T) {
|
||||
t.FailNow()
|
||||
}
|
||||
|
||||
err = driverExt.GetDriver().AssertForegroundApp("com.android.settings")
|
||||
err = driverExt.AssertForegroundApp("com.android.settings")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
time.Sleep(2 * time.Second)
|
||||
_, err = driverExt.GetDriver().AppTerminate("com.android.settings")
|
||||
_, err = driverExt.AppTerminate("com.android.settings")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err = driverExt.GetDriver().AssertForegroundApp("com.android.settings")
|
||||
err = driverExt.AssertForegroundApp("com.android.settings")
|
||||
if err == nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -385,7 +385,7 @@ func TestTapTexts(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}
|
||||
err := driverExt.GetDriver().TapByTexts(actions...)
|
||||
err := driverExt.TapByTexts(actions...)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -393,7 +393,7 @@ func TestTapTexts(t *testing.T) {
|
||||
|
||||
func TestRecordVideo(t *testing.T) {
|
||||
setupAndroidAdbDriver(t)
|
||||
path, err := driverExt.GetDriver().(*ADBDriver).RecordScreen("", 5*time.Second)
|
||||
path, err := driverExt.RecordScreen("", 5*time.Second)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -403,7 +403,7 @@ func TestRecordVideo(t *testing.T) {
|
||||
func Test_Android_Backspace(t *testing.T) {
|
||||
setupAndroidAdbDriver(t)
|
||||
|
||||
err := driverExt.GetDriver().Backspace(1)
|
||||
err := driverExt.Backspace(1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user