diff --git a/hrp/boomer.go b/hrp/boomer.go index 4a73ca6f..2a520955 100644 --- a/hrp/boomer.go +++ b/hrp/boomer.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/net/context" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/pkg/boomer" diff --git a/hrp/build.go b/hrp/build.go index a55c5396..e8599169 100644 --- a/hrp/build.go +++ b/hrp/build.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/version" diff --git a/hrp/cmd/convert.go b/hrp/cmd/convert.go index 05bb2644..38120851 100644 --- a/hrp/cmd/convert.go +++ b/hrp/cmd/convert.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/pkg/convert" ) diff --git a/hrp/cmd/pytest.go b/hrp/cmd/pytest.go index 83549825..11719037 100644 --- a/hrp/cmd/pytest.go +++ b/hrp/cmd/pytest.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/pytest" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" ) diff --git a/hrp/cmd/root.go b/hrp/cmd/root.go index 220b210f..dbab9b48 100644 --- a/hrp/cmd/root.go +++ b/hrp/cmd/root.go @@ -14,7 +14,7 @@ import ( "github.com/httprunner/httprunner/v4/hrp/cmd/adb" "github.com/httprunner/httprunner/v4/hrp/cmd/ios" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/version" ) diff --git a/hrp/internal/code/code.go b/hrp/code/code.go similarity index 100% rename from hrp/internal/code/code.go rename to hrp/code/code.go diff --git a/hrp/internal/code/code_test.go b/hrp/code/code_test.go similarity index 100% rename from hrp/internal/code/code_test.go rename to hrp/code/code_test.go diff --git a/hrp/internal/builtin/utils.go b/hrp/internal/builtin/utils.go index 6d6e3e5f..3d911fb0 100644 --- a/hrp/internal/builtin/utils.go +++ b/hrp/internal/builtin/utils.go @@ -28,7 +28,7 @@ import ( "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/json" ) diff --git a/hrp/internal/scaffold/main.go b/hrp/internal/scaffold/main.go index a52a9cfc..55cb000c 100644 --- a/hrp/internal/scaffold/main.go +++ b/hrp/internal/scaffold/main.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog/log" "github.com/httprunner/httprunner/v4/hrp" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/version" diff --git a/hrp/loader.go b/hrp/loader.go index ba4f9cb3..905cba60 100644 --- a/hrp/loader.go +++ b/hrp/loader.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog/log" "gopkg.in/yaml.v2" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/json" ) diff --git a/hrp/parser.go b/hrp/parser.go index 68394529..85d33a78 100644 --- a/hrp/parser.go +++ b/hrp/parser.go @@ -16,8 +16,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" ) func newParser() *Parser { diff --git a/hrp/pkg/gadb/client.go b/hrp/pkg/gadb/client.go index a81ac116..ee9731a4 100644 --- a/hrp/pkg/gadb/client.go +++ b/hrp/pkg/gadb/client.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" ) const ( diff --git a/hrp/pkg/gadb/device.go b/hrp/pkg/gadb/device.go index aba74103..946cf5ce 100644 --- a/hrp/pkg/gadb/device.go +++ b/hrp/pkg/gadb/device.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" ) type DeviceFileInfo struct { diff --git a/hrp/pkg/gadb/transport.go b/hrp/pkg/gadb/transport.go index d09b5c72..bc6d7264 100644 --- a/hrp/pkg/gadb/transport.go +++ b/hrp/pkg/gadb/transport.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" ) var ErrConnBroken = errors.New("socket connection broken") diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go index cec901b5..21864ee4 100644 --- a/hrp/pkg/uixt/android_adb_driver.go +++ b/hrp/pkg/uixt/android_adb_driver.go @@ -18,7 +18,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/pkg/gadb" "github.com/httprunner/httprunner/v4/hrp/pkg/utf7" diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index 87c54671..9b588c61 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/pkg/gadb" diff --git a/hrp/pkg/uixt/android_test.go b/hrp/pkg/uixt/android_test.go index 0d23c1e5..e1be18b5 100644 --- a/hrp/pkg/uixt/android_test.go +++ b/hrp/pkg/uixt/android_test.go @@ -3,7 +3,6 @@ package uixt import ( - "io/ioutil" "os" "strings" "testing" diff --git a/hrp/pkg/uixt/ext.go b/hrp/pkg/uixt/ext.go index c7906b20..31e331b7 100644 --- a/hrp/pkg/uixt/ext.go +++ b/hrp/pkg/uixt/ext.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" ) diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index 093aea28..a8aef4cb 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -16,8 +16,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/pkg/gidevice" ) diff --git a/hrp/pkg/uixt/ios_driver.go b/hrp/pkg/uixt/ios_driver.go index b94a8eff..82fd3e5c 100644 --- a/hrp/pkg/uixt/ios_driver.go +++ b/hrp/pkg/uixt/ios_driver.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/pkg/gidevice" ) diff --git a/hrp/pkg/uixt/popups.go b/hrp/pkg/uixt/popups.go index d737450e..c2937c04 100644 --- a/hrp/pkg/uixt/popups.go +++ b/hrp/pkg/uixt/popups.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" ) // TODO: add more popup texts diff --git a/hrp/pkg/uixt/service_vedem.go b/hrp/pkg/uixt/service_vedem.go index e2891427..2659cf29 100644 --- a/hrp/pkg/uixt/service_vedem.go +++ b/hrp/pkg/uixt/service_vedem.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/json" ) diff --git a/hrp/pkg/uixt/swipe.go b/hrp/pkg/uixt/swipe.go index 90c459d6..2536709a 100644 --- a/hrp/pkg/uixt/swipe.go +++ b/hrp/pkg/uixt/swipe.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" ) var directionSlice = [][]float64{ diff --git a/hrp/pkg/uixt/video_crawler.go b/hrp/pkg/uixt/video_crawler.go index 9b376fe1..4c71ce2d 100644 --- a/hrp/pkg/uixt/video_crawler.go +++ b/hrp/pkg/uixt/video_crawler.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/json" ) diff --git a/hrp/plugin.go b/hrp/plugin.go index 146c588c..7a8e50ca 100644 --- a/hrp/plugin.go +++ b/hrp/plugin.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" ) diff --git a/hrp/runner.go b/hrp/runner.go index c5720691..6775db96 100644 --- a/hrp/runner.go +++ b/hrp/runner.go @@ -22,7 +22,7 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/net/http2" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/version" ) @@ -649,11 +649,11 @@ func (r *SessionRunner) initWithParameters(parameters map[string]interface{}) { } func (r *SessionRunner) IgnorePopup() bool { - if r.caseRunner.testCase.Config.Android != nil { - return r.caseRunner.testCase.Config.Android[0].IgnorePopup + if r.caseRunner.TestCase.Config.Android != nil { + return r.caseRunner.TestCase.Config.Android[0].IgnorePopup } - if r.caseRunner.testCase.Config.IOS != nil { - return r.caseRunner.testCase.Config.IOS[0].IgnorePopup + if r.caseRunner.TestCase.Config.IOS != nil { + return r.caseRunner.TestCase.Config.IOS[0].IgnorePopup } return false } diff --git a/hrp/runner_test.go b/hrp/runner_test.go index 844375f5..dc18e8c4 100644 --- a/hrp/runner_test.go +++ b/hrp/runner_test.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" ) func buildHashicorpGoPlugin() { diff --git a/hrp/step_mobile_ui.go b/hrp/step_mobile_ui.go index 8b138c8e..70776518 100644 --- a/hrp/step_mobile_ui.go +++ b/hrp/step_mobile_ui.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/httprunner/httprunner/v4/hrp/internal/code" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/pkg/uixt" ) diff --git a/hrp/step_request.go b/hrp/step_request.go index 65092fb8..40821733 100644 --- a/hrp/step_request.go +++ b/hrp/step_request.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/pkg/httpstat" ) diff --git a/hrp/testcase.go b/hrp/testcase.go index 7e928678..42dae8fc 100644 --- a/hrp/testcase.go +++ b/hrp/testcase.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" + "github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/pkg/uixt" )