diff --git a/hrp/build.go b/build.go similarity index 96% rename from hrp/build.go rename to build.go index a89c7d15..f04808d4 100644 --- a/hrp/build.go +++ b/build.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/config" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/internal/version" + "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/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/version" ) //go:embed internal/scaffold/templates/plugin/debugtalkPythonTemplate diff --git a/hrp/build_test.go b/build_test.go similarity index 100% rename from hrp/build_test.go rename to build_test.go diff --git a/hrp/cmd/adb/devices.go b/cmd/adb/devices.go similarity index 92% rename from hrp/cmd/adb/devices.go rename to cmd/adb/devices.go index 70166b94..584f816e 100644 --- a/hrp/cmd/adb/devices.go +++ b/cmd/adb/devices.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func format(data map[string]string) string { diff --git a/hrp/cmd/adb/init.go b/cmd/adb/init.go similarity index 85% rename from hrp/cmd/adb/init.go rename to cmd/adb/init.go index 661a0318..e6857eb8 100644 --- a/hrp/cmd/adb/init.go +++ b/cmd/adb/init.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/pkg/gadb" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/gadb" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var androidRootCmd = &cobra.Command{ diff --git a/hrp/cmd/adb/install.go b/cmd/adb/install.go similarity index 93% rename from hrp/cmd/adb/install.go rename to cmd/adb/install.go index b0bc0529..342bab3b 100644 --- a/hrp/cmd/adb/install.go +++ b/cmd/adb/install.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var ( diff --git a/hrp/cmd/adb/screencap.go b/cmd/adb/screencap.go similarity index 90% rename from hrp/cmd/adb/screencap.go rename to cmd/adb/screencap.go index 3fa3dd02..64582ac9 100644 --- a/hrp/cmd/adb/screencap.go +++ b/cmd/adb/screencap.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/sdk" ) var screencapAndroidDevicesCmd = &cobra.Command{ diff --git a/hrp/cmd/build.go b/cmd/build.go similarity index 89% rename from hrp/cmd/build.go rename to cmd/build.go index f7190d52..78baaec1 100644 --- a/hrp/cmd/build.go +++ b/cmd/build.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/internal/sdk" ) var buildCmd = &cobra.Command{ diff --git a/hrp/cmd/cli/main.go b/cmd/cli/main.go similarity index 87% rename from hrp/cmd/cli/main.go rename to cmd/cli/main.go index 9488e68a..af6b6c30 100644 --- a/hrp/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -6,7 +6,7 @@ import ( "github.com/getsentry/sentry-go" - "github.com/httprunner/httprunner/v5/hrp/cmd" + "github.com/httprunner/httprunner/v5/cmd" ) func main() { diff --git a/hrp/cmd/convert.go b/cmd/convert.go similarity index 95% rename from hrp/cmd/convert.go rename to cmd/convert.go index c50d5356..df6d868d 100644 --- a/hrp/cmd/convert.go +++ b/cmd/convert.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/pkg/convert" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/pkg/convert" ) var convertCmd = &cobra.Command{ diff --git a/hrp/cmd/doc_test.go b/cmd/doc_test.go similarity index 100% rename from hrp/cmd/doc_test.go rename to cmd/doc_test.go diff --git a/hrp/cmd/ios/apps.go b/cmd/ios/apps.go similarity index 94% rename from hrp/cmd/ios/apps.go rename to cmd/ios/apps.go index 73102c74..5c5285b0 100644 --- a/hrp/cmd/ios/apps.go +++ b/cmd/ios/apps.go @@ -8,8 +8,8 @@ import ( "github.com/mitchellh/mapstructure" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) type Application struct { diff --git a/hrp/cmd/ios/devices.go b/cmd/ios/devices.go similarity index 94% rename from hrp/cmd/ios/devices.go rename to cmd/ios/devices.go index 45086988..5cd607ad 100644 --- a/hrp/cmd/ios/devices.go +++ b/cmd/ios/devices.go @@ -10,8 +10,8 @@ import ( "github.com/danielpaulus/go-ios/ios" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) type Device struct { diff --git a/hrp/cmd/ios/init.go b/cmd/ios/init.go similarity index 88% rename from hrp/cmd/ios/init.go rename to cmd/ios/init.go index 414a66f7..afc603fc 100644 --- a/hrp/cmd/ios/init.go +++ b/cmd/ios/init.go @@ -3,7 +3,7 @@ package ios import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var iosRootCmd = &cobra.Command{ diff --git a/hrp/cmd/ios/install.go b/cmd/ios/install.go similarity index 90% rename from hrp/cmd/ios/install.go rename to cmd/ios/install.go index 54b84cc5..7a18131a 100644 --- a/hrp/cmd/ios/install.go +++ b/cmd/ios/install.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var installCmd = &cobra.Command{ diff --git a/hrp/cmd/ios/ios_test.go b/cmd/ios/ios_test.go similarity index 100% rename from hrp/cmd/ios/ios_test.go rename to cmd/ios/ios_test.go diff --git a/hrp/cmd/ios/mount.go b/cmd/ios/mount.go similarity index 94% rename from hrp/cmd/ios/mount.go rename to cmd/ios/mount.go index 3226fa55..b48268dc 100644 --- a/hrp/cmd/ios/mount.go +++ b/cmd/ios/mount.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/sdk" ) // mountCmd represents the mount command diff --git a/hrp/cmd/ios/ps.go b/cmd/ios/ps.go similarity index 95% rename from hrp/cmd/ios/ps.go rename to cmd/ios/ps.go index 0de536a7..4201b918 100644 --- a/hrp/cmd/ios/ps.go +++ b/cmd/ios/ps.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/sdk" ) var psCmd = &cobra.Command{ diff --git a/hrp/cmd/ios/reboot.go b/cmd/ios/reboot.go similarity index 94% rename from hrp/cmd/ios/reboot.go rename to cmd/ios/reboot.go index 2540b488..c70a3a19 100644 --- a/hrp/cmd/ios/reboot.go +++ b/cmd/ios/reboot.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/sdk" ) var rebootCmd = &cobra.Command{ diff --git a/hrp/cmd/ios/uninstall.go b/cmd/ios/uninstall.go similarity index 91% rename from hrp/cmd/ios/uninstall.go rename to cmd/ios/uninstall.go index 9e6cd3da..06d6511e 100644 --- a/hrp/cmd/ios/uninstall.go +++ b/cmd/ios/uninstall.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var uninstallCmd = &cobra.Command{ diff --git a/hrp/cmd/ios/xctest.go b/cmd/ios/xctest.go similarity index 96% rename from hrp/cmd/ios/xctest.go rename to cmd/ios/xctest.go index 17d45d83..5c8797c3 100644 --- a/hrp/cmd/ios/xctest.go +++ b/cmd/ios/xctest.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/sdk" ) var xctestCmd = &cobra.Command{ diff --git a/hrp/cmd/pytest.go b/cmd/pytest.go similarity index 86% rename from hrp/cmd/pytest.go rename to cmd/pytest.go index 512457fd..d1cb51b2 100644 --- a/hrp/cmd/pytest.go +++ b/cmd/pytest.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/pytest" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/pytest" + "github.com/httprunner/httprunner/v5/internal/sdk" ) var pytestCmd = &cobra.Command{ diff --git a/hrp/cmd/root.go b/cmd/root.go similarity index 91% rename from hrp/cmd/root.go rename to cmd/root.go index c4065e55..44d54e88 100644 --- a/hrp/cmd/root.go +++ b/cmd/root.go @@ -3,11 +3,11 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/cmd/adb" - "github.com/httprunner/httprunner/v5/hrp/cmd/ios" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/version" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/cmd/adb" + "github.com/httprunner/httprunner/v5/cmd/ios" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/version" ) // rootCmd represents the base command when called without any subcommands diff --git a/hrp/cmd/run.go b/cmd/run.go similarity index 98% rename from hrp/cmd/run.go rename to cmd/run.go index 58a3052f..050330b7 100644 --- a/hrp/cmd/run.go +++ b/cmd/run.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) // runCmd represents the run command diff --git a/hrp/cmd/scaffold.go b/cmd/scaffold.go similarity index 96% rename from hrp/cmd/scaffold.go rename to cmd/scaffold.go index 9195f121..f4028d23 100644 --- a/hrp/cmd/scaffold.go +++ b/cmd/scaffold.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/scaffold" + "github.com/httprunner/httprunner/v5/internal/scaffold" ) var scaffoldCmd = &cobra.Command{ diff --git a/hrp/cmd/server.go b/cmd/server.go similarity index 90% rename from hrp/cmd/server.go rename to cmd/server.go index 78eff29c..0e19d3b9 100644 --- a/hrp/cmd/server.go +++ b/cmd/server.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/pkg/server" + "github.com/httprunner/httprunner/v5/pkg/server" ) // serverCmd represents the server command diff --git a/hrp/cmd/wiki.go b/cmd/wiki.go similarity index 84% rename from hrp/cmd/wiki.go rename to cmd/wiki.go index 68a9b86d..a89720b3 100644 --- a/hrp/cmd/wiki.go +++ b/cmd/wiki.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/internal/wiki" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/wiki" ) var wikiCmd = &cobra.Command{ diff --git a/hrp/code/code.go b/code/code.go similarity index 100% rename from hrp/code/code.go rename to code/code.go diff --git a/hrp/code/code_test.go b/code/code_test.go similarity index 83% rename from hrp/code/code_test.go rename to code/code_test.go index 977612df..bcef7c96 100644 --- a/hrp/code/code_test.go +++ b/code/code_test.go @@ -14,5 +14,5 @@ func TestGetErrorCode(t *testing.T) { func TestGetErrorByCode(t *testing.T) { code := 0 err := GetErrorByCode(code) - fmt.Println("[TestGetErrorByCode]:err:",err) + fmt.Println("[TestGetErrorByCode]:err:", err) } diff --git a/hrp/compat.go b/compat.go similarity index 97% rename from hrp/compat.go rename to compat.go index 8991e3f3..3fd52bb8 100644 --- a/hrp/compat.go +++ b/compat.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/pkg/errors" ) diff --git a/hrp/config.go b/config.go similarity index 98% rename from hrp/config.go rename to config.go index 275649ab..3e8319d1 100644 --- a/hrp/config.go +++ b/config.go @@ -3,8 +3,8 @@ package hrp import ( "reflect" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) type IConfig interface { diff --git a/hrp/README.md b/docs/dev-instruct.md similarity index 99% rename from hrp/README.md rename to docs/dev-instruct.md index 6180bde0..63741712 100644 --- a/hrp/README.md +++ b/docs/dev-instruct.md @@ -1,4 +1,4 @@ -# 代码阅读指南（golang 部分） +# 代码阅读指南 ## 核心数据结构 diff --git a/examples/uitest/android_e2e_delay_test.go b/examples/uitest/android_e2e_delay_test.go index 588e917c..5624a31c 100644 --- a/examples/uitest/android_e2e_delay_test.go +++ b/examples/uitest/android_e2e_delay_test.go @@ -3,8 +3,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestAndroidDouyinE2E(t *testing.T) { diff --git a/examples/uitest/bili/android/cli.go b/examples/uitest/bili/android/cli.go index 61900220..adac973b 100644 --- a/examples/uitest/bili/android/cli.go +++ b/examples/uitest/bili/android/cli.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var ( diff --git a/examples/uitest/bili/android/cli_test.go b/examples/uitest/bili/android/cli_test.go index 196ef1e1..8ca544aa 100644 --- a/examples/uitest/bili/android/cli_test.go +++ b/examples/uitest/bili/android/cli_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestMain(t *testing.T) { diff --git a/examples/uitest/bili/ios/cli.go b/examples/uitest/bili/ios/cli.go index e365469b..2916e1e4 100644 --- a/examples/uitest/bili/ios/cli.go +++ b/examples/uitest/bili/ios/cli.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var ( diff --git a/examples/uitest/demo_android_feed_swipe_test.go b/examples/uitest/demo_android_feed_swipe_test.go index b20c015e..20c5b924 100644 --- a/examples/uitest/demo_android_feed_swipe_test.go +++ b/examples/uitest/demo_android_feed_swipe_test.go @@ -5,8 +5,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) 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 8280cca5..60738f99 100644 --- a/examples/uitest/demo_android_live_swipe_test.go +++ b/examples/uitest/demo_android_live_swipe_test.go @@ -5,8 +5,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) 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 6de9371f..12c99960 100644 --- a/examples/uitest/demo_douyin_follow_live_test.go +++ b/examples/uitest/demo_douyin_follow_live_test.go @@ -5,8 +5,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestIOSDouyinFollowLive(t *testing.T) { diff --git a/examples/uitest/demo_harmony_test.go b/examples/uitest/demo_harmony_test.go index 5e9bf88c..9925d238 100644 --- a/examples/uitest/demo_harmony_test.go +++ b/examples/uitest/demo_harmony_test.go @@ -5,8 +5,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) 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 5add9b30..c08b659e 100644 --- a/examples/uitest/demo_ios_live_swipe_test.go +++ b/examples/uitest/demo_ios_live_swipe_test.go @@ -5,8 +5,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) 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 d709b87a..15c6c8d0 100644 --- a/examples/uitest/demo_ios_wda_log_test.go +++ b/examples/uitest/demo_ios_wda_log_test.go @@ -5,8 +5,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestWDALog(t *testing.T) { diff --git a/examples/uitest/expert_test.go b/examples/uitest/expert_test.go index ed1e9681..cdb37aee 100644 --- a/examples/uitest/expert_test.go +++ b/examples/uitest/expert_test.go @@ -3,8 +3,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestAndroidExpertTest(t *testing.T) { diff --git a/examples/uitest/harmony_e2e_delay_test.go b/examples/uitest/harmony_e2e_delay_test.go index 037dec4d..6387cab4 100644 --- a/examples/uitest/harmony_e2e_delay_test.go +++ b/examples/uitest/harmony_e2e_delay_test.go @@ -3,8 +3,8 @@ package uitest import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestHarmonyDouyinE2E(t *testing.T) { diff --git a/examples/worldcup/cli.go b/examples/worldcup/cli.go index 8926caf8..79891a58 100644 --- a/examples/worldcup/cli.go +++ b/examples/worldcup/cli.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) var rootCmd = &cobra.Command{ diff --git a/examples/worldcup/main.go b/examples/worldcup/main.go index 1f82db9a..1ebd2225 100644 --- a/examples/worldcup/main.go +++ b/examples/worldcup/main.go @@ -15,7 +15,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func convertTimeToSeconds(timeStr string) (int, error) { diff --git a/examples/worldcup/main_test.go b/examples/worldcup/main_test.go index 9b134993..f5ab4642 100644 --- a/examples/worldcup/main_test.go +++ b/examples/worldcup/main_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestConvertTimeToSeconds(t *testing.T) { diff --git a/hrp/internal/builtin/assertion.go b/internal/builtin/assertion.go similarity index 100% rename from hrp/internal/builtin/assertion.go rename to internal/builtin/assertion.go diff --git a/hrp/internal/builtin/assertion_test.go b/internal/builtin/assertion_test.go similarity index 100% rename from hrp/internal/builtin/assertion_test.go rename to internal/builtin/assertion_test.go diff --git a/hrp/internal/builtin/function.go b/internal/builtin/function.go similarity index 100% rename from hrp/internal/builtin/function.go rename to internal/builtin/function.go diff --git a/hrp/internal/builtin/utils.go b/internal/builtin/utils.go similarity index 99% rename from hrp/internal/builtin/utils.go rename to internal/builtin/utils.go index 2f764b6c..045492d6 100644 --- a/hrp/internal/builtin/utils.go +++ b/internal/builtin/utils.go @@ -29,8 +29,8 @@ import ( "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/json" ) func Dump2JSON(data interface{}, path string) error { diff --git a/hrp/internal/config/config.go b/internal/config/config.go similarity index 100% rename from hrp/internal/config/config.go rename to internal/config/config.go diff --git a/hrp/internal/json/json.go b/internal/json/json.go similarity index 100% rename from hrp/internal/json/json.go rename to internal/json/json.go diff --git a/hrp/internal/pytest/main.go b/internal/pytest/main.go similarity index 100% rename from hrp/internal/pytest/main.go rename to internal/pytest/main.go diff --git a/hrp/internal/scaffold/examples_test.go b/internal/scaffold/examples_test.go similarity index 100% rename from hrp/internal/scaffold/examples_test.go rename to internal/scaffold/examples_test.go diff --git a/hrp/internal/scaffold/main.go b/internal/scaffold/main.go similarity index 94% rename from hrp/internal/scaffold/main.go rename to internal/scaffold/main.go index 9efd19e6..fda5b02c 100644 --- a/hrp/internal/scaffold/main.go +++ b/internal/scaffold/main.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/config" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/internal/version" + hrp "github.com/httprunner/httprunner/v5" + "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/internal/sdk" + "github.com/httprunner/httprunner/v5/internal/version" ) type PluginType string diff --git a/hrp/internal/scaffold/templates/api/get.json b/internal/scaffold/templates/api/get.json similarity index 100% rename from hrp/internal/scaffold/templates/api/get.json rename to internal/scaffold/templates/api/get.json diff --git a/hrp/internal/scaffold/templates/api/get.yml b/internal/scaffold/templates/api/get.yml similarity index 100% rename from hrp/internal/scaffold/templates/api/get.yml rename to internal/scaffold/templates/api/get.yml diff --git a/hrp/internal/scaffold/templates/api/post.json b/internal/scaffold/templates/api/post.json similarity index 100% rename from hrp/internal/scaffold/templates/api/post.json rename to internal/scaffold/templates/api/post.json diff --git a/hrp/internal/scaffold/templates/api/post.yml b/internal/scaffold/templates/api/post.yml similarity index 100% rename from hrp/internal/scaffold/templates/api/post.yml rename to internal/scaffold/templates/api/post.yml diff --git a/hrp/internal/scaffold/templates/api/put.json b/internal/scaffold/templates/api/put.json similarity index 100% rename from hrp/internal/scaffold/templates/api/put.json rename to internal/scaffold/templates/api/put.json diff --git a/hrp/internal/scaffold/templates/api/put.yml b/internal/scaffold/templates/api/put.yml similarity index 100% rename from hrp/internal/scaffold/templates/api/put.yml rename to internal/scaffold/templates/api/put.yml diff --git a/hrp/internal/scaffold/templates/env b/internal/scaffold/templates/env similarity index 100% rename from hrp/internal/scaffold/templates/env rename to internal/scaffold/templates/env diff --git a/hrp/internal/scaffold/templates/gitignore b/internal/scaffold/templates/gitignore similarity index 100% rename from hrp/internal/scaffold/templates/gitignore rename to internal/scaffold/templates/gitignore diff --git a/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py b/internal/scaffold/templates/plugin/.debugtalk_gen.py similarity index 100% rename from hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py rename to internal/scaffold/templates/plugin/.debugtalk_gen.py diff --git a/hrp/internal/scaffold/templates/plugin/debugtalk.go b/internal/scaffold/templates/plugin/debugtalk.go similarity index 100% rename from hrp/internal/scaffold/templates/plugin/debugtalk.go rename to internal/scaffold/templates/plugin/debugtalk.go diff --git a/hrp/internal/scaffold/templates/plugin/debugtalk.py b/internal/scaffold/templates/plugin/debugtalk.py similarity index 100% rename from hrp/internal/scaffold/templates/plugin/debugtalk.py rename to internal/scaffold/templates/plugin/debugtalk.py diff --git a/hrp/internal/scaffold/templates/plugin/debugtalkGoTemplate b/internal/scaffold/templates/plugin/debugtalkGoTemplate similarity index 100% rename from hrp/internal/scaffold/templates/plugin/debugtalkGoTemplate rename to internal/scaffold/templates/plugin/debugtalkGoTemplate diff --git a/hrp/internal/scaffold/templates/plugin/debugtalkPythonTemplate b/internal/scaffold/templates/plugin/debugtalkPythonTemplate similarity index 100% rename from hrp/internal/scaffold/templates/plugin/debugtalkPythonTemplate rename to internal/scaffold/templates/plugin/debugtalkPythonTemplate diff --git a/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go b/internal/scaffold/templates/plugin/debugtalk_gen.go similarity index 100% rename from hrp/internal/scaffold/templates/plugin/debugtalk_gen.go rename to internal/scaffold/templates/plugin/debugtalk_gen.go diff --git a/hrp/internal/scaffold/templates/pytest.ini b/internal/scaffold/templates/pytest.ini similarity index 100% rename from hrp/internal/scaffold/templates/pytest.ini rename to internal/scaffold/templates/pytest.ini diff --git a/hrp/internal/scaffold/templates/report/template.html b/internal/scaffold/templates/report/template.html similarity index 100% rename from hrp/internal/scaffold/templates/report/template.html rename to internal/scaffold/templates/report/template.html diff --git a/hrp/internal/scaffold/templates/testcases/__init__.py b/internal/scaffold/templates/testcases/__init__.py similarity index 100% rename from hrp/internal/scaffold/templates/testcases/__init__.py rename to internal/scaffold/templates/testcases/__init__.py diff --git a/hrp/internal/scaffold/templates/testcases/demo_empty_request.json b/internal/scaffold/templates/testcases/demo_empty_request.json similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_empty_request.json rename to internal/scaffold/templates/testcases/demo_empty_request.json diff --git a/hrp/internal/scaffold/templates/testcases/demo_empty_request.yml b/internal/scaffold/templates/testcases/demo_empty_request.yml similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_empty_request.yml rename to internal/scaffold/templates/testcases/demo_empty_request.yml diff --git a/hrp/internal/scaffold/templates/testcases/demo_ref_api.json b/internal/scaffold/templates/testcases/demo_ref_api.json similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_ref_api.json rename to internal/scaffold/templates/testcases/demo_ref_api.json diff --git a/hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml b/internal/scaffold/templates/testcases/demo_ref_testcase.yml similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_ref_testcase.yml rename to internal/scaffold/templates/testcases/demo_ref_testcase.yml diff --git a/hrp/internal/scaffold/templates/testcases/demo_ref_testcase_test.py b/internal/scaffold/templates/testcases/demo_ref_testcase_test.py similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_ref_testcase_test.py rename to internal/scaffold/templates/testcases/demo_ref_testcase_test.py diff --git a/hrp/internal/scaffold/templates/testcases/demo_requests.json b/internal/scaffold/templates/testcases/demo_requests.json similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_requests.json rename to internal/scaffold/templates/testcases/demo_requests.json diff --git a/hrp/internal/scaffold/templates/testcases/demo_requests.yml b/internal/scaffold/templates/testcases/demo_requests.yml similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_requests.yml rename to internal/scaffold/templates/testcases/demo_requests.yml diff --git a/hrp/internal/scaffold/templates/testcases/demo_requests_test.py b/internal/scaffold/templates/testcases/demo_requests_test.py similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_requests_test.py rename to internal/scaffold/templates/testcases/demo_requests_test.py diff --git a/hrp/internal/scaffold/templates/testcases/demo_with_funplugin.json b/internal/scaffold/templates/testcases/demo_with_funplugin.json similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_with_funplugin.json rename to internal/scaffold/templates/testcases/demo_with_funplugin.json diff --git a/hrp/internal/scaffold/templates/testcases/demo_with_funplugin.yaml b/internal/scaffold/templates/testcases/demo_with_funplugin.yaml similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_with_funplugin.yaml rename to internal/scaffold/templates/testcases/demo_with_funplugin.yaml diff --git a/hrp/internal/scaffold/templates/testcases/demo_without_funplugin.json b/internal/scaffold/templates/testcases/demo_without_funplugin.json similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_without_funplugin.json rename to internal/scaffold/templates/testcases/demo_without_funplugin.json diff --git a/hrp/internal/scaffold/templates/testcases/demo_without_funplugin.yaml b/internal/scaffold/templates/testcases/demo_without_funplugin.yaml similarity index 100% rename from hrp/internal/scaffold/templates/testcases/demo_without_funplugin.yaml rename to internal/scaffold/templates/testcases/demo_without_funplugin.yaml diff --git a/hrp/internal/sdk/ga4.go b/internal/sdk/ga4.go similarity index 99% rename from hrp/internal/sdk/ga4.go rename to internal/sdk/ga4.go index e723f339..c7f72a89 100644 --- a/hrp/internal/sdk/ga4.go +++ b/internal/sdk/ga4.go @@ -17,7 +17,7 @@ import ( "github.com/rs/zerolog/log" uuid "github.com/satori/go.uuid" - "github.com/httprunner/httprunner/v5/hrp/internal/version" + "github.com/httprunner/httprunner/v5/internal/version" ) // Measurement Protocol (Google Analytics 4) docs reference: diff --git a/hrp/internal/sdk/ga4_test.go b/internal/sdk/ga4_test.go similarity index 100% rename from hrp/internal/sdk/ga4_test.go rename to internal/sdk/ga4_test.go diff --git a/hrp/internal/sdk/sentry.go b/internal/sdk/sentry.go similarity index 91% rename from hrp/internal/sdk/sentry.go rename to internal/sdk/sentry.go index f0cd0eba..1efafbbe 100644 --- a/hrp/internal/sdk/sentry.go +++ b/internal/sdk/sentry.go @@ -7,7 +7,7 @@ import ( "github.com/getsentry/sentry-go" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/version" + "github.com/httprunner/httprunner/v5/internal/version" ) const ( diff --git a/hrp/internal/version/VERSION b/internal/version/VERSION similarity index 100% rename from hrp/internal/version/VERSION rename to internal/version/VERSION diff --git a/hrp/internal/version/init.go b/internal/version/init.go similarity index 100% rename from hrp/internal/version/init.go rename to internal/version/init.go diff --git a/hrp/internal/wiki/main.go b/internal/wiki/main.go similarity index 100% rename from hrp/internal/wiki/main.go rename to internal/wiki/main.go diff --git a/hrp/internal/wiki/open_darwin.go b/internal/wiki/open_darwin.go similarity index 100% rename from hrp/internal/wiki/open_darwin.go rename to internal/wiki/open_darwin.go diff --git a/hrp/internal/wiki/open_linux.go b/internal/wiki/open_linux.go similarity index 100% rename from hrp/internal/wiki/open_linux.go rename to internal/wiki/open_linux.go diff --git a/hrp/internal/wiki/open_windows.go b/internal/wiki/open_windows.go similarity index 100% rename from hrp/internal/wiki/open_windows.go rename to internal/wiki/open_windows.go diff --git a/hrp/loader.go b/loader.go similarity index 97% rename from hrp/loader.go rename to loader.go index b80ec412..e592c68d 100644 --- a/hrp/loader.go +++ b/loader.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog/log" "gopkg.in/yaml.v2" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/json" ) // LoadTestCases load testcases from TestCasePath or TestCase diff --git a/hrp/loader_test.go b/loader_test.go similarity index 100% rename from hrp/loader_test.go rename to loader_test.go diff --git a/hrp/logger.go b/logger.go similarity index 100% rename from hrp/logger.go rename to logger.go diff --git a/hrp/parameters.go b/parameters.go similarity index 100% rename from hrp/parameters.go rename to parameters.go diff --git a/hrp/parameters_test.go b/parameters_test.go similarity index 100% rename from hrp/parameters_test.go rename to parameters_test.go diff --git a/hrp/parser.go b/parser.go similarity index 99% rename from hrp/parser.go rename to parser.go index 085ef6f5..317f6352 100644 --- a/hrp/parser.go +++ b/parser.go @@ -16,8 +16,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" ) func newParser() *Parser { diff --git a/hrp/parser_test.go b/parser_test.go similarity index 100% rename from hrp/parser_test.go rename to parser_test.go diff --git a/hrp/pkg/convert/README.md b/pkg/convert/README.md similarity index 100% rename from hrp/pkg/convert/README.md rename to pkg/convert/README.md diff --git a/hrp/pkg/convert/asset/flowgram.png b/pkg/convert/asset/flowgram.png similarity index 100% rename from hrp/pkg/convert/asset/flowgram.png rename to pkg/convert/asset/flowgram.png diff --git a/hrp/pkg/convert/from_ab.go b/pkg/convert/from_ab.go similarity index 100% rename from hrp/pkg/convert/from_ab.go rename to pkg/convert/from_ab.go diff --git a/hrp/pkg/convert/from_curl.go b/pkg/convert/from_curl.go similarity index 99% rename from hrp/pkg/convert/from_curl.go rename to pkg/convert/from_curl.go index a7109608..4ad04d90 100644 --- a/hrp/pkg/convert/from_curl.go +++ b/pkg/convert/from_curl.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/internal/json" ) const ( diff --git a/hrp/pkg/convert/from_curl_test.go b/pkg/convert/from_curl_test.go similarity index 100% rename from hrp/pkg/convert/from_curl_test.go rename to pkg/convert/from_curl_test.go diff --git a/hrp/pkg/convert/from_gotest.go b/pkg/convert/from_gotest.go similarity index 100% rename from hrp/pkg/convert/from_gotest.go rename to pkg/convert/from_gotest.go diff --git a/hrp/pkg/convert/from_har.go b/pkg/convert/from_har.go similarity index 99% rename from hrp/pkg/convert/from_har.go rename to pkg/convert/from_har.go index e3954c03..15ee1dd7 100644 --- a/hrp/pkg/convert/from_har.go +++ b/pkg/convert/from_har.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/internal/json" ) // ==================== model definition starts here ==================== diff --git a/hrp/pkg/convert/from_har_test.go b/pkg/convert/from_har_test.go similarity index 99% rename from hrp/pkg/convert/from_har_test.go rename to pkg/convert/from_har_test.go index 129b4b66..b9c4e02d 100644 --- a/hrp/pkg/convert/from_har_test.go +++ b/pkg/convert/from_har_test.go @@ -3,9 +3,8 @@ package convert import ( "testing" + hrp "github.com/httprunner/httprunner/v5" "github.com/stretchr/testify/assert" - - "github.com/httprunner/httprunner/v5/hrp" ) var harPath = "../../../examples/data/har/demo.har" diff --git a/hrp/pkg/convert/from_jmeter.go b/pkg/convert/from_jmeter.go similarity index 100% rename from hrp/pkg/convert/from_jmeter.go rename to pkg/convert/from_jmeter.go diff --git a/hrp/pkg/convert/from_json.go b/pkg/convert/from_json.go similarity index 92% rename from hrp/pkg/convert/from_json.go rename to pkg/convert/from_json.go index 6ff7556a..9dd4b96c 100644 --- a/hrp/pkg/convert/from_json.go +++ b/pkg/convert/from_json.go @@ -1,10 +1,9 @@ package convert import ( + hrp "github.com/httprunner/httprunner/v5" "github.com/pkg/errors" "github.com/rs/zerolog/log" - - "github.com/httprunner/httprunner/v5/hrp" ) func LoadJSONCase(path string) (*hrp.TestCaseDef, error) { diff --git a/hrp/pkg/convert/from_postman.go b/pkg/convert/from_postman.go similarity index 99% rename from hrp/pkg/convert/from_postman.go rename to pkg/convert/from_postman.go index df00abda..1e3cebfe 100644 --- a/hrp/pkg/convert/from_postman.go +++ b/pkg/convert/from_postman.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/internal/json" ) // ==================== model definition starts here ==================== diff --git a/hrp/pkg/convert/from_postman_test.go b/pkg/convert/from_postman_test.go similarity index 100% rename from hrp/pkg/convert/from_postman_test.go rename to pkg/convert/from_postman_test.go diff --git a/hrp/pkg/convert/from_pytest.go b/pkg/convert/from_pytest.go similarity index 100% rename from hrp/pkg/convert/from_pytest.go rename to pkg/convert/from_pytest.go diff --git a/hrp/pkg/convert/from_swagger.go b/pkg/convert/from_swagger.go similarity index 91% rename from hrp/pkg/convert/from_swagger.go rename to pkg/convert/from_swagger.go index bb4cf79d..cb5dbff1 100644 --- a/hrp/pkg/convert/from_swagger.go +++ b/pkg/convert/from_swagger.go @@ -2,9 +2,8 @@ package convert import ( "github.com/go-openapi/spec" + hrp "github.com/httprunner/httprunner/v5" "github.com/pkg/errors" - - "github.com/httprunner/httprunner/v5/hrp" ) func LoadSwaggerCase(path string) (*hrp.TestCaseDef, error) { diff --git a/hrp/pkg/convert/from_yaml.go b/pkg/convert/from_yaml.go similarity index 91% rename from hrp/pkg/convert/from_yaml.go rename to pkg/convert/from_yaml.go index 812ba3f2..fcda707f 100644 --- a/hrp/pkg/convert/from_yaml.go +++ b/pkg/convert/from_yaml.go @@ -3,9 +3,8 @@ package convert import ( "reflect" + hrp "github.com/httprunner/httprunner/v5" "github.com/pkg/errors" - - "github.com/httprunner/httprunner/v5/hrp" ) func LoadYAMLCase(path string) (*hrp.TestCaseDef, error) { diff --git a/hrp/pkg/convert/main.go b/pkg/convert/main.go similarity index 97% rename from hrp/pkg/convert/main.go rename to pkg/convert/main.go index db23ecdf..7bb4db10 100644 --- a/hrp/pkg/convert/main.go +++ b/pkg/convert/main.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + hrp "github.com/httprunner/httprunner/v5" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/sdk" ) // target testcase format extensions diff --git a/hrp/pkg/convert/main_test.go b/pkg/convert/main_test.go similarity index 98% rename from hrp/pkg/convert/main_test.go rename to pkg/convert/main_test.go index c1ee1509..69a8ab56 100644 --- a/hrp/pkg/convert/main_test.go +++ b/pkg/convert/main_test.go @@ -3,9 +3,8 @@ package convert import ( "testing" + hrp "github.com/httprunner/httprunner/v5" "github.com/stretchr/testify/assert" - - "github.com/httprunner/httprunner/v5/hrp" ) const ( diff --git a/hrp/pkg/convert/testcase.tmpl b/pkg/convert/testcase.tmpl similarity index 100% rename from hrp/pkg/convert/testcase.tmpl rename to pkg/convert/testcase.tmpl diff --git a/hrp/pkg/convert/to_gotest.go b/pkg/convert/to_gotest.go similarity index 100% rename from hrp/pkg/convert/to_gotest.go rename to pkg/convert/to_gotest.go diff --git a/hrp/pkg/convert/to_json.go b/pkg/convert/to_json.go similarity index 78% rename from hrp/pkg/convert/to_json.go rename to pkg/convert/to_json.go index d205eb59..0aad309d 100644 --- a/hrp/pkg/convert/to_json.go +++ b/pkg/convert/to_json.go @@ -1,6 +1,6 @@ package convert -import "github.com/httprunner/httprunner/v5/hrp/internal/builtin" +import "github.com/httprunner/httprunner/v5/internal/builtin" // convert TCase to JSON case func (c *TCaseConverter) toJSON() (string, error) { diff --git a/hrp/pkg/convert/to_pytest.go b/pkg/convert/to_pytest.go similarity index 100% rename from hrp/pkg/convert/to_pytest.go rename to pkg/convert/to_pytest.go diff --git a/hrp/pkg/convert/to_yaml.go b/pkg/convert/to_yaml.go similarity index 78% rename from hrp/pkg/convert/to_yaml.go rename to pkg/convert/to_yaml.go index 987b93ec..5c803138 100644 --- a/hrp/pkg/convert/to_yaml.go +++ b/pkg/convert/to_yaml.go @@ -1,6 +1,6 @@ package convert -import "github.com/httprunner/httprunner/v5/hrp/internal/builtin" +import "github.com/httprunner/httprunner/v5/internal/builtin" // convert TCase to YAML case func (c *TCaseConverter) toYAML() (string, error) { diff --git a/hrp/pkg/gadb/README.md b/pkg/gadb/README.md similarity index 100% rename from hrp/pkg/gadb/README.md rename to pkg/gadb/README.md diff --git a/hrp/pkg/gadb/client.go b/pkg/gadb/client.go similarity index 99% rename from hrp/pkg/gadb/client.go rename to pkg/gadb/client.go index 47809f7d..46219450 100644 --- a/hrp/pkg/gadb/client.go +++ b/pkg/gadb/client.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) const ( diff --git a/hrp/pkg/gadb/client_test.go b/pkg/gadb/client_test.go similarity index 100% rename from hrp/pkg/gadb/client_test.go rename to pkg/gadb/client_test.go diff --git a/hrp/pkg/gadb/device.go b/pkg/gadb/device.go similarity index 99% rename from hrp/pkg/gadb/device.go rename to pkg/gadb/device.go index f96de53e..d3481458 100644 --- a/hrp/pkg/gadb/device.go +++ b/pkg/gadb/device.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" ) type DeviceFileInfo struct { diff --git a/hrp/pkg/gadb/device_test.go b/pkg/gadb/device_test.go similarity index 100% rename from hrp/pkg/gadb/device_test.go rename to pkg/gadb/device_test.go diff --git a/hrp/pkg/gadb/examples/main.go b/pkg/gadb/examples/main.go similarity index 95% rename from hrp/pkg/gadb/examples/main.go rename to pkg/gadb/examples/main.go index 91ddfd5d..43711a57 100644 --- a/hrp/pkg/gadb/examples/main.go +++ b/pkg/gadb/examples/main.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/httprunner/httprunner/v5/hrp/pkg/gadb" + "github.com/httprunner/httprunner/v5/pkg/gadb" ) func main() { diff --git a/hrp/pkg/gadb/features.go b/pkg/gadb/features.go similarity index 100% rename from hrp/pkg/gadb/features.go rename to pkg/gadb/features.go diff --git a/hrp/pkg/gadb/sync_transport.go b/pkg/gadb/sync_transport.go similarity index 100% rename from hrp/pkg/gadb/sync_transport.go rename to pkg/gadb/sync_transport.go diff --git a/hrp/pkg/gadb/transport.go b/pkg/gadb/transport.go similarity index 98% rename from hrp/pkg/gadb/transport.go rename to pkg/gadb/transport.go index b55d9631..a6f94c83 100644 --- a/hrp/pkg/gadb/transport.go +++ b/pkg/gadb/transport.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) var ErrConnBroken = errors.New("socket connection broken") diff --git a/hrp/pkg/gadb/transport_test.go b/pkg/gadb/transport_test.go similarity index 100% rename from hrp/pkg/gadb/transport_test.go rename to pkg/gadb/transport_test.go diff --git a/hrp/pkg/gadb/utils.go b/pkg/gadb/utils.go similarity index 100% rename from hrp/pkg/gadb/utils.go rename to pkg/gadb/utils.go diff --git a/hrp/pkg/httpstat/demo/main_test.go b/pkg/httpstat/demo/main_test.go similarity index 90% rename from hrp/pkg/httpstat/demo/main_test.go rename to pkg/httpstat/demo/main_test.go index 8bf790b7..61054691 100644 --- a/hrp/pkg/httpstat/demo/main_test.go +++ b/pkg/httpstat/demo/main_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/httprunner/httprunner/v5/hrp/pkg/httpstat" + "github.com/httprunner/httprunner/v5/pkg/httpstat" ) func TestMain(t *testing.T) { diff --git a/hrp/pkg/httpstat/main.go b/pkg/httpstat/main.go similarity index 100% rename from hrp/pkg/httpstat/main.go rename to pkg/httpstat/main.go diff --git a/hrp/pkg/server/app.go b/pkg/server/app.go similarity index 98% rename from hrp/pkg/server/app.go rename to pkg/server/app.go index c60ce267..0dec147f 100644 --- a/hrp/pkg/server/app.go +++ b/pkg/server/app.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" "github.com/rs/zerolog/log" ) diff --git a/hrp/pkg/server/context.go b/pkg/server/context.go similarity index 96% rename from hrp/pkg/server/context.go rename to pkg/server/context.go index 5beeccbc..5bf60a65 100644 --- a/hrp/pkg/server/context.go +++ b/pkg/server/context.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/rs/zerolog/log" ) diff --git a/hrp/pkg/server/key.go b/pkg/server/key.go similarity index 94% rename from hrp/pkg/server/key.go rename to pkg/server/key.go index e78de65b..a3e66e92 100644 --- a/hrp/pkg/server/key.go +++ b/pkg/server/key.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/rs/zerolog/log" ) diff --git a/hrp/pkg/server/main.go b/pkg/server/main.go similarity index 100% rename from hrp/pkg/server/main.go rename to pkg/server/main.go diff --git a/hrp/pkg/server/model.go b/pkg/server/model.go similarity index 95% rename from hrp/pkg/server/model.go rename to pkg/server/model.go index ef43ac3b..0fd8458b 100644 --- a/hrp/pkg/server/model.go +++ b/pkg/server/model.go @@ -1,6 +1,6 @@ package server -import "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" +import "github.com/httprunner/httprunner/v5/pkg/uixt" type HttpResponse struct { Code int `json:"code"` diff --git a/hrp/pkg/server/source.go b/pkg/server/source.go similarity index 96% rename from hrp/pkg/server/source.go rename to pkg/server/source.go index 105f3f65..8b95a96d 100644 --- a/hrp/pkg/server/source.go +++ b/pkg/server/source.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/rs/zerolog/log" ) diff --git a/hrp/pkg/server/stub.go b/pkg/server/stub.go similarity index 97% rename from hrp/pkg/server/stub.go rename to pkg/server/stub.go index 67932b52..8c46588b 100644 --- a/hrp/pkg/server/stub.go +++ b/pkg/server/stub.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/pkg/gadb" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/pkg/gadb" ) func listDeviceHandler(c *gin.Context) { diff --git a/hrp/pkg/server/ui.go b/pkg/server/ui.go similarity index 97% rename from hrp/pkg/server/ui.go rename to pkg/server/ui.go index 28833ef7..ec90b6d5 100644 --- a/hrp/pkg/server/ui.go +++ b/pkg/server/ui.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/rs/zerolog/log" ) diff --git a/hrp/pkg/server/uixt.go b/pkg/server/uixt.go similarity index 93% rename from hrp/pkg/server/uixt.go rename to pkg/server/uixt.go index 6f702c4e..4fd15bb0 100644 --- a/hrp/pkg/server/uixt.go +++ b/pkg/server/uixt.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/rs/zerolog/log" ) diff --git a/hrp/pkg/uixt/README.md b/pkg/uixt/README.md similarity index 100% rename from hrp/pkg/uixt/README.md rename to pkg/uixt/README.md diff --git a/hrp/pkg/uixt/action.go b/pkg/uixt/action.go similarity index 99% rename from hrp/pkg/uixt/action.go rename to pkg/uixt/action.go index 6470f360..4e6317ce 100644 --- a/hrp/pkg/uixt/action.go +++ b/pkg/uixt/action.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" ) type ActionMethod string diff --git a/hrp/pkg/uixt/action_test.go b/pkg/uixt/action_test.go similarity index 100% rename from hrp/pkg/uixt/action_test.go rename to pkg/uixt/action_test.go diff --git a/hrp/pkg/uixt/ai.go b/pkg/uixt/ai.go similarity index 98% rename from hrp/pkg/uixt/ai.go rename to pkg/uixt/ai.go index 88ca318d..565cc4d8 100644 --- a/hrp/pkg/uixt/ai.go +++ b/pkg/uixt/ai.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" ) type IImageService interface { diff --git a/hrp/pkg/uixt/ai_vedem.go b/pkg/uixt/ai_vedem.go similarity index 97% rename from hrp/pkg/uixt/ai_vedem.go rename to pkg/uixt/ai_vedem.go index 867c84eb..324bd8b7 100644 --- a/hrp/pkg/uixt/ai_vedem.go +++ b/pkg/uixt/ai_vedem.go @@ -13,9 +13,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/json" ) var client = &http.Client{ diff --git a/hrp/pkg/uixt/ai_vedem_test.go b/pkg/uixt/ai_vedem_test.go similarity index 100% rename from hrp/pkg/uixt/ai_vedem_test.go rename to pkg/uixt/ai_vedem_test.go diff --git a/hrp/pkg/uixt/android_adb_driver.go b/pkg/uixt/android_adb_driver.go similarity index 99% rename from hrp/pkg/uixt/android_adb_driver.go rename to pkg/uixt/android_adb_driver.go index 47bd1c51..b184ea80 100644 --- a/hrp/pkg/uixt/android_adb_driver.go +++ b/pkg/uixt/android_adb_driver.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/config" - "github.com/httprunner/httprunner/v5/hrp/pkg/gadb" - "github.com/httprunner/httprunner/v5/hrp/pkg/utf7" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/config" + "github.com/httprunner/httprunner/v5/pkg/gadb" + "github.com/httprunner/httprunner/v5/pkg/utf7" ) const ( diff --git a/hrp/pkg/uixt/android_device.go b/pkg/uixt/android_device.go similarity index 99% rename from hrp/pkg/uixt/android_device.go rename to pkg/uixt/android_device.go index 2bf2be12..ffad16c7 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/pkg/uixt/android_device.go @@ -19,11 +19,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/config" - "github.com/httprunner/httprunner/v5/hrp/internal/json" - "github.com/httprunner/httprunner/v5/hrp/pkg/gadb" + "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/internal/json" + "github.com/httprunner/httprunner/v5/pkg/gadb" ) var ( diff --git a/hrp/pkg/uixt/android_key.go b/pkg/uixt/android_key.go similarity index 100% rename from hrp/pkg/uixt/android_key.go rename to pkg/uixt/android_key.go diff --git a/hrp/pkg/uixt/android_layout.go b/pkg/uixt/android_layout.go similarity index 100% rename from hrp/pkg/uixt/android_layout.go rename to pkg/uixt/android_layout.go diff --git a/hrp/pkg/uixt/android_stub_driver.go b/pkg/uixt/android_stub_driver.go similarity index 99% rename from hrp/pkg/uixt/android_stub_driver.go rename to pkg/uixt/android_stub_driver.go index bb5c2239..b9444961 100644 --- a/hrp/pkg/uixt/android_stub_driver.go +++ b/pkg/uixt/android_stub_driver.go @@ -12,7 +12,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/internal/json" ) type stubAndroidDriver struct { diff --git a/hrp/pkg/uixt/android_stub_driver_test.go b/pkg/uixt/android_stub_driver_test.go similarity index 100% rename from hrp/pkg/uixt/android_stub_driver_test.go rename to pkg/uixt/android_stub_driver_test.go diff --git a/hrp/pkg/uixt/android_test.go b/pkg/uixt/android_test.go similarity index 99% rename from hrp/pkg/uixt/android_test.go rename to pkg/uixt/android_test.go index ecf4b4d6..e74b2b02 100644 --- a/hrp/pkg/uixt/android_test.go +++ b/pkg/uixt/android_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/builtin" ) var ( diff --git a/hrp/pkg/uixt/android_uia2_driver.go b/pkg/uixt/android_uia2_driver.go similarity index 99% rename from hrp/pkg/uixt/android_uia2_driver.go rename to pkg/uixt/android_uia2_driver.go index 6777bf56..daa638fc 100644 --- a/hrp/pkg/uixt/android_uia2_driver.go +++ b/pkg/uixt/android_uia2_driver.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/pkg/utf7" + "github.com/httprunner/httprunner/v5/pkg/utf7" ) var errDriverNotImplemented = errors.New("driver method not implemented") diff --git a/hrp/pkg/uixt/client.go b/pkg/uixt/client.go similarity index 100% rename from hrp/pkg/uixt/client.go rename to pkg/uixt/client.go diff --git a/hrp/pkg/uixt/demo/main_test.go b/pkg/uixt/demo/main_test.go similarity index 95% rename from hrp/pkg/uixt/demo/main_test.go rename to pkg/uixt/demo/main_test.go index e984eb2d..31a75a1a 100644 --- a/hrp/pkg/uixt/demo/main_test.go +++ b/pkg/uixt/demo/main_test.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestIOSDemo(t *testing.T) { diff --git a/hrp/pkg/uixt/drag.go b/pkg/uixt/drag.go similarity index 93% rename from hrp/pkg/uixt/drag.go rename to pkg/uixt/drag.go index 8bb18c47..e410c39d 100644 --- a/hrp/pkg/uixt/drag.go +++ b/pkg/uixt/drag.go @@ -3,7 +3,7 @@ package uixt import ( "fmt" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" "github.com/pkg/errors" ) diff --git a/hrp/pkg/uixt/evalite b/pkg/uixt/evalite similarity index 100% rename from hrp/pkg/uixt/evalite rename to pkg/uixt/evalite diff --git a/hrp/pkg/uixt/ext.go b/pkg/uixt/ext.go similarity index 96% rename from hrp/pkg/uixt/ext.go rename to pkg/uixt/ext.go index 487f6eac..c6a73d77 100644 --- a/hrp/pkg/uixt/ext.go +++ b/pkg/uixt/ext.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/config" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/config" ) type DriverExt struct { diff --git a/hrp/pkg/uixt/harmony_device.go b/pkg/uixt/harmony_device.go similarity index 98% rename from hrp/pkg/uixt/harmony_device.go rename to pkg/uixt/harmony_device.go index e2f2d42b..8c055086 100644 --- a/hrp/pkg/uixt/harmony_device.go +++ b/pkg/uixt/harmony_device.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) var ( diff --git a/hrp/pkg/uixt/harmony_hdc_driver.go b/pkg/uixt/harmony_hdc_driver.go similarity index 100% rename from hrp/pkg/uixt/harmony_hdc_driver.go rename to pkg/uixt/harmony_hdc_driver.go diff --git a/hrp/pkg/uixt/harmony_test.go b/pkg/uixt/harmony_test.go similarity index 100% rename from hrp/pkg/uixt/harmony_test.go rename to pkg/uixt/harmony_test.go diff --git a/hrp/pkg/uixt/input.go b/pkg/uixt/input.go similarity index 82% rename from hrp/pkg/uixt/input.go rename to pkg/uixt/input.go index 6e70fdf7..323b9cfb 100644 --- a/hrp/pkg/uixt/input.go +++ b/pkg/uixt/input.go @@ -3,7 +3,7 @@ package uixt import ( "github.com/pkg/errors" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) func (dExt *DriverExt) Input(text string) (err error) { diff --git a/hrp/pkg/uixt/install.go b/pkg/uixt/install.go similarity index 98% rename from hrp/pkg/uixt/install.go rename to pkg/uixt/install.go index afe1610b..1a7cdb81 100644 --- a/hrp/pkg/uixt/install.go +++ b/pkg/uixt/install.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/builtin" ) type InstallOptions struct { diff --git a/hrp/pkg/uixt/interface.go b/pkg/uixt/interface.go similarity index 100% rename from hrp/pkg/uixt/interface.go rename to pkg/uixt/interface.go diff --git a/hrp/pkg/uixt/ios_device.go b/pkg/uixt/ios_device.go similarity index 99% rename from hrp/pkg/uixt/ios_device.go rename to pkg/uixt/ios_device.go index e39f3421..b4946304 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/pkg/uixt/ios_device.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" ) const ( diff --git a/hrp/pkg/uixt/ios_stub_driver.go b/pkg/uixt/ios_stub_driver.go similarity index 100% rename from hrp/pkg/uixt/ios_stub_driver.go rename to pkg/uixt/ios_stub_driver.go diff --git a/hrp/pkg/uixt/ios_stub_driver_test.go b/pkg/uixt/ios_stub_driver_test.go similarity index 97% rename from hrp/pkg/uixt/ios_stub_driver_test.go rename to pkg/uixt/ios_stub_driver_test.go index 8256b6f0..0a9f3a8e 100644 --- a/hrp/pkg/uixt/ios_stub_driver_test.go +++ b/pkg/uixt/ios_stub_driver_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/builtin" ) var ( diff --git a/hrp/pkg/uixt/ios_test.go b/pkg/uixt/ios_test.go similarity index 100% rename from hrp/pkg/uixt/ios_test.go rename to pkg/uixt/ios_test.go diff --git a/hrp/pkg/uixt/ios_wda_driver.go b/pkg/uixt/ios_wda_driver.go similarity index 99% rename from hrp/pkg/uixt/ios_wda_driver.go rename to pkg/uixt/ios_wda_driver.go index 72d19873..86ec3100 100644 --- a/hrp/pkg/uixt/ios_wda_driver.go +++ b/pkg/uixt/ios_wda_driver.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/json" ) type wdaDriver struct { diff --git a/hrp/pkg/uixt/live_e2e.go b/pkg/uixt/live_e2e.go similarity index 100% rename from hrp/pkg/uixt/live_e2e.go rename to pkg/uixt/live_e2e.go diff --git a/hrp/pkg/uixt/popups.go b/pkg/uixt/popups.go similarity index 98% rename from hrp/pkg/uixt/popups.go rename to pkg/uixt/popups.go index f10a2c76..83200650 100644 --- a/hrp/pkg/uixt/popups.go +++ b/pkg/uixt/popups.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) // TODO: add more popup texts diff --git a/hrp/pkg/uixt/popups_test.go b/pkg/uixt/popups_test.go similarity index 100% rename from hrp/pkg/uixt/popups_test.go rename to pkg/uixt/popups_test.go diff --git a/hrp/pkg/uixt/screenshot.go b/pkg/uixt/screenshot.go similarity index 98% rename from hrp/pkg/uixt/screenshot.go rename to pkg/uixt/screenshot.go index 0a832433..90aebcbc 100644 --- a/hrp/pkg/uixt/screenshot.go +++ b/pkg/uixt/screenshot.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/config" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/config" ) type ScreenResult struct { diff --git a/hrp/pkg/uixt/screenshot_test.go b/pkg/uixt/screenshot_test.go similarity index 100% rename from hrp/pkg/uixt/screenshot_test.go rename to pkg/uixt/screenshot_test.go diff --git a/hrp/pkg/uixt/swipe.go b/pkg/uixt/swipe.go similarity index 98% rename from hrp/pkg/uixt/swipe.go rename to pkg/uixt/swipe.go index 17b57927..ee7b912e 100644 --- a/hrp/pkg/uixt/swipe.go +++ b/pkg/uixt/swipe.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" ) func assertRelative(p float64) bool { diff --git a/hrp/pkg/uixt/swipe_test.go b/pkg/uixt/swipe_test.go similarity index 100% rename from hrp/pkg/uixt/swipe_test.go rename to pkg/uixt/swipe_test.go diff --git a/hrp/pkg/uixt/tap.go b/pkg/uixt/tap.go similarity index 98% rename from hrp/pkg/uixt/tap.go rename to pkg/uixt/tap.go index 8e69454c..e10b129c 100644 --- a/hrp/pkg/uixt/tap.go +++ b/pkg/uixt/tap.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) func (dExt *DriverExt) TapAbsXY(x, y float64, options ...ActionOption) error { diff --git a/hrp/pkg/uixt/tap_test.go b/pkg/uixt/tap_test.go similarity index 100% rename from hrp/pkg/uixt/tap_test.go rename to pkg/uixt/tap_test.go diff --git a/hrp/pkg/utf7/decoder.go b/pkg/utf7/decoder.go similarity index 100% rename from hrp/pkg/utf7/decoder.go rename to pkg/utf7/decoder.go diff --git a/hrp/pkg/utf7/encoder.go b/pkg/utf7/encoder.go similarity index 100% rename from hrp/pkg/utf7/encoder.go rename to pkg/utf7/encoder.go diff --git a/hrp/pkg/utf7/utf7.go b/pkg/utf7/utf7.go similarity index 100% rename from hrp/pkg/utf7/utf7.go rename to pkg/utf7/utf7.go diff --git a/hrp/pkg/utf7/utf7_test.go b/pkg/utf7/utf7_test.go similarity index 100% rename from hrp/pkg/utf7/utf7_test.go rename to pkg/utf7/utf7_test.go diff --git a/hrp/plugin.go b/plugin.go similarity index 96% rename from hrp/plugin.go rename to plugin.go index 683fa0f2..30926115 100644 --- a/hrp/plugin.go +++ b/plugin.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/config" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/config" + "github.com/httprunner/httprunner/v5/internal/sdk" ) const ( diff --git a/hrp/plugin_test.go b/plugin_test.go similarity index 100% rename from hrp/plugin_test.go rename to plugin_test.go diff --git a/hrp/runner.go b/runner.go similarity index 99% rename from hrp/runner.go rename to runner.go index 192603f3..ec4ec429 100644 --- a/hrp/runner.go +++ b/runner.go @@ -23,10 +23,10 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/net/http2" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/internal/version" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "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" ) // Run starts to run testcase with default configs. diff --git a/hrp/runner_test.go b/runner_test.go similarity index 99% rename from hrp/runner_test.go rename to runner_test.go index f8d3fb2c..4cdf4edd 100644 --- a/hrp/runner_test.go +++ b/runner_test.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" - "github.com/httprunner/httprunner/v5/hrp/code" + "github.com/httprunner/httprunner/v5/code" ) func buildHashicorpGoPlugin() { diff --git a/hrp/step.go b/step.go similarity index 98% rename from hrp/step.go rename to step.go index 3988dccc..da7dd6f4 100644 --- a/hrp/step.go +++ b/step.go @@ -1,6 +1,6 @@ package hrp -import "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" +import "github.com/httprunner/httprunner/v5/pkg/uixt" type StepType string diff --git a/hrp/step_api.go b/step_api.go similarity index 100% rename from hrp/step_api.go rename to step_api.go diff --git a/hrp/step_function.go b/step_function.go similarity index 96% rename from hrp/step_function.go rename to step_function.go index 1484d8c6..a53a86ea 100644 --- a/hrp/step_function.go +++ b/step_function.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" "github.com/pkg/errors" "github.com/rs/zerolog/log" ) diff --git a/hrp/step_mobile_ui.go b/step_mobile_ui.go similarity index 99% rename from hrp/step_mobile_ui.go rename to step_mobile_ui.go index 2e12f762..386f901c 100644 --- a/hrp/step_mobile_ui.go +++ b/step_mobile_ui.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/sdk" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/sdk" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) type MobileUI struct { diff --git a/hrp/step_mobile_ui_test.go b/step_mobile_ui_test.go similarity index 98% rename from hrp/step_mobile_ui_test.go rename to step_mobile_ui_test.go index 1dbaf8f9..ab8bc677 100644 --- a/hrp/step_mobile_ui_test.go +++ b/step_mobile_ui_test.go @@ -5,7 +5,7 @@ package hrp import ( "testing" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) func TestIOSSettingsAction(t *testing.T) { diff --git a/hrp/step_rendezvous.go b/step_rendezvous.go similarity index 100% rename from hrp/step_rendezvous.go rename to step_rendezvous.go diff --git a/hrp/step_rendezvous_test.go b/step_rendezvous_test.go similarity index 100% rename from hrp/step_rendezvous_test.go rename to step_rendezvous_test.go diff --git a/hrp/step_request.go b/step_request.go similarity index 99% rename from hrp/step_request.go rename to step_request.go index 4938cfa2..79320fb3 100644 --- a/hrp/step_request.go +++ b/step_request.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/json" - "github.com/httprunner/httprunner/v5/hrp/pkg/httpstat" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "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/httpstat" + "github.com/httprunner/httprunner/v5/pkg/uixt" ) type HTTPMethod string diff --git a/hrp/step_request_response.go b/step_request_response.go similarity index 98% rename from hrp/step_request_response.go rename to step_request_response.go index be959268..b21fbbd1 100644 --- a/hrp/step_request_response.go +++ b/step_request_response.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/json" ) var fieldTags = []string{"proto", "status_code", "headers", "cookies", "body", textExtractorSubRegexp} diff --git a/hrp/step_request_response_test.go b/step_request_response_test.go similarity index 100% rename from hrp/step_request_response_test.go rename to step_request_response_test.go diff --git a/hrp/step_request_test.go b/step_request_test.go similarity index 100% rename from hrp/step_request_test.go rename to step_request_test.go diff --git a/hrp/step_shell.go b/step_shell.go similarity index 100% rename from hrp/step_shell.go rename to step_shell.go diff --git a/hrp/step_testcase.go b/step_testcase.go similarity index 100% rename from hrp/step_testcase.go rename to step_testcase.go diff --git a/hrp/step_thinktime.go b/step_thinktime.go similarity index 96% rename from hrp/step_thinktime.go rename to step_thinktime.go index f8b9fde1..bfb986c3 100644 --- a/hrp/step_thinktime.go +++ b/step_thinktime.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/builtin" ) type ThinkTime struct { diff --git a/hrp/step_transaction.go b/step_transaction.go similarity index 100% rename from hrp/step_transaction.go rename to step_transaction.go diff --git a/hrp/step_websocket.go b/step_websocket.go similarity index 99% rename from hrp/step_websocket.go rename to step_websocket.go index f773ad3f..39b23e48 100644 --- a/hrp/step_websocket.go +++ b/step_websocket.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/json" ) func newWSSession() *wsSession { diff --git a/hrp/summary.go b/summary.go similarity index 96% rename from hrp/summary.go rename to summary.go index 3af4b7e7..cb6fd3a1 100644 --- a/hrp/summary.go +++ b/summary.go @@ -12,10 +12,10 @@ import ( "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/config" - "github.com/httprunner/httprunner/v5/hrp/internal/version" - "github.com/httprunner/httprunner/v5/hrp/pkg/uixt" + "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" ) func NewSummary() *Summary { diff --git a/hrp/summary_test.go b/summary_test.go similarity index 100% rename from hrp/summary_test.go rename to summary_test.go diff --git a/hrp/testcase.go b/testcase.go similarity index 97% rename from hrp/testcase.go rename to testcase.go index ed884193..1ccd4319 100644 --- a/hrp/testcase.go +++ b/testcase.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v5/hrp/code" - "github.com/httprunner/httprunner/v5/hrp/internal/builtin" - "github.com/httprunner/httprunner/v5/hrp/internal/json" + "github.com/httprunner/httprunner/v5/code" + "github.com/httprunner/httprunner/v5/internal/builtin" + "github.com/httprunner/httprunner/v5/internal/json" ) // ITestCase represents interface for testcases, diff --git a/hrp/testcase_test.go b/testcase_test.go similarity index 100% rename from hrp/testcase_test.go rename to testcase_test.go diff --git a/hrp/tests/demo_file_load_ws_message.txt b/tests/demo_file_load_ws_message.txt similarity index 100% rename from hrp/tests/demo_file_load_ws_message.txt rename to tests/demo_file_load_ws_message.txt diff --git a/hrp/tests/extract_test.go b/tests/extract_test.go similarity index 98% rename from hrp/tests/extract_test.go rename to tests/extract_test.go index ac69b134..83394882 100644 --- a/hrp/tests/extract_test.go +++ b/tests/extract_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) // reference extracted variables for validation in the same step diff --git a/hrp/tests/function_test.go b/tests/function_test.go similarity index 97% rename from hrp/tests/function_test.go rename to tests/function_test.go index d3c1ba27..2a70226a 100644 --- a/hrp/tests/function_test.go +++ b/tests/function_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestCaseCallFunction(t *testing.T) { diff --git a/hrp/tests/protocol_test.go b/tests/protocol_test.go similarity index 99% rename from hrp/tests/protocol_test.go rename to tests/protocol_test.go index 53660d41..6d737fd8 100644 --- a/hrp/tests/protocol_test.go +++ b/tests/protocol_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestHTTPProtocol(t *testing.T) { diff --git a/hrp/tests/rendezvous_test.go b/tests/rendezvous_test.go similarity index 97% rename from hrp/tests/rendezvous_test.go rename to tests/rendezvous_test.go index 4a87a796..52ec7f26 100644 --- a/hrp/tests/rendezvous_test.go +++ b/tests/rendezvous_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestRendezvous(t *testing.T) { diff --git a/hrp/tests/request_test.go b/tests/request_test.go similarity index 98% rename from hrp/tests/request_test.go rename to tests/request_test.go index 1815accc..bbdd8805 100644 --- a/hrp/tests/request_test.go +++ b/tests/request_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestCaseBasicRequest(t *testing.T) { diff --git a/hrp/tests/test.env b/tests/test.env similarity index 100% rename from hrp/tests/test.env rename to tests/test.env diff --git a/hrp/tests/upload_test.go b/tests/upload_test.go similarity index 98% rename from hrp/tests/upload_test.go rename to tests/upload_test.go index f44da686..ee6c7a16 100644 --- a/hrp/tests/upload_test.go +++ b/tests/upload_test.go @@ -5,7 +5,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestCaseUploadFile(t *testing.T) { diff --git a/hrp/tests/validate_test.go b/tests/validate_test.go similarity index 98% rename from hrp/tests/validate_test.go rename to tests/validate_test.go index 26055e6a..072c8ef9 100644 --- a/hrp/tests/validate_test.go +++ b/tests/validate_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestCaseValidateStep(t *testing.T) { diff --git a/hrp/tests/variables_test.go b/tests/variables_test.go similarity index 99% rename from hrp/tests/variables_test.go rename to tests/variables_test.go index 1f6e1413..1c4ba7f9 100644 --- a/hrp/tests/variables_test.go +++ b/tests/variables_test.go @@ -3,7 +3,7 @@ package tests import ( "testing" - "github.com/httprunner/httprunner/v5/hrp" + hrp "github.com/httprunner/httprunner/v5" ) func TestCaseConfigVariables(t *testing.T) {