diff --git a/internal/version/VERSION b/internal/version/VERSION index 02e3e908..faff1a51 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0+2502172202 +v5.0.0+2502172207 diff --git a/pkg/uixt/harmony_test.go b/pkg/uixt/harmony_test.go index 762c14ea..7f50a672 100644 --- a/pkg/uixt/harmony_test.go +++ b/pkg/uixt/harmony_test.go @@ -9,26 +9,20 @@ import ( "github.com/httprunner/httprunner/v5/pkg/uixt/ai" ) -var ( - hdcDriver *HDCDriver - hdcDriverExt *XTDriver -) - -func setupHarmonyDevice(t *testing.T) { +func setupHDCDriverExt(t *testing.T) *XTDriver { device, err := NewHarmonyDevice() if err != nil { t.Fatal(err) } - hdcDriver, err = NewHDCDriver(device) + hdcDriver, err := NewHDCDriver(device) if err != nil { t.Fatal(err) } - hdcDriverExt = NewXTDriver(hdcDriver, - ai.WithCVService(ai.CVServiceTypeVEDEM)) + return NewXTDriver(hdcDriver, ai.WithCVService(ai.CVServiceTypeVEDEM)) } func TestWindowSize(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) size, err := driver.WindowSize() if err != nil { t.Fatal(err) @@ -37,31 +31,31 @@ func TestWindowSize(t *testing.T) { } func TestHarmonyTap(t *testing.T) { - setupHarmonyDevice(t) - err := hdcDriverExt.TapAbsXY(200, 2000) + driver := setupHDCDriverExt(t) + err := driver.TapAbsXY(200, 2000) if err != nil { t.Fatal(err) } } func TestHarmonySwipe(t *testing.T) { - setupHarmonyDevice(t) - err := hdcDriverExt.Swipe(0.5, 0.5, 0.1, 0.5) + driver := setupHDCDriverExt(t) + err := driver.Swipe(0.5, 0.5, 0.1, 0.5) if err != nil { t.Fatal(err) } } func TestHarmonyInput(t *testing.T) { - setupHarmonyDevice(t) - err := hdcDriver.Input("test") + driver := setupHDCDriverExt(t) + err := driver.Input("test") if err != nil { t.Fatal(err) } } func TestHomeScreen(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) err := driver.Home() if err != nil { t.Fatal(err) @@ -69,7 +63,7 @@ func TestHomeScreen(t *testing.T) { } func TestUnlock(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) err := driver.Unlock() if err != nil { t.Fatal(err) @@ -77,7 +71,7 @@ func TestUnlock(t *testing.T) { } func TestPressBack(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) err := driver.Back() if err != nil { t.Fatal(err) @@ -85,7 +79,7 @@ func TestPressBack(t *testing.T) { } func TestScreenshot(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) screenshot, err := driver.ScreenShot() if err != nil { t.Fatal(err) @@ -94,7 +88,7 @@ func TestScreenshot(t *testing.T) { } func TestLaunch(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) err := driver.AppLaunch("") if err != nil { t.Fatal(err) @@ -102,7 +96,7 @@ func TestLaunch(t *testing.T) { } func TestForegroundApp(t *testing.T) { - setupHarmonyDevice(t) + driver := setupHDCDriverExt(t) appInfo, err := driver.ForegroundInfo() if err != nil { t.Fatal(err)