GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-09 01:39:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move ReadFile to hrp/loader

Browse Source
This commit is contained in:
lilong.129
2024-08-19 22:54:27 +08:00
parent 98ce2cc818
commit 9efbd04055
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hrp/build_test.go
View File

@@ -6,8 +6,6 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
) )
func TestRun(t *testing.T) { func TestRun(t *testing.T) {
@@ -22,7 +20,7 @@ func TestRun(t *testing.T) {
t.Fatal() t.Fatal()
} }
contentBytes, err := builtin.ReadFile(genDebugTalkPyPath) contentBytes, err := readFile(genDebugTalkPyPath)
if !assert.Nil(t, err) { if !assert.Nil(t, err) {
t.Fatal() t.Fatal()
} }

20
hrp/internal/builtin/utils.go
View File

@@ -237,7 +237,7 @@ func InterfaceType(raw interface{}) string {
func loadFromCSV(path string) []map[string]interface{} { func loadFromCSV(path string) []map[string]interface{} {
log.Info().Str("path", path).Msg("load csv file") log.Info().Str("path", path).Msg("load csv file")
file, err := ReadFile(path) file, err := os.ReadFile(path)
if err != nil { if err != nil {
log.Error().Err(err).Msg("read csv file failed") log.Error().Err(err).Msg("read csv file failed")
os.Exit(code.GetErrorCode(err)) os.Exit(code.GetErrorCode(err))
@@ -263,7 +263,7 @@ func loadFromCSV(path string) []map[string]interface{} {
func loadMessage(path string) []byte { func loadMessage(path string) []byte {
log.Info().Str("path", path).Msg("load message file") log.Info().Str("path", path).Msg("load message file")
file, err := ReadFile(path) file, err := os.ReadFile(path)
if err != nil { if err != nil {
log.Error().Err(err).Msg("read message file failed") log.Error().Err(err).Msg("read message file failed")
os.Exit(code.GetErrorCode(err)) os.Exit(code.GetErrorCode(err))
@@ -271,22 +271,6 @@ func loadMessage(path string) []byte {
return file return file
} }
func ReadFile(path string) ([]byte, error) {
var err error
path, err = filepath.Abs(path)
if err != nil {
log.Error().Err(err).Str("path", path).Msg("convert absolute path failed")
return nil, errors.Wrap(code.LoadFileError, err.Error())
}
file, err := os.ReadFile(path)
if err != nil {
log.Error().Err(err).Msg("read file failed")
return nil, errors.Wrap(code.LoadFileError, err.Error())
}
return file, nil
}
func GetFileNameWithoutExtension(path string) string { func GetFileNameWithoutExtension(path string) string {
base := filepath.Base(path) base := filepath.Base(path)
ext := filepath.Ext(base) ext := filepath.Ext(base)

19
hrp/loader.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/code" "github.com/httprunner/httprunner/v4/hrp/internal/code"
"github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/internal/json"
) )
@@ -73,7 +72,7 @@ func LoadTestCases(tests ...ITestCase) ([]*TestCase, error) {
// LoadFileObject loads file content with file extension and assigns to structObj // LoadFileObject loads file content with file extension and assigns to structObj
func LoadFileObject(path string, structObj interface{}) (err error) { func LoadFileObject(path string, structObj interface{}) (err error) {
log.Info().Str("path", path).Msg("load file") log.Info().Str("path", path).Msg("load file")
file, err := builtin.ReadFile(path) file, err := readFile(path)
if err != nil { if err != nil {
return errors.Wrap(err, "read file failed") return errors.Wrap(err, "read file failed")
} }
@@ -133,3 +132,19 @@ func parseEnvContent(file []byte, obj interface{}) error {
} }
return nil return nil
} }
func readFile(path string) ([]byte, error) {
var err error
path, err = filepath.Abs(path)
if err != nil {
log.Error().Err(err).Str("path", path).Msg("convert absolute path failed")
return nil, errors.Wrap(code.LoadFileError, err.Error())
}
file, err := os.ReadFile(path)
if err != nil {
log.Error().Err(err).Msg("read file failed")
return nil, errors.Wrap(code.LoadFileError, err.Error())
}
return file, nil
}