diff --git a/boomer.go b/boomer.go index 8ffabd3..22c9a41 100644 --- a/boomer.go +++ b/boomer.go @@ -58,16 +58,16 @@ func (b *Boomer) convertBoomerTask(testcase *TestCase) *boomer.Task { Weight: testcase.Config.Weight, Fn: func() { runner := NewRunner(nil).SetDebug(b.debug) - config := &testcase.Config + config := testcase.Config for _, step := range testcase.TestSteps { var err error start := time.Now() stepData, err := runner.runStep(step, config) elapsed := time.Since(start).Nanoseconds() / int64(time.Millisecond) if err == nil { - b.RecordSuccess(step.Type(), step.Name(), elapsed, stepData.ResponseLength) + b.RecordSuccess(step.getType(), step.name(), elapsed, stepData.responseLength) } else { - b.RecordFailure(step.Type(), step.Name(), elapsed, err.Error()) + b.RecordFailure(step.getType(), step.name(), elapsed, err.Error()) } } }, diff --git a/boomer_test.go b/boomer_test.go index 5d2e18a..511ebfe 100644 --- a/boomer_test.go +++ b/boomer_test.go @@ -7,22 +7,19 @@ import ( func TestBoomerStandaloneRun(t *testing.T) { testcase1 := &TestCase{ - Config: TConfig{ - Name: "TestCase1", - BaseURL: "http://httpbin.org", - }, + Config: NewConfig("TestCase1").SetBaseURL("http://httpbin.org"), TestSteps: []IStep{ - Step("headers"). + NewStep("headers"). GET("/headers"). Validate(). AssertEqual("status_code", 200, "check status code"). AssertEqual("headers.\"Content-Type\"", "application/json", "check http response Content-Type"), - Step("user-agent"). + NewStep("user-agent"). GET("/user-agent"). Validate(). AssertEqual("status_code", 200, "check status code"). AssertEqual("headers.\"Content-Type\"", "application/json", "check http response Content-Type"), - Step("TestCase3").CallRefCase(&TestCase{Config: TConfig{Name: "TestCase3"}}), + NewStep("TestCase3").CallRefCase(&TestCase{Config: NewConfig("TestCase3")}), }, } testcase2 := &TestCasePath{demoTestCaseJSONPath} diff --git a/convert.go b/convert.go index 978818c..e25f8be 100644 --- a/convert.go +++ b/convert.go @@ -15,7 +15,7 @@ func (tc *TestCase) ToTCase() (*TCase, error) { Config: tc.Config, } for _, step := range tc.TestSteps { - tCase.TestSteps = append(tCase.TestSteps, step.ToStruct()) + tCase.TestSteps = append(tCase.TestSteps, step.toStruct()) } return &tCase, nil } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 44dbb94..77bf6cd 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,7 +1,8 @@ # Release History -## v0.2.2 (2021-12-06) +## v0.2.2 (2021-12-07) +- refactor: update models to make API more concise - change: remove mkdocs, move to [repo](https://github.com/httprunner/httprunner.github.io) ## v0.2.1 (2021-12-02) diff --git a/docs/cmd/hrp.md b/docs/cmd/hrp.md index d7c0b4e..2166390 100644 --- a/docs/cmd/hrp.md +++ b/docs/cmd/hrp.md @@ -22,4 +22,4 @@ Copyright 2021 debugtalk * [hrp har2case](hrp_har2case.md) - Convert HAR to json/yaml testcase files * [hrp run](hrp_run.md) - run API test -###### Auto generated by spf13/cobra on 2-Dec-2021 +###### Auto generated by spf13/cobra on 7-Dec-2021 diff --git a/docs/cmd/hrp_boom.md b/docs/cmd/hrp_boom.md index 734db53..8c906a3 100644 --- a/docs/cmd/hrp_boom.md +++ b/docs/cmd/hrp_boom.md @@ -39,4 +39,4 @@ hrp boom [flags] * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 2-Dec-2021 +###### Auto generated by spf13/cobra on 7-Dec-2021 diff --git a/docs/cmd/hrp_har2case.md b/docs/cmd/hrp_har2case.md index 41c62b7..0932d40 100644 --- a/docs/cmd/hrp_har2case.md +++ b/docs/cmd/hrp_har2case.md @@ -23,4 +23,4 @@ hrp har2case harPath... [flags] * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 2-Dec-2021 +###### Auto generated by spf13/cobra on 7-Dec-2021 diff --git a/docs/cmd/hrp_run.md b/docs/cmd/hrp_run.md index 9c38ebf..18ba8a0 100644 --- a/docs/cmd/hrp_run.md +++ b/docs/cmd/hrp_run.md @@ -30,4 +30,4 @@ hrp run path... [flags] * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 2-Dec-2021 +###### Auto generated by spf13/cobra on 7-Dec-2021 diff --git a/examples/demo_test.go b/examples/demo_test.go index 22fd2f7..0fb4e56 100644 --- a/examples/demo_test.go +++ b/examples/demo_test.go @@ -8,19 +8,17 @@ import ( ) var demoTestCase = &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "demo with complex mechanisms", - BaseURL: "https://postman-echo.com", - Variables: map[string]interface{}{ // global level variables + Config: hrp.NewConfig("demo with complex mechanisms"). + SetBaseURL("https://postman-echo.com"). + WithVariables(map[string]interface{}{ // global level variables "n": 5, "a": 12.3, "b": 3.45, "varFoo1": "${gen_random_string($n)}", "varFoo2": "${max($a, $b)}", // 12.3; eval with built-in function - }, - }, + }), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ // step level variables "n": 3, // inherit config level variables if not set in step level, a/varFoo1 "b": 34.5, // override config level variable if existed, n/b/varFoo2 @@ -37,7 +35,7 @@ var demoTestCase = &hrp.TestCase{ AssertLengthEqual("body.args.foo1", 5, "check args foo1"). // validate response body with jmespath AssertLengthEqual("$varFoo1", 5, "check args foo1"). // assert with extracted variable from current step AssertEqual("body.args.foo2", "34.5", "check args foo2"), // notice: request params value will be converted to string - hrp.Step("post json data"). + hrp.NewStep("post json data"). POST("/post"). WithBody(map[string]interface{}{ "foo1": "$varFoo1", // reference former extracted variable @@ -47,7 +45,7 @@ var demoTestCase = &hrp.TestCase{ AssertEqual("status_code", 200, "check status code"). AssertLengthEqual("body.json.foo1", 5, "check args foo1"). AssertEqual("body.json.foo2", 12.3, "check args foo2"), - hrp.Step("post form data"). + hrp.NewStep("post form data"). POST("/post"). WithHeaders(map[string]string{"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"}). WithBody(map[string]interface{}{ diff --git a/examples/extract_test.go b/examples/extract_test.go index 7f3891b..ec72277 100644 --- a/examples/extract_test.go +++ b/examples/extract_test.go @@ -9,13 +9,11 @@ import ( // reference extracted variables for validation in the same step func TestCaseExtractStepSingle(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with variables", - BaseURL: "https://postman-echo.com", - Verify: false, - }, + Config: hrp.NewConfig("run request with variables"). + SetBaseURL("https://postman-echo.com"). + SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "var1": "bar1", "agent": "HttpRunnerPlus", @@ -46,13 +44,11 @@ func TestCaseExtractStepSingle(t *testing.T) { // reference extracted variables from previous step func TestCaseExtractStepAssociation(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with variables", - BaseURL: "https://postman-echo.com", - Verify: false, - }, + Config: hrp.NewConfig("run request with variables"). + SetBaseURL("https://postman-echo.com"). + SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "var1": "bar1", "agent": "HttpRunnerPlus", @@ -71,7 +67,7 @@ func TestCaseExtractStepAssociation(t *testing.T) { AssertEqual("$varFoo1", "bar1", "check args foo1"). AssertEqual("body.args.foo2", "bar2", "check args foo2"). AssertEqual("body.headers.\"user-agent\"", "HttpRunnerPlus", "check header user agent"), - hrp.Step("post json data"). + hrp.NewStep("post json data"). POST("/post"). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). WithBody(map[string]interface{}{"foo1": "bar1", "foo2": "bar2"}). diff --git a/examples/function_test.go b/examples/function_test.go index 2ae4d64..cd2c2d9 100644 --- a/examples/function_test.go +++ b/examples/function_test.go @@ -8,18 +8,16 @@ import ( func TestCaseCallFunction(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with functions", - BaseURL: "https://postman-echo.com", - Verify: false, - Variables: map[string]interface{}{ + Config: hrp.NewConfig("run request with functions"). + SetBaseURL("https://postman-echo.com"). + WithVariables(map[string]interface{}{ "n": 5, "a": 12.3, "b": 3.45, - }, - }, + }). + SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). GET("/get"). WithParams(map[string]interface{}{"foo1": "${gen_random_string($n)}", "foo2": "${max($a, $b)}"}). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). @@ -29,7 +27,7 @@ func TestCaseCallFunction(t *testing.T) { AssertEqual("status_code", 200, "check status code"). AssertLengthEqual("body.args.foo1", 5, "check args foo1"). AssertEqual("body.args.foo2", "12.3", "check args foo2"), // notice: request params value will be converted to string - hrp.Step("post json data with functions"). + hrp.NewStep("post json data with functions"). POST("/post"). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). WithBody(map[string]interface{}{"foo1": "${gen_random_string($n)}", "foo2": "${max($a, $b)}"}). diff --git a/examples/request_test.go b/examples/request_test.go index a17047a..6312df0 100644 --- a/examples/request_test.go +++ b/examples/request_test.go @@ -8,13 +8,11 @@ import ( func TestCaseBasicRequest(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "request methods testcase in hardcode", - BaseURL: "https://postman-echo.com", - Verify: false, - }, + Config: hrp.NewConfig("request methods testcase in hardcode"). + SetBaseURL("https://postman-echo.com"). + SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). GET("/get"). WithParams(map[string]interface{}{"foo1": "bar1", "foo2": "bar2"}). WithHeaders(map[string]string{ @@ -26,7 +24,7 @@ func TestCaseBasicRequest(t *testing.T) { AssertEqual("headers.\"Content-Type\"", "application/json; charset=utf-8", "check header Content-Type"). AssertEqual("body.args.foo1", "bar1", "check args foo1"). AssertEqual("body.args.foo2", "bar2", "check args foo2"), - hrp.Step("post raw text"). + hrp.NewStep("post raw text"). POST("/post"). WithHeaders(map[string]string{ "User-Agent": "HttpRunnerPlus", @@ -36,7 +34,7 @@ func TestCaseBasicRequest(t *testing.T) { Validate(). AssertEqual("status_code", 200, "check status code"). AssertEqual("body.data", "This is expected to be sent back as part of response body.", "check data"), - hrp.Step("post form data"). + hrp.NewStep("post form data"). POST("/post"). WithHeaders(map[string]string{ "User-Agent": "HttpRunnerPlus", @@ -47,7 +45,7 @@ func TestCaseBasicRequest(t *testing.T) { AssertEqual("status_code", 200, "check status code"). AssertEqual("body.form.foo1", "bar1", "check form foo1"). AssertEqual("body.form.foo2", "bar2", "check form foo2"), - hrp.Step("post json data"). + hrp.NewStep("post json data"). POST("/post"). WithHeaders(map[string]string{ "User-Agent": "HttpRunnerPlus", @@ -57,7 +55,7 @@ func TestCaseBasicRequest(t *testing.T) { AssertEqual("status_code", 200, "check status code"). AssertEqual("body.json.foo1", "bar1", "check json foo1"). AssertEqual("body.json.foo2", "bar2", "check json foo2"), - hrp.Step("put request"). + hrp.NewStep("put request"). PUT("/put"). WithHeaders(map[string]string{ "User-Agent": "HttpRunnerPlus", diff --git a/examples/validate_test.go b/examples/validate_test.go index 17f768c..24d60e2 100644 --- a/examples/validate_test.go +++ b/examples/validate_test.go @@ -8,13 +8,11 @@ import ( func TestCaseValidateStep(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with validation", - BaseURL: "https://postman-echo.com", - Verify: false, - }, + Config: hrp.NewConfig("run request with validation"). + SetBaseURL("https://postman-echo.com"). + SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "var1": "bar1", "agent": "HttpRunnerPlus", @@ -32,7 +30,7 @@ func TestCaseValidateStep(t *testing.T) { AssertEqual("body.args.foo1", "bar1", "check args foo1"). // assert response json body with jmespath AssertEqual("body.args.foo2", "bar2", "check args foo2"). AssertEqual("body.headers.\"user-agent\"", "HttpRunnerPlus", "check header user agent"), - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "var1": "bar1", "agent": "HttpRunnerPlus", diff --git a/examples/variables_test.go b/examples/variables_test.go index 2d4f4c5..9fb4c0f 100644 --- a/examples/variables_test.go +++ b/examples/variables_test.go @@ -8,18 +8,15 @@ import ( func TestCaseConfigVariables(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with variables", - BaseURL: "https://postman-echo.com", - Variables: map[string]interface{}{ + Config: hrp.NewConfig("run request with variables"). + SetBaseURL("https://postman-echo.com"). + WithVariables(map[string]interface{}{ "var1": "bar1", "agent": "HttpRunnerPlus", "expectedStatusCode": 200, - }, - Verify: false, - }, + }).SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). GET("/get"). WithParams(map[string]interface{}{"foo1": "$var1", "foo2": "bar2"}). WithHeaders(map[string]string{"User-Agent": "$agent"}). @@ -41,13 +38,11 @@ func TestCaseConfigVariables(t *testing.T) { func TestCaseStepVariables(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with variables", - BaseURL: "https://postman-echo.com", - Verify: false, - }, + Config: hrp.NewConfig("run request with variables"). + SetBaseURL("https://postman-echo.com"). + SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "var1": "bar1", "agent": "HttpRunnerPlus", @@ -74,18 +69,15 @@ func TestCaseStepVariables(t *testing.T) { func TestCaseOverrideConfigVariables(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with variables", - BaseURL: "https://postman-echo.com", - Variables: map[string]interface{}{ + Config: hrp.NewConfig("run request with variables"). + SetBaseURL("https://postman-echo.com"). + WithVariables(map[string]interface{}{ "var1": "bar0", "agent": "HttpRunnerPlus", "expectedStatusCode": 200, - }, - Verify: false, - }, + }).SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "var1": "bar1", // override config variable "agent": "$agent", // reference config variable @@ -112,20 +104,17 @@ func TestCaseOverrideConfigVariables(t *testing.T) { func TestCaseParseVariables(t *testing.T) { testcase := &hrp.TestCase{ - Config: hrp.TConfig{ - Name: "run request with functions", - BaseURL: "https://postman-echo.com", - Verify: false, - Variables: map[string]interface{}{ + Config: hrp.NewConfig("run request with functions"). + SetBaseURL("https://postman-echo.com"). + WithVariables(map[string]interface{}{ "n": 5, "a": 12.3, "b": 3.45, "varFoo1": "${gen_random_string($n)}", "varFoo2": "${max($a, $b)}", // 12.3 - }, - }, + }).SetVerifySSL(false), TestSteps: []hrp.IStep{ - hrp.Step("get with params"). + hrp.NewStep("get with params"). WithVariables(map[string]interface{}{ "n": 3, "b": 34.5, @@ -140,7 +129,7 @@ func TestCaseParseVariables(t *testing.T) { AssertEqual("status_code", 200, "check status code"). AssertLengthEqual("body.args.foo1", 5, "check args foo1"). AssertEqual("body.args.foo2", "34.5", "check args foo2"), // notice: request params value will be converted to string - hrp.Step("post json data with functions"). + hrp.NewStep("post json data with functions"). POST("/post"). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). WithBody(map[string]interface{}{"foo1": "${gen_random_string($n)}", "foo2": "${max($a, $b)}"}). diff --git a/extract.go b/extract.go index 5dc8d83..40080e3 100644 --- a/extract.go +++ b/extract.go @@ -7,25 +7,27 @@ type stepRequestExtraction struct { step *TStep } +// WithJmesPath sets the JMESPath expression to extract from the response. func (s *stepRequestExtraction) WithJmesPath(jmesPath string, varName string) *stepRequestExtraction { s.step.Extract[varName] = jmesPath return s } +// Validate switches to step validation. func (s *stepRequestExtraction) Validate() *stepRequestValidation { return &stepRequestValidation{ step: s.step, } } -func (s *stepRequestExtraction) Name() string { +func (s *stepRequestExtraction) name() string { return s.step.Name } -func (s *stepRequestExtraction) Type() string { +func (s *stepRequestExtraction) getType() string { return fmt.Sprintf("request-%v", s.step.Request.Method) } -func (s *stepRequestExtraction) ToStruct() *TStep { +func (s *stepRequestExtraction) toStruct() *TStep { return s.step } diff --git a/har2case/core.go b/har2case/core.go index 04c1a31..0e48957 100644 --- a/har2case/core.go +++ b/har2case/core.go @@ -86,7 +86,7 @@ func (h *HAR) makeTestCase() (*hrp.TCase, error) { } tCase := &hrp.TCase{ - Config: *h.prepareConfig(), + Config: h.prepareConfig(), TestSteps: teststeps, } return tCase, nil @@ -114,11 +114,8 @@ func (h *HAR) load() (*Har, error) { } func (h *HAR) prepareConfig() *hrp.TConfig { - return &hrp.TConfig{ - Name: "testcase description", - Variables: make(map[string]interface{}), - Verify: false, - } + return hrp.NewConfig("testcase description"). + SetVerifySSL(false) } func (h *HAR) prepareTestSteps() ([]*hrp.TStep, error) { @@ -147,8 +144,8 @@ func (h *HAR) prepareTestStep(entry *Entry) (*hrp.TStep, error) { tStep := &TStep{ TStep: hrp.TStep{ - Request: &hrp.TRequest{}, - Validators: make([]hrp.TValidator, 0), + Request: &hrp.Request{}, + Validators: make([]hrp.Validator, 0), }, } if err := tStep.makeRequestMethod(entry); err != nil { @@ -180,7 +177,7 @@ type TStep struct { } func (s *TStep) makeRequestMethod(entry *Entry) error { - s.Request.Method = hrp.EnumHTTPMethod(entry.Request.Method) + s.Request.Method = entry.Request.Method return nil } @@ -258,7 +255,7 @@ func (s *TStep) makeRequestBody(entry *Entry) error { func (s *TStep) makeValidate(entry *Entry) error { // make validator for response status code - s.Validators = append(s.Validators, hrp.TValidator{ + s.Validators = append(s.Validators, hrp.Validator{ Check: "status_code", Assert: "equals", Expect: entry.Response.Status, @@ -269,7 +266,7 @@ func (s *TStep) makeValidate(entry *Entry) error { for _, header := range entry.Response.Headers { // assert Content-Type if strings.EqualFold(header.Name, "Content-Type") { - s.Validators = append(s.Validators, hrp.TValidator{ + s.Validators = append(s.Validators, hrp.Validator{ Check: "headers.Content-Type", Assert: "equals", Expect: header.Value, @@ -318,7 +315,7 @@ func (s *TStep) makeValidate(entry *Entry) error { case []interface{}: continue default: - s.Validators = append(s.Validators, hrp.TValidator{ + s.Validators = append(s.Validators, hrp.Validator{ Check: fmt.Sprintf("body.%s", key), Assert: "equals", Expect: v, diff --git a/internal/version/init.go b/internal/version/init.go index e5b480e..b62e297 100644 --- a/internal/version/init.go +++ b/internal/version/init.go @@ -1,3 +1,3 @@ package version -const VERSION = "v0.2.1" +const VERSION = "v0.2.2" diff --git a/models.go b/models.go index 9aafdc6..c1ee30c 100644 --- a/models.go +++ b/models.go @@ -1,19 +1,19 @@ package hrp -type EnumHTTPMethod string - const ( - GET EnumHTTPMethod = "GET" - HEAD EnumHTTPMethod = "HEAD" - POST EnumHTTPMethod = "POST" - PUT EnumHTTPMethod = "PUT" - DELETE EnumHTTPMethod = "DELETE" - OPTIONS EnumHTTPMethod = "OPTIONS" - PATCH EnumHTTPMethod = "PATCH" + httpGET string = "GET" + httpHEAD string = "HEAD" + httpPOST string = "POST" + httpPUT string = "PUT" + httpDELETE string = "DELETE" + httpOPTIONS string = "OPTIONS" + httpPATCH string = "PATCH" ) +// TConfig represents config data structure for testcase. +// Each testcase should contain one config part. type TConfig struct { - Name string `json:"name" yaml:"name"` + Name string `json:"name" yaml:"name"` // required Verify bool `json:"verify,omitempty" yaml:"verify,omitempty"` BaseURL string `json:"base_url,omitempty" yaml:"base_url,omitempty"` Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"` @@ -22,9 +22,11 @@ type TConfig struct { Weight int `json:"weight,omitempty" yaml:"weight,omitempty"` } -type TRequest struct { - Method EnumHTTPMethod `json:"method" yaml:"method"` - URL string `json:"url" yaml:"url"` +// Request represents HTTP request data structure. +// This is used for teststep. +type Request struct { + Method string `json:"method" yaml:"method"` // required + URL string `json:"url" yaml:"url"` // required Params map[string]interface{} `json:"params,omitempty" yaml:"params,omitempty"` Headers map[string]string `json:"headers,omitempty" yaml:"headers,omitempty"` Cookies map[string]string `json:"cookies,omitempty" yaml:"cookies,omitempty"` @@ -34,47 +36,52 @@ type TRequest struct { Verify bool `json:"verify,omitempty" yaml:"verify,omitempty"` } -type TValidator struct { - Check string `json:"check,omitempty" yaml:"check,omitempty"` // get value with jmespath - Assert string `json:"assert,omitempty" yaml:"assert,omitempty"` - Expect interface{} `json:"expect,omitempty" yaml:"expect,omitempty"` - Message string `json:"msg,omitempty" yaml:"msg,omitempty"` +// Validator represents validator for one HTTP response. +type Validator struct { + Check string `json:"check" yaml:"check"` // get value with jmespath + Assert string `json:"assert" yaml:"assert"` + Expect interface{} `json:"expect" yaml:"expect"` + Message string `json:"msg,omitempty" yaml:"msg,omitempty"` // optional } +// TStep represents teststep data structure. +// Each step maybe two different type: make one HTTP request or reference another testcase. type TStep struct { - Name string `json:"name" yaml:"name"` - Transaction string `json:"transaction,omitempty" yaml:"transaction,omitempty"` - Request *TRequest `json:"request,omitempty" yaml:"request,omitempty"` + Name string `json:"name" yaml:"name"` // required + Request *Request `json:"request,omitempty" yaml:"request,omitempty"` TestCase *TestCase `json:"testcase,omitempty" yaml:"testcase,omitempty"` Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"` SetupHooks []string `json:"setup_hooks,omitempty" yaml:"setup_hooks,omitempty"` TeardownHooks []string `json:"teardown_hooks,omitempty" yaml:"teardown_hooks,omitempty"` Extract map[string]string `json:"extract,omitempty" yaml:"extract,omitempty"` - Validators []TValidator `json:"validate,omitempty" yaml:"validate,omitempty"` + Validators []Validator `json:"validate,omitempty" yaml:"validate,omitempty"` Export []string `json:"export,omitempty" yaml:"export,omitempty"` } -// used for testcase json loading and dumping +// TCase represents testcase data structure. +// Each testcase includes one public config and several sequential teststeps. type TCase struct { - Config TConfig `json:"config" yaml:"config"` + Config *TConfig `json:"config" yaml:"config"` TestSteps []*TStep `json:"teststeps" yaml:"teststeps"` } -// interface for all types of steps +// IStep represents interface for all types for teststeps type IStep interface { - Name() string - Type() string - ToStruct() *TStep + name() string + getType() string + toStruct() *TStep } +// ITestCase represents interface for all types for testcases type ITestCase interface { ToTestCase() (*TestCase, error) ToTCase() (*TCase, error) } +// TestCase is a container for one testcase. // used for testcase runner type TestCase struct { - Config TConfig + Config *TConfig TestSteps []IStep } @@ -86,11 +93,11 @@ type TestCasePath struct { Path string } -type TestCaseSummary struct{} +type testCaseSummary struct{} -type StepData struct { - Name string // step name - Success bool // step execution result - ResponseLength int64 // response body length - ExportVars map[string]interface{} // extract variables +type stepData struct { + name string // step name + success bool // step execution result + responseLength int64 // response body length + exportVars map[string]interface{} // extract variables } diff --git a/response.go b/response.go index 80d0e5c..1fa9857 100644 --- a/response.go +++ b/response.go @@ -12,7 +12,7 @@ import ( "github.com/httprunner/hrp/internal/builtin" ) -func NewResponseObject(t *testing.T, resp *http.Response) (*ResponseObject, error) { +func newResponseObject(t *testing.T, resp *http.Response) (*responseObject, error) { // prepare response headers headers := make(map[string]string) for k, v := range resp.Header { @@ -58,7 +58,7 @@ func NewResponseObject(t *testing.T, resp *http.Response) (*ResponseObject, erro return nil, err } - return &ResponseObject{ + return &responseObject{ t: t, respObjMeta: data, }, nil @@ -71,13 +71,13 @@ type respObjMeta struct { Body interface{} `json:"body"` } -type ResponseObject struct { +type responseObject struct { t *testing.T respObjMeta interface{} validationResults map[string]interface{} } -func (v *ResponseObject) Extract(extractors map[string]string) map[string]interface{} { +func (v *responseObject) Extract(extractors map[string]string) map[string]interface{} { if extractors == nil { return nil } @@ -93,7 +93,7 @@ func (v *ResponseObject) Extract(extractors map[string]string) map[string]interf return extractMapping } -func (v *ResponseObject) Validate(validators []TValidator, variablesMapping map[string]interface{}) (err error) { +func (v *responseObject) Validate(validators []Validator, variablesMapping map[string]interface{}) (err error) { for _, validator := range validators { // parse check value checkItem := validator.Check @@ -133,7 +133,7 @@ func (v *ResponseObject) Validate(validators []TValidator, variablesMapping map[ return nil } -func (v *ResponseObject) searchJmespath(expr string) interface{} { +func (v *responseObject) searchJmespath(expr string) interface{} { checkValue, err := jmespath.Search(expr, v.respObjMeta) if err != nil { log.Error().Str("expr", expr).Err(err).Msg("search jmespath failed") diff --git a/runner.go b/runner.go index dfc2cf2..58eb6c2 100644 --- a/runner.go +++ b/runner.go @@ -20,17 +20,18 @@ import ( "github.com/httprunner/hrp/internal/ga" ) -// run API test with default configs +// Run starts to run API test with default configs. func Run(testcases ...ITestCase) error { t := &testing.T{} return NewRunner(t).SetDebug(true).Run(testcases...) } -func NewRunner(t *testing.T) *Runner { +// NewRunner constructs a new runner instance. +func NewRunner(t *testing.T) *runner { if t == nil { t = &testing.T{} } - return &Runner{ + return &runner{ t: t, debug: false, // default to turn off debug client: &http.Client{ @@ -43,20 +44,22 @@ func NewRunner(t *testing.T) *Runner { } } -type Runner struct { +type runner struct { t *testing.T debug bool client *http.Client sessionVariables map[string]interface{} } -func (r *Runner) SetDebug(debug bool) *Runner { +// SetDebug configures whether to log HTTP request and response content. +func (r *runner) SetDebug(debug bool) *runner { log.Info().Bool("debug", debug).Msg("[init] SetDebug") r.debug = debug return r } -func (r *Runner) SetProxyUrl(proxyUrl string) *Runner { +// SetProxyUrl configures the proxy URL, which is usually used to capture HTTP packets for debugging. +func (r *runner) SetProxyUrl(proxyUrl string) *runner { log.Info().Str("proxyUrl", proxyUrl).Msg("[init] SetProxyUrl") p, err := url.Parse(proxyUrl) if err != nil { @@ -70,7 +73,8 @@ func (r *Runner) SetProxyUrl(proxyUrl string) *Runner { return r } -func (r *Runner) Run(testcases ...ITestCase) error { +// Run starts to execute one or multiple testcases. +func (r *runner) Run(testcases ...ITestCase) error { event := ga.EventTracking{ Category: "RunAPITests", Action: "hrp run", @@ -94,8 +98,8 @@ func (r *Runner) Run(testcases ...ITestCase) error { return nil } -func (r *Runner) runCase(testcase *TestCase) error { - config := &testcase.Config +func (r *runner) runCase(testcase *TestCase) error { + config := testcase.Config if err := r.parseConfig(config); err != nil { return err } @@ -113,12 +117,12 @@ func (r *Runner) runCase(testcase *TestCase) error { return nil } -func (r *Runner) runStep(step IStep, config *TConfig) (stepData *StepData, err error) { - log.Info().Str("step", step.Name()).Msg("run step start") +func (r *runner) runStep(step IStep, config *TConfig) (stepResult *stepData, err error) { + log.Info().Str("step", step.name()).Msg("run step start") // copy step to avoid data racing copiedStep := &TStep{} - if err = copier.Copy(copiedStep, step.ToStruct()); err != nil { + if err = copier.Copy(copiedStep, step.toStruct()); err != nil { log.Error().Err(err).Msg("copy step data failed") return } @@ -142,7 +146,7 @@ func (r *Runner) runStep(step IStep, config *TConfig) (stepData *StepData, err e // run referenced testcase log.Info().Str("testcase", copiedStep.Name).Msg("run referenced testcase") // TODO: override testcase config - stepData, err = r.runStepTestCase(copiedStep) + stepResult, err = r.runStepTestCase(copiedStep) if err != nil { log.Error().Err(err).Msg("run referenced testcase step failed") return @@ -150,7 +154,7 @@ func (r *Runner) runStep(step IStep, config *TConfig) (stepData *StepData, err e } else { // run request copiedStep.Request.URL = buildURL(config.BaseURL, copiedStep.Request.URL) // avoid data racing - stepData, err = r.runStepRequest(copiedStep) + stepResult, err = r.runStepRequest(copiedStep) if err != nil { log.Error().Err(err).Msg("run request step failed") return @@ -158,23 +162,23 @@ func (r *Runner) runStep(step IStep, config *TConfig) (stepData *StepData, err e } // update extracted variables - for k, v := range stepData.ExportVars { + for k, v := range stepResult.exportVars { r.sessionVariables[k] = v } log.Info(). - Str("step", step.Name()). - Bool("success", stepData.Success). - Interface("exportVars", stepData.ExportVars). + Str("step", step.name()). + Bool("success", stepResult.success). + Interface("exportVars", stepResult.exportVars). Msg("run step end") return } -func (r *Runner) runStepRequest(step *TStep) (stepData *StepData, err error) { - stepData = &StepData{ - Name: step.Name, - Success: false, - ResponseLength: 0, +func (r *runner) runStepRequest(step *TStep) (stepResult *stepData, err error) { + stepResult = &stepData{ + name: step.Name, + success: false, + responseLength: 0, } rawUrl := step.Request.URL @@ -310,7 +314,7 @@ func (r *Runner) runStepRequest(step *TStep) (stepData *StepData, err error) { } // new response object - respObj, err := NewResponseObject(r.t, resp) + respObj, err := newResponseObject(r.t, resp) if err != nil { err = errors.Wrap(err, "init ResponseObject error") return @@ -319,7 +323,7 @@ func (r *Runner) runStepRequest(step *TStep) (stepData *StepData, err error) { // extract variables from response extractors := step.Extract extractMapping := respObj.Extract(extractors) - stepData.ExportVars = extractMapping + stepResult.exportVars = extractMapping // override step variables with extracted variables stepVariables := mergeVariables(step.Variables, extractMapping) @@ -330,22 +334,22 @@ func (r *Runner) runStepRequest(step *TStep) (stepData *StepData, err error) { return } - stepData.Success = true - stepData.ResponseLength = resp.ContentLength + stepResult.success = true + stepResult.responseLength = resp.ContentLength return } -func (r *Runner) runStepTestCase(step *TStep) (stepData *StepData, err error) { - stepData = &StepData{ - Name: step.Name, - Success: false, +func (r *runner) runStepTestCase(step *TStep) (stepResult *stepData, err error) { + stepResult = &stepData{ + name: step.Name, + success: false, } testcase := step.TestCase err = r.runCase(testcase) return } -func (r *Runner) parseConfig(config *TConfig) error { +func (r *runner) parseConfig(config *TConfig) error { // parse config variables parsedVariables, err := parseVariables(config.Variables) if err != nil { @@ -371,8 +375,8 @@ func (r *Runner) parseConfig(config *TConfig) error { return nil } -func (r *Runner) GetSummary() *TestCaseSummary { - return &TestCaseSummary{} +func (r *runner) getSummary() *testCaseSummary { + return &testCaseSummary{} } func setBodyBytes(req *http.Request, data []byte) { diff --git a/runner_test.go b/runner_test.go index 72476dd..686d67e 100644 --- a/runner_test.go +++ b/runner_test.go @@ -6,29 +6,24 @@ import ( func TestHttpRunner(t *testing.T) { testcase1 := &TestCase{ - Config: TConfig{ - Name: "TestCase1", - BaseURL: "http://httpbin.org", - }, + Config: NewConfig("TestCase1"). + SetBaseURL("http://httpbin.org"), TestSteps: []IStep{ - Step("headers"). + NewStep("headers"). GET("/headers"). Validate(). AssertEqual("status_code", 200, "check status code"). AssertEqual("headers.\"Content-Type\"", "application/json", "check http response Content-Type"), - Step("user-agent"). + NewStep("user-agent"). GET("/user-agent"). Validate(). AssertEqual("status_code", 200, "check status code"). AssertEqual("headers.\"Content-Type\"", "application/json", "check http response Content-Type"), - Step("TestCase3").CallRefCase(&TestCase{Config: TConfig{Name: "TestCase3"}}), + NewStep("TestCase3").CallRefCase(&TestCase{Config: NewConfig("TestCase3")}), }, } testcase2 := &TestCase{ - Config: TConfig{ - Name: "TestCase2", - Weight: 3, - }, + Config: NewConfig("TestCase2").SetWeight(3), } testcase3 := &TestCasePath{demoTestCaseJSONPath} diff --git a/step.go b/step.go index 3508ca1..d0a6e54 100644 --- a/step.go +++ b/step.go @@ -2,104 +2,152 @@ package hrp import "fmt" -func Step(name string) *step { - return &step{ - TStep: &TStep{ - Name: name, - Variables: make(map[string]interface{}), - }, +// NewConfig returns a new constructed testcase config with specified testcase name. +func NewConfig(name string) *TConfig { + return &TConfig{ + Name: name, + Variables: make(map[string]interface{}), } } -type step struct { - *TStep +// WithVariables sets variables for current testcase. +func (c *TConfig) WithVariables(variables map[string]interface{}) *TConfig { + c.Variables = variables + return c } -func (s *step) WithVariables(variables map[string]interface{}) *step { - s.TStep.Variables = variables +// SetBaseURL sets base URL for current testcase. +func (c *TConfig) SetBaseURL(baseURL string) *TConfig { + c.BaseURL = baseURL + return c +} + +// SetVerifySSL sets whether to verify SSL for current testcase. +func (c *TConfig) SetVerifySSL(verify bool) *TConfig { + c.Verify = verify + return c +} + +// WithParameters sets parameters for current testcase. +func (c *TConfig) WithParameters(parameters map[string]interface{}) *TConfig { + c.Parameters = parameters + return c +} + +// ExportVars specifies variable names to export for current testcase. +func (c *TConfig) ExportVars(vars ...string) *TConfig { + c.Export = vars + return c +} + +// SetWeight sets weight for current testcase, which is used in load testing. +func (c *TConfig) SetWeight(weight int) *TConfig { + c.Weight = weight + return c +} + +// NewStep returns a new constructed teststep with specified step name. +func NewStep(name string) *TStep { + return &TStep{ + Name: name, + Variables: make(map[string]interface{}), + } +} + +// WithVariables sets variables for current teststep. +func (s *TStep) WithVariables(variables map[string]interface{}) *TStep { + s.Variables = variables return s } -func (s *step) SetupHook(hook string) *step { - s.TStep.SetupHooks = append(s.TStep.SetupHooks, hook) +// SetupHook adds a setup hook for current teststep. +func (s *TStep) SetupHook(hook string) *TStep { + s.SetupHooks = append(s.SetupHooks, hook) return s } -func (s *step) GET(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: GET, +// GET makes a HTTP GET request. +func (s *TStep) GET(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpGET, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -func (s *step) HEAD(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: HEAD, +// HEAD makes a HTTP HEAD request. +func (s *TStep) HEAD(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpHEAD, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -func (s *step) POST(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: POST, +// POST makes a HTTP POST request. +func (s *TStep) POST(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpPOST, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -func (s *step) PUT(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: PUT, +// PUT makes a HTTP PUT request. +func (s *TStep) PUT(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpPUT, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -func (s *step) DELETE(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: DELETE, +// DELETE makes a HTTP DELETE request. +func (s *TStep) DELETE(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpDELETE, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -func (s *step) OPTIONS(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: OPTIONS, +// OPTIONS makes a HTTP OPTIONS request. +func (s *TStep) OPTIONS(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpOPTIONS, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -func (s *step) PATCH(url string) *requestWithOptionalArgs { - s.TStep.Request = &TRequest{ - Method: PATCH, +// PATCH makes a HTTP PATCH request. +func (s *TStep) PATCH(url string) *requestWithOptionalArgs { + s.Request = &Request{ + Method: httpPATCH, URL: url, } return &requestWithOptionalArgs{ - step: s.TStep, + step: s, } } -// call referenced testcase -func (s *step) CallRefCase(tc *TestCase) *testcaseWithOptionalArgs { - s.TStep.TestCase = tc +// CallRefCase calls a referenced testcase. +func (s *TStep) CallRefCase(tc *TestCase) *testcaseWithOptionalArgs { + s.TestCase = tc return &testcaseWithOptionalArgs{ - step: s.TStep, + step: s, } } @@ -108,62 +156,74 @@ type requestWithOptionalArgs struct { step *TStep } +// SetVerify sets whether to verify SSL for current HTTP request. func (s *requestWithOptionalArgs) SetVerify(verify bool) *requestWithOptionalArgs { s.step.Request.Verify = verify return s } +// SetTimeout sets timeout for current HTTP request. func (s *requestWithOptionalArgs) SetTimeout(timeout float32) *requestWithOptionalArgs { s.step.Request.Timeout = timeout return s } +// SetProxies sets proxies for current HTTP request. func (s *requestWithOptionalArgs) SetProxies(proxies map[string]string) *requestWithOptionalArgs { // TODO return s } +// SetAllowRedirects sets whether to allow redirects for current HTTP request. func (s *requestWithOptionalArgs) SetAllowRedirects(allowRedirects bool) *requestWithOptionalArgs { s.step.Request.AllowRedirects = allowRedirects return s } +// SetAuth sets auth for current HTTP request. func (s *requestWithOptionalArgs) SetAuth(auth map[string]string) *requestWithOptionalArgs { // TODO return s } +// WithParams sets HTTP request params for current step. func (s *requestWithOptionalArgs) WithParams(params map[string]interface{}) *requestWithOptionalArgs { s.step.Request.Params = params return s } +// WithHeaders sets HTTP request headers for current step. func (s *requestWithOptionalArgs) WithHeaders(headers map[string]string) *requestWithOptionalArgs { s.step.Request.Headers = headers return s } +// WithCookies sets HTTP request cookies for current step. func (s *requestWithOptionalArgs) WithCookies(cookies map[string]string) *requestWithOptionalArgs { s.step.Request.Cookies = cookies return s } +// WithBody sets HTTP request body for current step. func (s *requestWithOptionalArgs) WithBody(body interface{}) *requestWithOptionalArgs { s.step.Request.Body = body return s } +// TeardownHook adds a teardown hook for current teststep. func (s *requestWithOptionalArgs) TeardownHook(hook string) *requestWithOptionalArgs { s.step.TeardownHooks = append(s.step.TeardownHooks, hook) return s } +// Validate switches to step validation. func (s *requestWithOptionalArgs) Validate() *stepRequestValidation { return &stepRequestValidation{ step: s.step, } } +// Extract switches to step extraction. func (s *requestWithOptionalArgs) Extract() *stepRequestExtraction { s.step.Extract = make(map[string]string) return &stepRequestExtraction{ @@ -171,18 +231,18 @@ func (s *requestWithOptionalArgs) Extract() *stepRequestExtraction { } } -func (s *requestWithOptionalArgs) Name() string { +func (s *requestWithOptionalArgs) name() string { if s.step.Name != "" { return s.step.Name } return fmt.Sprintf("%s %s", s.step.Request.Method, s.step.Request.URL) } -func (s *requestWithOptionalArgs) Type() string { +func (s *requestWithOptionalArgs) getType() string { return fmt.Sprintf("request-%v", s.step.Request.Method) } -func (s *requestWithOptionalArgs) ToStruct() *TStep { +func (s *requestWithOptionalArgs) toStruct() *TStep { return s.step } @@ -191,27 +251,29 @@ type testcaseWithOptionalArgs struct { step *TStep } +// TeardownHook adds a teardown hook for current teststep. func (s *testcaseWithOptionalArgs) TeardownHook(hook string) *testcaseWithOptionalArgs { s.step.TeardownHooks = append(s.step.TeardownHooks, hook) return s } +// Export specifies variable names to export from referenced testcase for current step. func (s *testcaseWithOptionalArgs) Export(names ...string) *testcaseWithOptionalArgs { s.step.Export = append(s.step.Export, names...) return s } -func (s *testcaseWithOptionalArgs) Name() string { +func (s *testcaseWithOptionalArgs) name() string { if s.step.Name != "" { return s.step.Name } return s.step.TestCase.Config.Name } -func (s *testcaseWithOptionalArgs) Type() string { +func (s *testcaseWithOptionalArgs) getType() string { return "testcase" } -func (s *testcaseWithOptionalArgs) ToStruct() *TStep { +func (s *testcaseWithOptionalArgs) toStruct() *TStep { return s.step } diff --git a/step_test.go b/step_test.go index 1f2e56e..38a91ab 100644 --- a/step_test.go +++ b/step_test.go @@ -5,7 +5,7 @@ import ( ) var ( - stepGET = Step("get with params"). + stepGET = NewStep("get with params"). GET("/get"). WithParams(map[string]interface{}{"foo1": "bar1", "foo2": "bar2"}). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). @@ -16,7 +16,7 @@ var ( AssertEqual("headers.\"Content-Type\"", "application/json; charset=utf-8", "check header Content-Type"). AssertEqual("body.args.foo1", "bar1", "check param foo1"). AssertEqual("body.args.foo2", "bar2", "check param foo2") - stepPOSTData = Step("post form data"). + stepPOSTData = NewStep("post form data"). POST("/post"). WithParams(map[string]interface{}{"foo1": "bar1", "foo2": "bar2"}). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus", "Content-Type": "application/x-www-form-urlencoded"}). @@ -28,7 +28,7 @@ var ( func TestRunRequestGetToStruct(t *testing.T) { tStep := stepGET.step - if tStep.Request.Method != GET { + if tStep.Request.Method != httpGET { t.Fatalf("tStep.Request.Method != GET") } if tStep.Request.URL != "/get" { @@ -50,7 +50,7 @@ func TestRunRequestGetToStruct(t *testing.T) { func TestRunRequestPostDataToStruct(t *testing.T) { tStep := stepPOSTData.step - if tStep.Request.Method != POST { + if tStep.Request.Method != httpPOST { t.Fatalf("tStep.Request.Method != POST") } if tStep.Request.URL != "/post" { @@ -74,9 +74,7 @@ func TestRunRequestPostDataToStruct(t *testing.T) { } func TestRunRequestRun(t *testing.T) { - config := &TConfig{ - BaseURL: "https://postman-echo.com", - } + config := NewConfig("test").SetBaseURL("https://postman-echo.com") runner := NewRunner(t).SetDebug(true) if _, err := runner.runStep(stepGET, config); err != nil { t.Fatalf("tStep.Run() error: %s", err) diff --git a/validate.go b/validate.go index f4975ca..5ae23cb 100644 --- a/validate.go +++ b/validate.go @@ -9,61 +9,61 @@ type stepRequestValidation struct { step *TStep } -func (s *stepRequestValidation) Name() string { +func (s *stepRequestValidation) name() string { if s.step.Name != "" { return s.step.Name } return fmt.Sprintf("%s %s", s.step.Request.Method, s.step.Request.URL) } -func (s *stepRequestValidation) Type() string { +func (s *stepRequestValidation) getType() string { return fmt.Sprintf("request-%v", s.step.Request.Method) } -func (s *stepRequestValidation) ToStruct() *TStep { +func (s *stepRequestValidation) toStruct() *TStep { return s.step } func (s *stepRequestValidation) AssertEqual(jmesPath string, expected interface{}, msg string) *stepRequestValidation { - validator := TValidator{ + v := Validator{ Check: jmesPath, Assert: "equals", Expect: expected, Message: msg, } - s.step.Validators = append(s.step.Validators, validator) + s.step.Validators = append(s.step.Validators, v) return s } func (s *stepRequestValidation) AssertStartsWith(jmesPath string, expected interface{}, msg string) *stepRequestValidation { - validator := TValidator{ + v := Validator{ Check: jmesPath, Assert: "startswith", Expect: expected, Message: msg, } - s.step.Validators = append(s.step.Validators, validator) + s.step.Validators = append(s.step.Validators, v) return s } func (s *stepRequestValidation) AssertEndsWith(jmesPath string, expected interface{}, msg string) *stepRequestValidation { - validator := TValidator{ + v := Validator{ Check: jmesPath, Assert: "endswith", Expect: expected, Message: msg, } - s.step.Validators = append(s.step.Validators, validator) + s.step.Validators = append(s.step.Validators, v) return s } func (s *stepRequestValidation) AssertLengthEqual(jmesPath string, expected interface{}, msg string) *stepRequestValidation { - validator := TValidator{ + v := Validator{ Check: jmesPath, Assert: "length_equals", Expect: expected, Message: msg, } - s.step.Validators = append(s.step.Validators, validator) + s.step.Validators = append(s.step.Validators, v) return s }