From e107389d6e5f1a4b5433e7e472675c81bf36cf40 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Wed, 5 Mar 2025 11:03:28 +0800 Subject: [PATCH] refactor: move uixt pkg --- cmd/adb/init.go | 4 ++-- cmd/adb/install.go | 4 ++-- cmd/convert.go | 4 ++-- cmd/ios/apps.go | 2 +- cmd/ios/devices.go | 2 +- cmd/ios/init.go | 4 ++-- cmd/ios/install.go | 4 ++-- cmd/ios/tunnel.go | 11 ++++++----- cmd/ios/uninstall.go | 4 ++-- compat.go | 4 ++-- config.go | 4 ++-- {pkg/convert => convert}/README.md | 0 {pkg/convert => convert}/asset/flowgram.png | Bin {pkg/convert => convert}/from_ab.go | 0 {pkg/convert => convert}/from_curl.go | 0 {pkg/convert => convert}/from_curl_test.go | 0 {pkg/convert => convert}/from_gotest.go | 0 {pkg/convert => convert}/from_har.go | 0 {pkg/convert => convert}/from_har_test.go | 0 {pkg/convert => convert}/from_jmeter.go | 0 {pkg/convert => convert}/from_json.go | 0 {pkg/convert => convert}/from_postman.go | 0 {pkg/convert => convert}/from_postman_test.go | 0 {pkg/convert => convert}/from_pytest.go | 0 {pkg/convert => convert}/from_swagger.go | 0 {pkg/convert => convert}/from_yaml.go | 0 {pkg/convert => convert}/main.go | 0 {pkg/convert => convert}/main_test.go | 0 {pkg/convert => convert}/testcase.tmpl | 0 {pkg/convert => convert}/to_gotest.go | 0 {pkg/convert => convert}/to_json.go | 0 {pkg/convert => convert}/to_pytest.go | 0 {pkg/convert => convert}/to_yaml.go | 0 examples/uitest/android_e2e_delay_test.go | 2 +- examples/uitest/bili/android/cli.go | 4 ++-- examples/uitest/bili/ios/cli.go | 6 +++--- examples/uitest/demo_android_feed_swipe_test.go | 2 +- examples/uitest/demo_android_live_swipe_test.go | 2 +- examples/uitest/demo_douyin_follow_live_test.go | 2 +- examples/uitest/demo_harmony_test.go | 2 +- examples/uitest/demo_ios_live_swipe_test.go | 2 +- examples/uitest/demo_ios_wda_log_test.go | 2 +- examples/uitest/expert_test.go | 2 +- examples/uitest/harmony_e2e_delay_test.go | 2 +- examples/worldcup/cli.go | 6 +++--- examples/worldcup/main.go | 4 ++-- examples/worldcup/main_test.go | 2 +- {pkg => internal}/httpstat/main.go | 0 .../demo => internal/httpstat}/main_test.go | 8 +++----- internal/version/VERSION | 2 +- runner.go | 4 ++-- server/app.go | 2 +- server/context.go | 6 +++--- server/device.go | 7 ++++--- server/ext/app.go | 2 +- server/ext/context.go | 6 +++--- server/key.go | 2 +- server/main.go | 2 +- server/model.go | 2 +- server/source.go | 2 +- server/ui.go | 4 ++-- server/uixt.go | 2 +- step.go | 2 +- step_function.go | 2 +- step_request.go | 4 ++-- step_ui.go | 4 ++-- step_ui_test.go | 2 +- summary.go | 2 +- {pkg/uixt => uixt}/README.md | 0 {pkg/uixt => uixt}/ai/ai.go | 3 ++- {pkg/uixt => uixt}/ai/ai_test.go | 0 {pkg/uixt => uixt}/ai/cv.go | 7 ++++--- {pkg/uixt => uixt}/ai/cv_vedem.go | 2 +- {pkg/uixt => uixt}/ai/cv_vedem_test.go | 0 {pkg/uixt => uixt}/ai/llm.go | 0 {pkg/uixt => uixt}/android_device.go | 4 ++-- {pkg/uixt => uixt}/android_driver_adb.go | 4 ++-- {pkg/uixt => uixt}/android_driver_uia2.go | 4 ++-- {pkg/uixt => uixt}/android_key.go | 0 {pkg/uixt => uixt}/android_layout.go | 0 {pkg/uixt => uixt}/android_test.go | 6 +++--- {pkg/uixt => uixt}/browser_device.go | 4 ++-- {pkg/uixt => uixt}/browser_driver.go | 4 ++-- {pkg/uixt => uixt}/demo/main_test.go | 6 +++--- {pkg/uixt => uixt}/device.go | 5 +++-- {pkg/uixt => uixt}/driver.go | 6 +++--- {pkg/uixt => uixt}/driver_action.go | 2 +- .../uixt => uixt}/driver_ext/android_stub_driver.go | 6 +++--- .../driver_ext/android_stub_driver_test.go | 2 +- {pkg/uixt => uixt}/driver_ext/browser_sub_driver.go | 4 ++-- {pkg/uixt => uixt}/driver_ext/ext.go | 6 +++--- {pkg/uixt => uixt}/driver_ext/ios_stub_driver.go | 6 +++--- .../driver_ext/ios_stub_driver_test.go | 4 ++-- {pkg/uixt => uixt}/driver_ext_popups.go | 4 ++-- {pkg/uixt => uixt}/driver_ext_screenshot.go | 6 +++--- {pkg/uixt => uixt}/driver_ext_swipe.go | 4 ++-- {pkg/uixt => uixt}/driver_ext_tap.go | 2 +- {pkg/uixt => uixt}/driver_ext_test.go | 4 ++-- {pkg/uixt => uixt}/driver_session.go | 0 {pkg/uixt => uixt}/driver_session_test.go | 0 {pkg/uixt => uixt}/driver_utils.go | 2 +- {pkg/uixt => uixt}/driver_utils_test.go | 0 {pkg/uixt => uixt}/evalite | Bin {pkg/uixt => uixt}/harmony_device.go | 5 +++-- {pkg/uixt => uixt}/harmony_driver_hdc.go | 4 ++-- {pkg/uixt => uixt}/harmony_test.go | 2 +- {pkg/uixt => uixt}/ios_device.go | 4 ++-- {pkg/uixt => uixt}/ios_driver_wda.go | 4 ++-- {pkg/uixt => uixt}/ios_test.go | 6 +++--- {pkg/uixt => uixt}/option/action.go | 0 {pkg/uixt => uixt}/option/android.go | 0 {pkg/uixt => uixt}/option/browser.go | 0 {pkg/uixt => uixt}/option/capabilities.go | 0 {pkg/uixt => uixt}/option/harmony.go | 0 {pkg/uixt => uixt}/option/install.go | 0 {pkg/uixt => uixt}/option/ios.go | 0 {pkg/uixt => uixt}/option/screen.go | 2 +- {pkg/uixt => uixt}/option/source.go | 0 {pkg/uixt => uixt}/types/app.go | 0 {pkg/uixt => uixt}/types/device.go | 0 {pkg/uixt => uixt}/types/driver.go | 0 {pkg/uixt => uixt}/types/ui.go | 0 122 files changed, 146 insertions(+), 142 deletions(-) rename {pkg/convert => convert}/README.md (100%) rename {pkg/convert => convert}/asset/flowgram.png (100%) rename {pkg/convert => convert}/from_ab.go (100%) rename {pkg/convert => convert}/from_curl.go (100%) rename {pkg/convert => convert}/from_curl_test.go (100%) rename {pkg/convert => convert}/from_gotest.go (100%) rename {pkg/convert => convert}/from_har.go (100%) rename {pkg/convert => convert}/from_har_test.go (100%) rename {pkg/convert => convert}/from_jmeter.go (100%) rename {pkg/convert => convert}/from_json.go (100%) rename {pkg/convert => convert}/from_postman.go (100%) rename {pkg/convert => convert}/from_postman_test.go (100%) rename {pkg/convert => convert}/from_pytest.go (100%) rename {pkg/convert => convert}/from_swagger.go (100%) rename {pkg/convert => convert}/from_yaml.go (100%) rename {pkg/convert => convert}/main.go (100%) rename {pkg/convert => convert}/main_test.go (100%) rename {pkg/convert => convert}/testcase.tmpl (100%) rename {pkg/convert => convert}/to_gotest.go (100%) rename {pkg/convert => convert}/to_json.go (100%) rename {pkg/convert => convert}/to_pytest.go (100%) rename {pkg/convert => convert}/to_yaml.go (100%) rename {pkg => internal}/httpstat/main.go (100%) rename {pkg/httpstat/demo => internal/httpstat}/main_test.go (76%) rename {pkg/uixt => uixt}/README.md (100%) rename {pkg/uixt => uixt}/ai/ai.go (99%) rename {pkg/uixt => uixt}/ai/ai_test.go (100%) rename {pkg/uixt => uixt}/ai/cv.go (98%) rename {pkg/uixt => uixt}/ai/cv_vedem.go (99%) rename {pkg/uixt => uixt}/ai/cv_vedem_test.go (100%) rename {pkg/uixt => uixt}/ai/llm.go (100%) rename {pkg/uixt => uixt}/android_device.go (99%) rename {pkg/uixt => uixt}/android_driver_adb.go (99%) rename {pkg/uixt => uixt}/android_driver_uia2.go (99%) rename {pkg/uixt => uixt}/android_key.go (100%) rename {pkg/uixt => uixt}/android_layout.go (100%) rename {pkg/uixt => uixt}/android_test.go (97%) rename {pkg/uixt => uixt}/browser_device.go (93%) rename {pkg/uixt => uixt}/browser_driver.go (99%) rename {pkg/uixt => uixt}/demo/main_test.go (87%) rename {pkg/uixt => uixt}/device.go (80%) rename {pkg/uixt => uixt}/driver.go (94%) rename {pkg/uixt => uixt}/driver_action.go (99%) rename {pkg/uixt => uixt}/driver_ext/android_stub_driver.go (98%) rename {pkg/uixt => uixt}/driver_ext/android_stub_driver_test.go (93%) rename {pkg/uixt => uixt}/driver_ext/browser_sub_driver.go (93%) rename {pkg/uixt => uixt}/driver_ext/ext.go (93%) rename {pkg/uixt => uixt}/driver_ext/ios_stub_driver.go (98%) rename {pkg/uixt => uixt}/driver_ext/ios_stub_driver_test.go (86%) rename {pkg/uixt => uixt}/driver_ext_popups.go (97%) rename {pkg/uixt => uixt}/driver_ext_screenshot.go (98%) rename {pkg/uixt => uixt}/driver_ext_swipe.go (97%) rename {pkg/uixt => uixt}/driver_ext_tap.go (93%) rename {pkg/uixt => uixt}/driver_ext_test.go (97%) rename {pkg/uixt => uixt}/driver_session.go (100%) rename {pkg/uixt => uixt}/driver_session_test.go (100%) rename {pkg/uixt => uixt}/driver_utils.go (99%) rename {pkg/uixt => uixt}/driver_utils_test.go (100%) rename {pkg/uixt => uixt}/evalite (100%) rename {pkg/uixt => uixt}/harmony_device.go (96%) rename {pkg/uixt => uixt}/harmony_driver_hdc.go (98%) rename {pkg/uixt => uixt}/harmony_test.go (97%) rename {pkg/uixt => uixt}/ios_device.go (99%) rename {pkg/uixt => uixt}/ios_driver_wda.go (99%) rename {pkg/uixt => uixt}/ios_test.go (97%) rename {pkg/uixt => uixt}/option/action.go (100%) rename {pkg/uixt => uixt}/option/android.go (100%) rename {pkg/uixt => uixt}/option/browser.go (100%) rename {pkg/uixt => uixt}/option/capabilities.go (100%) rename {pkg/uixt => uixt}/option/harmony.go (100%) rename {pkg/uixt => uixt}/option/install.go (100%) rename {pkg/uixt => uixt}/option/ios.go (100%) rename {pkg/uixt => uixt}/option/screen.go (99%) rename {pkg/uixt => uixt}/option/source.go (100%) rename {pkg/uixt => uixt}/types/app.go (100%) rename {pkg/uixt => uixt}/types/device.go (100%) rename {pkg/uixt => uixt}/types/driver.go (100%) rename {pkg/uixt => uixt}/types/ui.go (100%) diff --git a/cmd/adb/init.go b/cmd/adb/init.go index 508e2274..d7f495e5 100644 --- a/cmd/adb/init.go +++ b/cmd/adb/init.go @@ -3,8 +3,8 @@ package adb import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) var serial string diff --git a/cmd/adb/install.go b/cmd/adb/install.go index a5f1e885..16677076 100644 --- a/cmd/adb/install.go +++ b/cmd/adb/install.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) var ( diff --git a/cmd/convert.go b/cmd/convert.go index df6d868d..8695d6b1 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -4,14 +4,14 @@ import ( "os" "path/filepath" - "github.com/httprunner/funplugin/myexec" "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/spf13/cobra" + "github.com/httprunner/funplugin/myexec" "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/convert" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/convert" ) var convertCmd = &cobra.Command{ diff --git a/cmd/ios/apps.go b/cmd/ios/apps.go index 5c5285b0..6c49c32b 100644 --- a/cmd/ios/apps.go +++ b/cmd/ios/apps.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" ) type Application struct { diff --git a/cmd/ios/devices.go b/cmd/ios/devices.go index f9718f32..e9d7bcfa 100644 --- a/cmd/ios/devices.go +++ b/cmd/ios/devices.go @@ -12,7 +12,7 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" ) type Device struct { diff --git a/cmd/ios/init.go b/cmd/ios/init.go index b91ea164..f146f3c6 100644 --- a/cmd/ios/init.go +++ b/cmd/ios/init.go @@ -3,8 +3,8 @@ package ios import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) var iosRootCmd = &cobra.Command{ diff --git a/cmd/ios/install.go b/cmd/ios/install.go index f398db80..5401d093 100644 --- a/cmd/ios/install.go +++ b/cmd/ios/install.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) var installCmd = &cobra.Command{ diff --git a/cmd/ios/tunnel.go b/cmd/ios/tunnel.go index 3bce55c9..fd4720e8 100644 --- a/cmd/ios/tunnel.go +++ b/cmd/ios/tunnel.go @@ -2,14 +2,15 @@ package ios import ( "context" - "github.com/danielpaulus/go-ios/ios" - "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/rs/zerolog/log" - "github.com/spf13/cobra" "os" "strings" "time" + + "github.com/danielpaulus/go-ios/ios" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" ) var tunnelCmd = &cobra.Command{ diff --git a/cmd/ios/uninstall.go b/cmd/ios/uninstall.go index e2f12780..14ace0ac 100644 --- a/cmd/ios/uninstall.go +++ b/cmd/ios/uninstall.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) var uninstallCmd = &cobra.Command{ diff --git a/compat.go b/compat.go index 0975e966..22976841 100644 --- a/compat.go +++ b/compat.go @@ -8,8 +8,8 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) // ConvertCaseCompatibility converts TestCase compatible with Golang engine style diff --git a/config.go b/config.go index c32ee5f1..b6b1b6a8 100644 --- a/config.go +++ b/config.go @@ -4,8 +4,8 @@ import ( "reflect" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) type IConfig interface { diff --git a/pkg/convert/README.md b/convert/README.md similarity index 100% rename from pkg/convert/README.md rename to convert/README.md diff --git a/pkg/convert/asset/flowgram.png b/convert/asset/flowgram.png similarity index 100% rename from pkg/convert/asset/flowgram.png rename to convert/asset/flowgram.png diff --git a/pkg/convert/from_ab.go b/convert/from_ab.go similarity index 100% rename from pkg/convert/from_ab.go rename to convert/from_ab.go diff --git a/pkg/convert/from_curl.go b/convert/from_curl.go similarity index 100% rename from pkg/convert/from_curl.go rename to convert/from_curl.go diff --git a/pkg/convert/from_curl_test.go b/convert/from_curl_test.go similarity index 100% rename from pkg/convert/from_curl_test.go rename to convert/from_curl_test.go diff --git a/pkg/convert/from_gotest.go b/convert/from_gotest.go similarity index 100% rename from pkg/convert/from_gotest.go rename to convert/from_gotest.go diff --git a/pkg/convert/from_har.go b/convert/from_har.go similarity index 100% rename from pkg/convert/from_har.go rename to convert/from_har.go diff --git a/pkg/convert/from_har_test.go b/convert/from_har_test.go similarity index 100% rename from pkg/convert/from_har_test.go rename to convert/from_har_test.go diff --git a/pkg/convert/from_jmeter.go b/convert/from_jmeter.go similarity index 100% rename from pkg/convert/from_jmeter.go rename to convert/from_jmeter.go diff --git a/pkg/convert/from_json.go b/convert/from_json.go similarity index 100% rename from pkg/convert/from_json.go rename to convert/from_json.go diff --git a/pkg/convert/from_postman.go b/convert/from_postman.go similarity index 100% rename from pkg/convert/from_postman.go rename to convert/from_postman.go diff --git a/pkg/convert/from_postman_test.go b/convert/from_postman_test.go similarity index 100% rename from pkg/convert/from_postman_test.go rename to convert/from_postman_test.go diff --git a/pkg/convert/from_pytest.go b/convert/from_pytest.go similarity index 100% rename from pkg/convert/from_pytest.go rename to convert/from_pytest.go diff --git a/pkg/convert/from_swagger.go b/convert/from_swagger.go similarity index 100% rename from pkg/convert/from_swagger.go rename to convert/from_swagger.go diff --git a/pkg/convert/from_yaml.go b/convert/from_yaml.go similarity index 100% rename from pkg/convert/from_yaml.go rename to convert/from_yaml.go diff --git a/pkg/convert/main.go b/convert/main.go similarity index 100% rename from pkg/convert/main.go rename to convert/main.go diff --git a/pkg/convert/main_test.go b/convert/main_test.go similarity index 100% rename from pkg/convert/main_test.go rename to convert/main_test.go diff --git a/pkg/convert/testcase.tmpl b/convert/testcase.tmpl similarity index 100% rename from pkg/convert/testcase.tmpl rename to convert/testcase.tmpl diff --git a/pkg/convert/to_gotest.go b/convert/to_gotest.go similarity index 100% rename from pkg/convert/to_gotest.go rename to convert/to_gotest.go diff --git a/pkg/convert/to_json.go b/convert/to_json.go similarity index 100% rename from pkg/convert/to_json.go rename to convert/to_json.go diff --git a/pkg/convert/to_pytest.go b/convert/to_pytest.go similarity index 100% rename from pkg/convert/to_pytest.go rename to convert/to_pytest.go diff --git a/pkg/convert/to_yaml.go b/convert/to_yaml.go similarity index 100% rename from pkg/convert/to_yaml.go rename to convert/to_yaml.go diff --git a/examples/uitest/android_e2e_delay_test.go b/examples/uitest/android_e2e_delay_test.go index f45e8812..6b113c4c 100644 --- a/examples/uitest/android_e2e_delay_test.go +++ b/examples/uitest/android_e2e_delay_test.go @@ -4,7 +4,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestAndroidDouyinE2E(t *testing.T) { diff --git a/examples/uitest/bili/android/cli.go b/examples/uitest/bili/android/cli.go index 3e946f90..d0ceed39 100644 --- a/examples/uitest/bili/android/cli.go +++ b/examples/uitest/bili/android/cli.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) var ( diff --git a/examples/uitest/bili/ios/cli.go b/examples/uitest/bili/ios/cli.go index 94e54a36..2daa6399 100644 --- a/examples/uitest/bili/ios/cli.go +++ b/examples/uitest/bili/ios/cli.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) var ( diff --git a/examples/uitest/demo_android_feed_swipe_test.go b/examples/uitest/demo_android_feed_swipe_test.go index f14a0cb5..a4080c40 100644 --- a/examples/uitest/demo_android_feed_swipe_test.go +++ b/examples/uitest/demo_android_feed_swipe_test.go @@ -6,7 +6,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestAndroidDouyinFeedTest(t *testing.T) { diff --git a/examples/uitest/demo_android_live_swipe_test.go b/examples/uitest/demo_android_live_swipe_test.go index 1dec1bee..b5b0d691 100644 --- a/examples/uitest/demo_android_live_swipe_test.go +++ b/examples/uitest/demo_android_live_swipe_test.go @@ -6,7 +6,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestAndroidLiveSwipeTest(t *testing.T) { diff --git a/examples/uitest/demo_douyin_follow_live_test.go b/examples/uitest/demo_douyin_follow_live_test.go index c9fcb911..8b714f19 100644 --- a/examples/uitest/demo_douyin_follow_live_test.go +++ b/examples/uitest/demo_douyin_follow_live_test.go @@ -6,7 +6,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestIOSDouyinFollowLive(t *testing.T) { diff --git a/examples/uitest/demo_harmony_test.go b/examples/uitest/demo_harmony_test.go index 08f5eef2..27536a4b 100644 --- a/examples/uitest/demo_harmony_test.go +++ b/examples/uitest/demo_harmony_test.go @@ -6,7 +6,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestHamonyDouyinFeedTest(t *testing.T) { diff --git a/examples/uitest/demo_ios_live_swipe_test.go b/examples/uitest/demo_ios_live_swipe_test.go index 85acce4e..76e970d9 100644 --- a/examples/uitest/demo_ios_live_swipe_test.go +++ b/examples/uitest/demo_ios_live_swipe_test.go @@ -6,7 +6,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestIOSDouyinLive(t *testing.T) { diff --git a/examples/uitest/demo_ios_wda_log_test.go b/examples/uitest/demo_ios_wda_log_test.go index d3a53e35..30407c0d 100644 --- a/examples/uitest/demo_ios_wda_log_test.go +++ b/examples/uitest/demo_ios_wda_log_test.go @@ -6,7 +6,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestWDALog(t *testing.T) { diff --git a/examples/uitest/expert_test.go b/examples/uitest/expert_test.go index e3b9848e..061bc2af 100644 --- a/examples/uitest/expert_test.go +++ b/examples/uitest/expert_test.go @@ -4,7 +4,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestAndroidExpertTest(t *testing.T) { diff --git a/examples/uitest/harmony_e2e_delay_test.go b/examples/uitest/harmony_e2e_delay_test.go index e427702f..31312a7a 100644 --- a/examples/uitest/harmony_e2e_delay_test.go +++ b/examples/uitest/harmony_e2e_delay_test.go @@ -4,7 +4,7 @@ import ( "testing" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestHarmonyDouyinE2E(t *testing.T) { diff --git a/examples/worldcup/cli.go b/examples/worldcup/cli.go index 16e68ae7..31c95d71 100644 --- a/examples/worldcup/cli.go +++ b/examples/worldcup/cli.go @@ -7,9 +7,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) var rootCmd = &cobra.Command{ diff --git a/examples/worldcup/main.go b/examples/worldcup/main.go index 16e28be4..4afbf986 100644 --- a/examples/worldcup/main.go +++ b/examples/worldcup/main.go @@ -15,8 +15,8 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) func convertTimeToSeconds(timeStr string) (int, error) { diff --git a/examples/worldcup/main_test.go b/examples/worldcup/main_test.go index f37e8878..077279a7 100644 --- a/examples/worldcup/main_test.go +++ b/examples/worldcup/main_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" hrp "github.com/httprunner/httprunner/v5" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestConvertTimeToSeconds(t *testing.T) { diff --git a/pkg/httpstat/main.go b/internal/httpstat/main.go similarity index 100% rename from pkg/httpstat/main.go rename to internal/httpstat/main.go diff --git a/pkg/httpstat/demo/main_test.go b/internal/httpstat/main_test.go similarity index 76% rename from pkg/httpstat/demo/main_test.go rename to internal/httpstat/main_test.go index 61054691..4a8f9cd8 100644 --- a/pkg/httpstat/demo/main_test.go +++ b/internal/httpstat/main_test.go @@ -1,19 +1,17 @@ -package demo +package httpstat import ( "fmt" "net/http" "testing" "time" - - "github.com/httprunner/httprunner/v5/pkg/httpstat" ) func TestMain(t *testing.T) { - var httpStat httpstat.Stat + var httpStat Stat req, _ := http.NewRequest("GET", "https://httprunner.com", nil) - ctx := httpstat.WithHTTPStat(req, &httpStat) + ctx := WithHTTPStat(req, &httpStat) client := &http.Client{ Timeout: time.Second * 10, diff --git a/internal/version/VERSION b/internal/version/VERSION index 821cd170..89f028e2 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0+2503051043 +v5.0.0+2503051104 diff --git a/runner.go b/runner.go index 89db76af..13cddccd 100644 --- a/runner.go +++ b/runner.go @@ -26,8 +26,8 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/sdk" "github.com/httprunner/httprunner/v5/internal/version" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" ) // Run starts to run testcase with default configs. diff --git a/server/app.go b/server/app.go index d6036d50..a958b2ba 100644 --- a/server/app.go +++ b/server/app.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" ) func (r *Router) foregroundAppHandler(c *gin.Context) { diff --git a/server/context.go b/server/context.go index 56af69ad..23d4f175 100644 --- a/server/context.go +++ b/server/context.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog/log" "github.com/httprunner/httprunner/v5/code" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) func (r *Router) GetDriver(c *gin.Context) (driverExt *uixt.XTDriver, err error) { diff --git a/server/device.go b/server/device.go index 6b404976..28263d7f 100644 --- a/server/device.go +++ b/server/device.go @@ -7,10 +7,11 @@ import ( "github.com/Masterminds/semver" "github.com/danielpaulus/go-ios/ios" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/pkg/gadb" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" "github.com/rs/zerolog/log" + + "github.com/httprunner/httprunner/v5/pkg/gadb" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) func (r *Router) listDeviceHandler(c *gin.Context) { diff --git a/server/ext/app.go b/server/ext/app.go index b890880e..233b7d9b 100644 --- a/server/ext/app.go +++ b/server/ext/app.go @@ -6,8 +6,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/httprunner/httprunner/v5/server" + "github.com/httprunner/httprunner/v5/uixt" ) func (r *RouterExt) installAppHandler(c *gin.Context) { diff --git a/server/ext/context.go b/server/ext/context.go index cc84ab00..dbf84bb7 100644 --- a/server/ext/context.go +++ b/server/ext/context.go @@ -5,10 +5,10 @@ import ( "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/driver_ext" "github.com/httprunner/httprunner/v5/server" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/driver_ext" ) func (r *RouterExt) GetDriver(c *gin.Context) (driverExt *driver_ext.StubXTDriver, err error) { diff --git a/server/key.go b/server/key.go index d758c068..d129044b 100644 --- a/server/key.go +++ b/server/key.go @@ -3,7 +3,7 @@ package server import ( "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" ) func (r *Router) unlockHandler(c *gin.Context) { diff --git a/server/main.go b/server/main.go index f315f612..2877a859 100644 --- a/server/main.go +++ b/server/main.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" diff --git a/server/model.go b/server/model.go index b28d878b..b64981a1 100644 --- a/server/model.go +++ b/server/model.go @@ -1,7 +1,7 @@ package server import ( - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) type TapRequest struct { diff --git a/server/source.go b/server/source.go index d9903965..87cbec7a 100644 --- a/server/source.go +++ b/server/source.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func (r *Router) screenshotHandler(c *gin.Context) { diff --git a/server/ui.go b/server/ui.go index a18573c9..80cf4199 100644 --- a/server/ui.go +++ b/server/ui.go @@ -2,8 +2,8 @@ package server import ( "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) func (r *Router) tapHandler(c *gin.Context) { diff --git a/server/uixt.go b/server/uixt.go index 865a1165..52f17764 100644 --- a/server/uixt.go +++ b/server/uixt.go @@ -2,7 +2,7 @@ package server import ( "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" "github.com/rs/zerolog/log" ) diff --git a/step.go b/step.go index da7dd6f4..b3f67a41 100644 --- a/step.go +++ b/step.go @@ -1,6 +1,6 @@ package hrp -import "github.com/httprunner/httprunner/v5/pkg/uixt" +import "github.com/httprunner/httprunner/v5/uixt" type StepType string diff --git a/step_function.go b/step_function.go index a53a86ea..23407ecd 100644 --- a/step_function.go +++ b/step_function.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" "github.com/pkg/errors" "github.com/rs/zerolog/log" ) diff --git a/step_request.go b/step_request.go index 041615fa..5bd0212c 100644 --- a/step_request.go +++ b/step_request.go @@ -22,9 +22,9 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/httpstat" "github.com/httprunner/httprunner/v5/internal/json" - "github.com/httprunner/httprunner/v5/pkg/httpstat" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) type HTTPMethod string diff --git a/step_ui.go b/step_ui.go index 5bcefd91..80bf6d11 100644 --- a/step_ui.go +++ b/step_ui.go @@ -10,8 +10,8 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/sdk" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) type MobileUI struct { diff --git a/step_ui_test.go b/step_ui_test.go index d47e4fb6..a316f5b0 100644 --- a/step_ui_test.go +++ b/step_ui_test.go @@ -5,7 +5,7 @@ package hrp import ( "testing" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestIOSSettingsAction(t *testing.T) { diff --git a/summary.go b/summary.go index 17943ca1..0cac3117 100644 --- a/summary.go +++ b/summary.go @@ -15,7 +15,7 @@ import ( "github.com/httprunner/httprunner/v5/internal/builtin" "github.com/httprunner/httprunner/v5/internal/config" "github.com/httprunner/httprunner/v5/internal/version" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" ) func NewSummary() *Summary { diff --git a/pkg/uixt/README.md b/uixt/README.md similarity index 100% rename from pkg/uixt/README.md rename to uixt/README.md diff --git a/pkg/uixt/ai/ai.go b/uixt/ai/ai.go similarity index 99% rename from pkg/uixt/ai/ai.go rename to uixt/ai/ai.go index 3b7ae92f..011cae8f 100644 --- a/pkg/uixt/ai/ai.go +++ b/uixt/ai/ai.go @@ -3,8 +3,9 @@ package ai import ( "os" - "github.com/httprunner/httprunner/v5/code" "github.com/rs/zerolog/log" + + "github.com/httprunner/httprunner/v5/code" ) func NewAIService(opts ...AIServiceOption) *AIServices { diff --git a/pkg/uixt/ai/ai_test.go b/uixt/ai/ai_test.go similarity index 100% rename from pkg/uixt/ai/ai_test.go rename to uixt/ai/ai_test.go diff --git a/pkg/uixt/ai/cv.go b/uixt/ai/cv.go similarity index 98% rename from pkg/uixt/ai/cv.go rename to uixt/ai/cv.go index 5a5cd6b4..fa314855 100644 --- a/pkg/uixt/ai/cv.go +++ b/uixt/ai/cv.go @@ -7,11 +7,12 @@ import ( "math" "regexp" + "github.com/pkg/errors" + "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" - "github.com/pkg/errors" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) type ICVService interface { diff --git a/pkg/uixt/ai/cv_vedem.go b/uixt/ai/cv_vedem.go similarity index 99% rename from pkg/uixt/ai/cv_vedem.go rename to uixt/ai/cv_vedem.go index d9169a7f..1bad4ddc 100644 --- a/pkg/uixt/ai/cv_vedem.go +++ b/uixt/ai/cv_vedem.go @@ -16,7 +16,7 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" "github.com/httprunner/httprunner/v5/internal/json" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) var client = &http.Client{ diff --git a/pkg/uixt/ai/cv_vedem_test.go b/uixt/ai/cv_vedem_test.go similarity index 100% rename from pkg/uixt/ai/cv_vedem_test.go rename to uixt/ai/cv_vedem_test.go diff --git a/pkg/uixt/ai/llm.go b/uixt/ai/llm.go similarity index 100% rename from pkg/uixt/ai/llm.go rename to uixt/ai/llm.go diff --git a/pkg/uixt/android_device.go b/uixt/android_device.go similarity index 99% rename from pkg/uixt/android_device.go rename to uixt/android_device.go index 1c322eae..a53134a0 100644 --- a/pkg/uixt/android_device.go +++ b/uixt/android_device.go @@ -24,8 +24,8 @@ import ( "github.com/httprunner/httprunner/v5/internal/config" "github.com/httprunner/httprunner/v5/internal/json" "github.com/httprunner/httprunner/v5/pkg/gadb" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) const ( diff --git a/pkg/uixt/android_driver_adb.go b/uixt/android_driver_adb.go similarity index 99% rename from pkg/uixt/android_driver_adb.go rename to uixt/android_driver_adb.go index 182feefe..2fe52772 100644 --- a/pkg/uixt/android_driver_adb.go +++ b/uixt/android_driver_adb.go @@ -24,8 +24,8 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/config" "github.com/httprunner/httprunner/v5/internal/utf7" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func NewADBDriver(device *AndroidDevice) (*ADBDriver, error) { diff --git a/pkg/uixt/android_driver_uia2.go b/uixt/android_driver_uia2.go similarity index 99% rename from pkg/uixt/android_driver_uia2.go rename to uixt/android_driver_uia2.go index 9aac96e9..938afc13 100644 --- a/pkg/uixt/android_driver_uia2.go +++ b/uixt/android_driver_uia2.go @@ -12,8 +12,8 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/utf7" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func NewUIA2Driver(device *AndroidDevice) (*UIA2Driver, error) { diff --git a/pkg/uixt/android_key.go b/uixt/android_key.go similarity index 100% rename from pkg/uixt/android_key.go rename to uixt/android_key.go diff --git a/pkg/uixt/android_layout.go b/uixt/android_layout.go similarity index 100% rename from pkg/uixt/android_layout.go rename to uixt/android_layout.go diff --git a/pkg/uixt/android_test.go b/uixt/android_test.go similarity index 97% rename from pkg/uixt/android_test.go rename to uixt/android_test.go index 9faa7320..f492740c 100644 --- a/pkg/uixt/android_test.go +++ b/uixt/android_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func setupADBDriverExt(t *testing.T) *XTDriver { diff --git a/pkg/uixt/browser_device.go b/uixt/browser_device.go similarity index 93% rename from pkg/uixt/browser_device.go rename to uixt/browser_device.go index 6aeea936..b3aeebb4 100644 --- a/pkg/uixt/browser_device.go +++ b/uixt/browser_device.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) type BrowserDevice struct { diff --git a/pkg/uixt/browser_driver.go b/uixt/browser_driver.go similarity index 99% rename from pkg/uixt/browser_driver.go rename to uixt/browser_driver.go index 29bb903e..7a937ff9 100644 --- a/pkg/uixt/browser_driver.go +++ b/uixt/browser_driver.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) const BROWSER_LOCAL_ADDRESS = "localhost:8093" diff --git a/pkg/uixt/demo/main_test.go b/uixt/demo/main_test.go similarity index 87% rename from pkg/uixt/demo/main_test.go rename to uixt/demo/main_test.go index 993bad79..a74909de 100644 --- a/pkg/uixt/demo/main_test.go +++ b/uixt/demo/main_test.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) func TestIOSDemo(t *testing.T) { diff --git a/pkg/uixt/device.go b/uixt/device.go similarity index 80% rename from pkg/uixt/device.go rename to uixt/device.go index 6e2dc10d..7e44857a 100644 --- a/pkg/uixt/device.go +++ b/uixt/device.go @@ -2,8 +2,9 @@ package uixt import ( "bytes" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) // current implemeted device: IOSDevice, AndroidDevice, HarmonyDevice diff --git a/pkg/uixt/driver.go b/uixt/driver.go similarity index 94% rename from pkg/uixt/driver.go rename to uixt/driver.go index 508e0fdb..a27a9a48 100644 --- a/pkg/uixt/driver.go +++ b/uixt/driver.go @@ -6,9 +6,9 @@ import ( _ "image/png" "time" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) var ( diff --git a/pkg/uixt/driver_action.go b/uixt/driver_action.go similarity index 99% rename from pkg/uixt/driver_action.go rename to uixt/driver_action.go index ebb67875..e20e261c 100644 --- a/pkg/uixt/driver_action.go +++ b/uixt/driver_action.go @@ -11,7 +11,7 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) type ActionMethod string diff --git a/pkg/uixt/driver_ext/android_stub_driver.go b/uixt/driver_ext/android_stub_driver.go similarity index 98% rename from pkg/uixt/driver_ext/android_stub_driver.go rename to uixt/driver_ext/android_stub_driver.go index c0b2b80b..bf838139 100644 --- a/pkg/uixt/driver_ext/android_stub_driver.go +++ b/uixt/driver_ext/android_stub_driver.go @@ -9,9 +9,9 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/json" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) type StubAndroidDriver struct { diff --git a/pkg/uixt/driver_ext/android_stub_driver_test.go b/uixt/driver_ext/android_stub_driver_test.go similarity index 93% rename from pkg/uixt/driver_ext/android_stub_driver_test.go rename to uixt/driver_ext/android_stub_driver_test.go index 475db5cd..4f88a8e3 100644 --- a/pkg/uixt/driver_ext/android_stub_driver_test.go +++ b/uixt/driver_ext/android_stub_driver_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/httprunner/httprunner/v5/pkg/uixt" + "github.com/httprunner/httprunner/v5/uixt" ) func setupAndroidStubDriver(t *testing.T) *StubAndroidDriver { diff --git a/pkg/uixt/driver_ext/browser_sub_driver.go b/uixt/driver_ext/browser_sub_driver.go similarity index 93% rename from pkg/uixt/driver_ext/browser_sub_driver.go rename to uixt/driver_ext/browser_sub_driver.go index 55c43119..0e2bf989 100644 --- a/pkg/uixt/driver_ext/browser_sub_driver.go +++ b/uixt/driver_ext/browser_sub_driver.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" "github.com/pkg/errors" ) diff --git a/pkg/uixt/driver_ext/ext.go b/uixt/driver_ext/ext.go similarity index 93% rename from pkg/uixt/driver_ext/ext.go rename to uixt/driver_ext/ext.go index 0c81f006..45d525eb 100644 --- a/pkg/uixt/driver_ext/ext.go +++ b/uixt/driver_ext/ext.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) var ( diff --git a/pkg/uixt/driver_ext/ios_stub_driver.go b/uixt/driver_ext/ios_stub_driver.go similarity index 98% rename from pkg/uixt/driver_ext/ios_stub_driver.go rename to uixt/driver_ext/ios_stub_driver.go index 516b9428..948ff9be 100644 --- a/pkg/uixt/driver_ext/ios_stub_driver.go +++ b/uixt/driver_ext/ios_stub_driver.go @@ -9,9 +9,9 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/pkg/uixt/driver_ext/ios_stub_driver_test.go b/uixt/driver_ext/ios_stub_driver_test.go similarity index 86% rename from pkg/uixt/driver_ext/ios_stub_driver_test.go rename to uixt/driver_ext/ios_stub_driver_test.go index e3ff1c25..abeac4c7 100644 --- a/pkg/uixt/driver_ext/ios_stub_driver_test.go +++ b/uixt/driver_ext/ios_stub_driver_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/httprunner/httprunner/v5/pkg/uixt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt" + "github.com/httprunner/httprunner/v5/uixt/option" ) func setupIOSStubDriver(t *testing.T) *StubIOSDriver { diff --git a/pkg/uixt/driver_ext_popups.go b/uixt/driver_ext_popups.go similarity index 97% rename from pkg/uixt/driver_ext_popups.go rename to uixt/driver_ext_popups.go index b42b1629..a2c014cb 100644 --- a/pkg/uixt/driver_ext_popups.go +++ b/uixt/driver_ext_popups.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog/log" "github.com/httprunner/httprunner/v5/code" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) // TODO: add more popup texts diff --git a/pkg/uixt/driver_ext_screenshot.go b/uixt/driver_ext_screenshot.go similarity index 98% rename from pkg/uixt/driver_ext_screenshot.go rename to uixt/driver_ext_screenshot.go index 66962fe7..83f5f71c 100644 --- a/pkg/uixt/driver_ext_screenshot.go +++ b/uixt/driver_ext_screenshot.go @@ -18,9 +18,9 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" "github.com/httprunner/httprunner/v5/internal/config" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) type ScreenResult struct { diff --git a/pkg/uixt/driver_ext_swipe.go b/uixt/driver_ext_swipe.go similarity index 97% rename from pkg/uixt/driver_ext_swipe.go rename to uixt/driver_ext_swipe.go index bfde83ea..9cb43574 100644 --- a/pkg/uixt/driver_ext_swipe.go +++ b/uixt/driver_ext_swipe.go @@ -10,8 +10,8 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" ) type Action func(driver *XTDriver) error diff --git a/pkg/uixt/driver_ext_tap.go b/uixt/driver_ext_tap.go similarity index 93% rename from pkg/uixt/driver_ext_tap.go rename to uixt/driver_ext_tap.go index 561faf37..b4e8f151 100644 --- a/pkg/uixt/driver_ext_tap.go +++ b/uixt/driver_ext_tap.go @@ -3,7 +3,7 @@ package uixt import ( "fmt" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func (dExt *XTDriver) TapByOCR(text string, opts ...option.ActionOption) error { diff --git a/pkg/uixt/driver_ext_test.go b/uixt/driver_ext_test.go similarity index 97% rename from pkg/uixt/driver_ext_test.go rename to uixt/driver_ext_test.go index d6041fe1..71b352e7 100644 --- a/pkg/uixt/driver_ext_test.go +++ b/uixt/driver_ext_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/uixt/driver_session.go b/uixt/driver_session.go similarity index 100% rename from pkg/uixt/driver_session.go rename to uixt/driver_session.go diff --git a/pkg/uixt/driver_session_test.go b/uixt/driver_session_test.go similarity index 100% rename from pkg/uixt/driver_session_test.go rename to uixt/driver_session_test.go diff --git a/pkg/uixt/driver_utils.go b/uixt/driver_utils.go similarity index 99% rename from pkg/uixt/driver_utils.go rename to uixt/driver_utils.go index 2ff175f8..127e2cd4 100644 --- a/pkg/uixt/driver_utils.go +++ b/uixt/driver_utils.go @@ -18,7 +18,7 @@ import ( "github.com/httprunner/httprunner/v5/code" "github.com/httprunner/httprunner/v5/internal/builtin" "github.com/httprunner/httprunner/v5/internal/config" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/option" ) func convertToAbsoluteScope(driver IDriver, opts ...option.ActionOption) []option.ActionOption { diff --git a/pkg/uixt/driver_utils_test.go b/uixt/driver_utils_test.go similarity index 100% rename from pkg/uixt/driver_utils_test.go rename to uixt/driver_utils_test.go diff --git a/pkg/uixt/evalite b/uixt/evalite similarity index 100% rename from pkg/uixt/evalite rename to uixt/evalite diff --git a/pkg/uixt/harmony_device.go b/uixt/harmony_device.go similarity index 96% rename from pkg/uixt/harmony_device.go rename to uixt/harmony_device.go index e2bc5f04..545dca9b 100644 --- a/pkg/uixt/harmony_device.go +++ b/uixt/harmony_device.go @@ -2,13 +2,14 @@ package uixt import ( "bytes" + "code.byted.org/iesqa/ghdc" "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/httprunner/httprunner/v5/code" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) type HarmonyDevice struct { diff --git a/pkg/uixt/harmony_driver_hdc.go b/uixt/harmony_driver_hdc.go similarity index 98% rename from pkg/uixt/harmony_driver_hdc.go rename to uixt/harmony_driver_hdc.go index f55b1390..68ff7a4b 100644 --- a/pkg/uixt/harmony_driver_hdc.go +++ b/uixt/harmony_driver_hdc.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog/log" "github.com/httprunner/httprunner/v5/code" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func NewHDCDriver(device *HarmonyDevice) (*HDCDriver, error) { diff --git a/pkg/uixt/harmony_test.go b/uixt/harmony_test.go similarity index 97% rename from pkg/uixt/harmony_test.go rename to uixt/harmony_test.go index 6a17b2bb..f3a5bfc0 100644 --- a/pkg/uixt/harmony_test.go +++ b/uixt/harmony_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/ai" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/uixt/ios_device.go b/uixt/ios_device.go similarity index 99% rename from pkg/uixt/ios_device.go rename to uixt/ios_device.go index 24e71c02..79d3131e 100644 --- a/pkg/uixt/ios_device.go +++ b/uixt/ios_device.go @@ -24,8 +24,8 @@ import ( "github.com/rs/zerolog/log" "github.com/httprunner/httprunner/v5/code" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func StartTunnel(ctx context.Context, recordsPath string, tunnelInfoPort int, userspaceTUN bool) (err error) { diff --git a/pkg/uixt/ios_driver_wda.go b/uixt/ios_driver_wda.go similarity index 99% rename from pkg/uixt/ios_driver_wda.go rename to uixt/ios_driver_wda.go index bf931025..54d3cd1a 100644 --- a/pkg/uixt/ios_driver_wda.go +++ b/uixt/ios_driver_wda.go @@ -26,8 +26,8 @@ import ( "github.com/httprunner/httprunner/v5/internal/builtin" "github.com/httprunner/httprunner/v5/internal/config" "github.com/httprunner/httprunner/v5/internal/json" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func NewWDADriver(device *IOSDevice) (*WDADriver, error) { diff --git a/pkg/uixt/ios_test.go b/uixt/ios_test.go similarity index 97% rename from pkg/uixt/ios_test.go rename to uixt/ios_test.go index 7a19a726..98a60a57 100644 --- a/pkg/uixt/ios_test.go +++ b/uixt/ios_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/httprunner/httprunner/v5/pkg/uixt/ai" - "github.com/httprunner/httprunner/v5/pkg/uixt/option" - "github.com/httprunner/httprunner/v5/pkg/uixt/types" + "github.com/httprunner/httprunner/v5/uixt/ai" + "github.com/httprunner/httprunner/v5/uixt/option" + "github.com/httprunner/httprunner/v5/uixt/types" ) func setupWDADriverExt(t *testing.T) *XTDriver { diff --git a/pkg/uixt/option/action.go b/uixt/option/action.go similarity index 100% rename from pkg/uixt/option/action.go rename to uixt/option/action.go diff --git a/pkg/uixt/option/android.go b/uixt/option/android.go similarity index 100% rename from pkg/uixt/option/android.go rename to uixt/option/android.go diff --git a/pkg/uixt/option/browser.go b/uixt/option/browser.go similarity index 100% rename from pkg/uixt/option/browser.go rename to uixt/option/browser.go diff --git a/pkg/uixt/option/capabilities.go b/uixt/option/capabilities.go similarity index 100% rename from pkg/uixt/option/capabilities.go rename to uixt/option/capabilities.go diff --git a/pkg/uixt/option/harmony.go b/uixt/option/harmony.go similarity index 100% rename from pkg/uixt/option/harmony.go rename to uixt/option/harmony.go diff --git a/pkg/uixt/option/install.go b/uixt/option/install.go similarity index 100% rename from pkg/uixt/option/install.go rename to uixt/option/install.go diff --git a/pkg/uixt/option/ios.go b/uixt/option/ios.go similarity index 100% rename from pkg/uixt/option/ios.go rename to uixt/option/ios.go diff --git a/pkg/uixt/option/screen.go b/uixt/option/screen.go similarity index 99% rename from pkg/uixt/option/screen.go rename to uixt/option/screen.go index 3e30c7ec..60af4b31 100644 --- a/pkg/uixt/option/screen.go +++ b/uixt/option/screen.go @@ -1,6 +1,6 @@ package option -import "github.com/httprunner/httprunner/v5/pkg/uixt/types" +import "github.com/httprunner/httprunner/v5/uixt/types" type ScreenOptions struct { ScreenShotOptions diff --git a/pkg/uixt/option/source.go b/uixt/option/source.go similarity index 100% rename from pkg/uixt/option/source.go rename to uixt/option/source.go diff --git a/pkg/uixt/types/app.go b/uixt/types/app.go similarity index 100% rename from pkg/uixt/types/app.go rename to uixt/types/app.go diff --git a/pkg/uixt/types/device.go b/uixt/types/device.go similarity index 100% rename from pkg/uixt/types/device.go rename to uixt/types/device.go diff --git a/pkg/uixt/types/driver.go b/uixt/types/driver.go similarity index 100% rename from pkg/uixt/types/driver.go rename to uixt/types/driver.go diff --git a/pkg/uixt/types/ui.go b/uixt/types/ui.go similarity index 100% rename from pkg/uixt/types/ui.go rename to uixt/types/ui.go