From 98db4d7bfa96c4a4d3d217edb1f4dda8cdd72134 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 11 Oct 2022 11:22:02 +0800 Subject: [PATCH] refactor: move converter from hrp internal to pkg --- hrp/cmd/convert.go | 2 +- hrp/cmd/curl.go | 2 +- hrp/{internal => pkg}/convert/README.md | 0 .../convert/asset/flowgram.png | Bin hrp/{internal => pkg}/convert/converter.go | 0 .../convert/converter_test.go | 0 hrp/{internal => pkg}/convert/from_curl.go | 0 .../convert/from_curl_test.go | 0 hrp/{internal => pkg}/convert/from_gotest.go | 0 hrp/{internal => pkg}/convert/from_har.go | 0 .../convert/from_har_test.go | 0 hrp/{internal => pkg}/convert/from_json.go | 0 hrp/{internal => pkg}/convert/from_postman.go | 0 .../convert/from_postman_test.go | 0 hrp/{internal => pkg}/convert/from_pytest.go | 0 hrp/{internal => pkg}/convert/from_swagger.go | 0 hrp/{internal => pkg}/convert/from_yaml.go | 0 hrp/{internal => pkg}/convert/testcase.tmpl | 0 hrp/pkg/httpstat/demo/main_test.go | 38 ++++++++++++++++++ hrp/pkg/uixt/ios_device.go | 2 +- 20 files changed, 41 insertions(+), 3 deletions(-) rename hrp/{internal => pkg}/convert/README.md (100%) rename hrp/{internal => pkg}/convert/asset/flowgram.png (100%) rename hrp/{internal => pkg}/convert/converter.go (100%) rename hrp/{internal => pkg}/convert/converter_test.go (100%) rename hrp/{internal => pkg}/convert/from_curl.go (100%) rename hrp/{internal => pkg}/convert/from_curl_test.go (100%) rename hrp/{internal => pkg}/convert/from_gotest.go (100%) rename hrp/{internal => pkg}/convert/from_har.go (100%) rename hrp/{internal => pkg}/convert/from_har_test.go (100%) rename hrp/{internal => pkg}/convert/from_json.go (100%) rename hrp/{internal => pkg}/convert/from_postman.go (100%) rename hrp/{internal => pkg}/convert/from_postman_test.go (100%) rename hrp/{internal => pkg}/convert/from_pytest.go (100%) rename hrp/{internal => pkg}/convert/from_swagger.go (100%) rename hrp/{internal => pkg}/convert/from_yaml.go (100%) rename hrp/{internal => pkg}/convert/testcase.tmpl (100%) create mode 100644 hrp/pkg/httpstat/demo/main_test.go diff --git a/hrp/cmd/convert.go b/hrp/cmd/convert.go index 27163f60..96d3e985 100644 --- a/hrp/cmd/convert.go +++ b/hrp/cmd/convert.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v4/hrp/internal/builtin" - "github.com/httprunner/httprunner/v4/hrp/internal/convert" "github.com/httprunner/httprunner/v4/hrp/internal/version" + "github.com/httprunner/httprunner/v4/hrp/pkg/convert" ) var convertCmd = &cobra.Command{ diff --git a/hrp/cmd/curl.go b/hrp/cmd/curl.go index bd03aeec..02c18a7f 100644 --- a/hrp/cmd/curl.go +++ b/hrp/cmd/curl.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/httprunner/httprunner/v4/hrp" - "github.com/httprunner/httprunner/v4/hrp/internal/convert" "github.com/httprunner/httprunner/v4/hrp/pkg/boomer" + "github.com/httprunner/httprunner/v4/hrp/pkg/convert" ) var runCurlCmd = &cobra.Command{ diff --git a/hrp/internal/convert/README.md b/hrp/pkg/convert/README.md similarity index 100% rename from hrp/internal/convert/README.md rename to hrp/pkg/convert/README.md diff --git a/hrp/internal/convert/asset/flowgram.png b/hrp/pkg/convert/asset/flowgram.png similarity index 100% rename from hrp/internal/convert/asset/flowgram.png rename to hrp/pkg/convert/asset/flowgram.png diff --git a/hrp/internal/convert/converter.go b/hrp/pkg/convert/converter.go similarity index 100% rename from hrp/internal/convert/converter.go rename to hrp/pkg/convert/converter.go diff --git a/hrp/internal/convert/converter_test.go b/hrp/pkg/convert/converter_test.go similarity index 100% rename from hrp/internal/convert/converter_test.go rename to hrp/pkg/convert/converter_test.go diff --git a/hrp/internal/convert/from_curl.go b/hrp/pkg/convert/from_curl.go similarity index 100% rename from hrp/internal/convert/from_curl.go rename to hrp/pkg/convert/from_curl.go diff --git a/hrp/internal/convert/from_curl_test.go b/hrp/pkg/convert/from_curl_test.go similarity index 100% rename from hrp/internal/convert/from_curl_test.go rename to hrp/pkg/convert/from_curl_test.go diff --git a/hrp/internal/convert/from_gotest.go b/hrp/pkg/convert/from_gotest.go similarity index 100% rename from hrp/internal/convert/from_gotest.go rename to hrp/pkg/convert/from_gotest.go diff --git a/hrp/internal/convert/from_har.go b/hrp/pkg/convert/from_har.go similarity index 100% rename from hrp/internal/convert/from_har.go rename to hrp/pkg/convert/from_har.go diff --git a/hrp/internal/convert/from_har_test.go b/hrp/pkg/convert/from_har_test.go similarity index 100% rename from hrp/internal/convert/from_har_test.go rename to hrp/pkg/convert/from_har_test.go diff --git a/hrp/internal/convert/from_json.go b/hrp/pkg/convert/from_json.go similarity index 100% rename from hrp/internal/convert/from_json.go rename to hrp/pkg/convert/from_json.go diff --git a/hrp/internal/convert/from_postman.go b/hrp/pkg/convert/from_postman.go similarity index 100% rename from hrp/internal/convert/from_postman.go rename to hrp/pkg/convert/from_postman.go diff --git a/hrp/internal/convert/from_postman_test.go b/hrp/pkg/convert/from_postman_test.go similarity index 100% rename from hrp/internal/convert/from_postman_test.go rename to hrp/pkg/convert/from_postman_test.go diff --git a/hrp/internal/convert/from_pytest.go b/hrp/pkg/convert/from_pytest.go similarity index 100% rename from hrp/internal/convert/from_pytest.go rename to hrp/pkg/convert/from_pytest.go diff --git a/hrp/internal/convert/from_swagger.go b/hrp/pkg/convert/from_swagger.go similarity index 100% rename from hrp/internal/convert/from_swagger.go rename to hrp/pkg/convert/from_swagger.go diff --git a/hrp/internal/convert/from_yaml.go b/hrp/pkg/convert/from_yaml.go similarity index 100% rename from hrp/internal/convert/from_yaml.go rename to hrp/pkg/convert/from_yaml.go diff --git a/hrp/internal/convert/testcase.tmpl b/hrp/pkg/convert/testcase.tmpl similarity index 100% rename from hrp/internal/convert/testcase.tmpl rename to hrp/pkg/convert/testcase.tmpl diff --git a/hrp/pkg/httpstat/demo/main_test.go b/hrp/pkg/httpstat/demo/main_test.go new file mode 100644 index 00000000..e14bfed7 --- /dev/null +++ b/hrp/pkg/httpstat/demo/main_test.go @@ -0,0 +1,38 @@ +package demo + +import ( + "fmt" + "net/http" + "testing" + "time" + + "github.com/httprunner/httprunner/v4/hrp/pkg/httpstat" +) + +func TestMain(t *testing.T) { + var httpStat httpstat.Stat + + req, _ := http.NewRequest("GET", "https://httprunner.com", nil) + ctx := httpstat.WithHTTPStat(req, &httpStat) + + client := &http.Client{ + Timeout: time.Second * 10, + } + + req = req.WithContext(ctx) + resp, err := client.Do(req) + if err != nil { + t.Fatal(err) + } + if resp != nil { + defer resp.Body.Close() + } + + // get stat + httpStat.Finish() + result := httpStat.Durations() + fmt.Println(result) + + // print stat + httpStat.Print() +} diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index 3a2248c2..eacd8891 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -67,7 +67,7 @@ func InitWDAClient(device *IOSDevice) (*DriverExt, error) { } // switch to iOS springboard before init WDA session - // aviod getting stuck when some super app is activate such as douyin or wexin + // avoid getting stuck when some super app is activate such as douyin or wexin log.Info().Msg("go back to home screen") if err = driver.Homescreen(); err != nil { return nil, errors.Wrap(err, "failed to go back to home screen")