GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: ITestCase, GetTestCase

Browse Source
This commit is contained in:
lilong.129
2024-08-19 21:37:32 +08:00
parent 14211b7c30
commit 50230adb54
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hrp/loader.go
View File

@@ -25,7 +25,7 @@ func LoadTestCases(iTestCases ...ITestCase) ([]*TestCase, error) {
return nil, errors.New("invalid iTestCase type")
}
casePath := tcPath.GetPath()
casePath := string(*tcPath)
err := fs.WalkDir(os.DirFS(casePath), ".", func(path string, dir fs.DirEntry, e error) error {
if dir == nil {
// casePath is a file other than a dir
@@ -46,7 +46,7 @@ func LoadTestCases(iTestCases ...ITestCase) ([]*TestCase, error) {
// filtered testcases
testCasePath := TestCasePath(path)
tc, err := testCasePath.ToTestCase()
tc, err := testCasePath.GetTestCase()
if err != nil {
log.Warn().Err(err).Str("path", path).Msg("load testcase failed")
return nil

2
hrp/step_request.go
View File

@@ -680,7 +680,7 @@ func (s *StepRequest) PATCH(url string) *StepRequestWithOptionalArgs {
// CallRefCase calls a referenced testcase.
func (s *StepRequest) CallRefCase(tc ITestCase) *StepTestCaseWithOptionalArgs {
var err error
s.step.TestCase, err = tc.ToTestCase()
s.step.TestCase, err = tc.GetTestCase()
if err != nil {
log.Error().Err(err).Msg("failed to load testcase")
os.Exit(code.GetErrorCode(err))

21
hrp/testcase.go
View File

@@ -17,21 +17,16 @@ import (
// ITestCase represents interface for testcases,
// includes TestCase and TestCasePath.
type ITestCase interface {
GetPath() string
ToTestCase() (*TestCase, error)
GetTestCase() (*TestCase, error)
}
// TestCasePath implements ITestCase interface.
type TestCasePath string
func (path *TestCasePath) GetPath() string {
return fmt.Sprintf("%v", *path)
}
// ToTestCase loads testcase path and convert to *TestCase
func (path *TestCasePath) ToTestCase() (*TestCase, error) {
// GetTestCase loads testcase path and convert to *TestCase
func (path *TestCasePath) GetTestCase() (*TestCase, error) {
tc := &TestCase{}
casePath := path.GetPath()
casePath := string(*path)
err := builtin.LoadFile(casePath, tc)
if err != nil {
return nil, err
@@ -56,11 +51,7 @@ type TestCase struct {
TestSteps []IStep `json:"-" yaml:"-"`
}
func (tc *TestCase) GetPath() string {
return tc.Config.Path
}
func (tc *TestCase) ToTestCase() (*TestCase, error) {
func (tc *TestCase) GetTestCase() (*TestCase, error) {
return tc, nil
}
@@ -208,7 +199,7 @@ func (tc *TestCase) loadISteps() (*TestCase, error) {
}
refTestCase := TestCasePath(path)
tc, err := refTestCase.ToTestCase()
tc, err := refTestCase.GetTestCase()
if err != nil {
return nil, err
}