From 98ce2cc818e5c28621595eb8de4b320c7cbb5df4 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Mon, 19 Aug 2024 22:47:13 +0800 Subject: [PATCH] change: rename LoadFile to LoadFileObject --- hrp/loader.go | 4 ++-- hrp/loader_test.go | 4 ++-- hrp/pkg/convert/from_har.go | 2 +- hrp/pkg/convert/from_json.go | 2 +- hrp/pkg/convert/from_postman.go | 2 +- hrp/pkg/convert/from_swagger.go | 2 +- hrp/pkg/convert/from_yaml.go | 2 +- hrp/pkg/convert/main.go | 2 +- hrp/step_api.go | 2 +- hrp/testcase.go | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hrp/loader.go b/hrp/loader.go index a79212be..c6910168 100644 --- a/hrp/loader.go +++ b/hrp/loader.go @@ -70,8 +70,8 @@ func LoadTestCases(tests ...ITestCase) ([]*TestCase, error) { return testCases, nil } -// LoadFile loads file content with file extension and assigns to structObj -func LoadFile(path string, structObj interface{}) (err error) { +// LoadFileObject loads file content with file extension and assigns to structObj +func LoadFileObject(path string, structObj interface{}) (err error) { log.Info().Str("path", path).Msg("load file") file, err := builtin.ReadFile(path) if err != nil { diff --git a/hrp/loader_test.go b/hrp/loader_test.go index 68ac67e2..75f452ba 100644 --- a/hrp/loader_test.go +++ b/hrp/loader_test.go @@ -53,11 +53,11 @@ func TestLoadTestCases(t *testing.T) { func TestLoadCase(t *testing.T) { tcJSON := &TestCase{} tcYAML := &TestCase{} - err := LoadFile(demoTestCaseWithPluginJSONPath, tcJSON) + err := LoadFileObject(demoTestCaseWithPluginJSONPath, tcJSON) if !assert.NoError(t, err) { t.Fatal() } - err = LoadFile(demoTestCaseWithPluginYAMLPath, tcYAML) + err = LoadFileObject(demoTestCaseWithPluginYAMLPath, tcYAML) if !assert.NoError(t, err) { t.Fatal() } diff --git a/hrp/pkg/convert/from_har.go b/hrp/pkg/convert/from_har.go index 7b4f1ef1..60ebed27 100644 --- a/hrp/pkg/convert/from_har.go +++ b/hrp/pkg/convert/from_har.go @@ -370,7 +370,7 @@ func LoadHARCase(path string) (*hrp.TestCase, error) { func loadCaseHAR(path string) (*CaseHar, error) { caseHAR := new(CaseHar) - err := hrp.LoadFile(path, caseHAR) + err := hrp.LoadFileObject(path, caseHAR) if err != nil { return nil, errors.Wrap(err, "load har file failed") } diff --git a/hrp/pkg/convert/from_json.go b/hrp/pkg/convert/from_json.go index b0725118..4331d007 100644 --- a/hrp/pkg/convert/from_json.go +++ b/hrp/pkg/convert/from_json.go @@ -10,7 +10,7 @@ import ( func LoadJSONCase(path string) (*hrp.TestCase, error) { log.Info().Str("path", path).Msg("load json case file") caseJSON := new(hrp.TestCase) - err := hrp.LoadFile(path, caseJSON) + err := hrp.LoadFileObject(path, caseJSON) if err != nil { return nil, errors.Wrap(err, "load json file failed") } diff --git a/hrp/pkg/convert/from_postman.go b/hrp/pkg/convert/from_postman.go index f1f8eac2..6a091765 100644 --- a/hrp/pkg/convert/from_postman.go +++ b/hrp/pkg/convert/from_postman.go @@ -124,7 +124,7 @@ func LoadPostmanCase(path string) (*hrp.TestCase, error) { func loadCasePostman(path string) (*CasePostman, error) { casePostman := new(CasePostman) - err := hrp.LoadFile(path, casePostman) + err := hrp.LoadFileObject(path, casePostman) if err != nil { return nil, errors.Wrap(err, "load postman file failed") } diff --git a/hrp/pkg/convert/from_swagger.go b/hrp/pkg/convert/from_swagger.go index ab5a974c..f5c3fb8b 100644 --- a/hrp/pkg/convert/from_swagger.go +++ b/hrp/pkg/convert/from_swagger.go @@ -10,7 +10,7 @@ import ( func LoadSwaggerCase(path string) (*hrp.TestCase, error) { // load swagger file caseSwagger := new(spec.Swagger) - err := hrp.LoadFile(path, caseSwagger) + err := hrp.LoadFileObject(path, caseSwagger) if err != nil { return nil, errors.Wrap(err, "load swagger file failed") } diff --git a/hrp/pkg/convert/from_yaml.go b/hrp/pkg/convert/from_yaml.go index e2acb54d..c160d44b 100644 --- a/hrp/pkg/convert/from_yaml.go +++ b/hrp/pkg/convert/from_yaml.go @@ -11,7 +11,7 @@ import ( func LoadYAMLCase(path string) (*hrp.TestCase, error) { // load yaml case file caseJSON := new(hrp.TestCase) - err := hrp.LoadFile(path, caseJSON) + err := hrp.LoadFileObject(path, caseJSON) if err != nil { return nil, errors.Wrap(err, "load yaml file failed") } diff --git a/hrp/pkg/convert/main.go b/hrp/pkg/convert/main.go index c1c73e59..fcd3fac7 100644 --- a/hrp/pkg/convert/main.go +++ b/hrp/pkg/convert/main.go @@ -198,7 +198,7 @@ func (c *TCaseConverter) genOutputPath(suffix string) string { func (c *TCaseConverter) overrideWithProfile(path string) error { log.Info().Str("path", path).Msg("load profile") profile := new(Profile) - err := hrp.LoadFile(path, profile) + err := hrp.LoadFileObject(path, profile) if err != nil { log.Warn().Str("path", path). Msg("failed to load profile, ignore!") diff --git a/hrp/step_api.go b/hrp/step_api.go index 9e85d000..fabb63fe 100644 --- a/hrp/step_api.go +++ b/hrp/step_api.go @@ -44,7 +44,7 @@ func (path *APIPath) GetPath() string { func (path *APIPath) ToAPI() (*API, error) { api := &API{} apiPath := path.GetPath() - err := LoadFile(apiPath, api) + err := LoadFileObject(apiPath, api) if err != nil { return nil, err } diff --git a/hrp/testcase.go b/hrp/testcase.go index 853d2ea2..20224b56 100644 --- a/hrp/testcase.go +++ b/hrp/testcase.go @@ -27,7 +27,7 @@ type TestCasePath string func (path *TestCasePath) GetTestCase() (*TestCase, error) { tc := &TestCase{} casePath := string(*path) - err := LoadFile(casePath, tc) + err := LoadFileObject(casePath, tc) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (tc *TestCase) loadISteps() (*TestCase, error) { dotEnvPath := filepath.Join(projectRootDir, ".env") if builtin.IsFilePathExists(dotEnvPath) { envVars := make(map[string]string) - err = LoadFile(dotEnvPath, envVars) + err = LoadFileObject(dotEnvPath, envVars) if err != nil { return nil, errors.Wrap(err, "failed to load .env file") }