From d1fa8ffbd445642859e67e4e176d2a8f4bcdbd0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Thu, 23 Dec 2021 21:29:01 +0800 Subject: [PATCH 01/42] feat: data-driven. --- parser.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/parser.go b/parser.go index 9bc0df8a..5e1dc018 100644 --- a/parser.go +++ b/parser.go @@ -492,3 +492,21 @@ func findallVariables(raw string) variableSet { return varSet } + +//func parseParameters(parameters map[string]interface{}) []map[string]interface{} { +// for k, v := range parameters { +// parameter_name_list := strings.Split(k, "-") +// rawValue := reflect.ValueOf(v) +// switch rawValue.Kind() { +// case reflect.String: +// var varList []map[string]interface{} +// +// case reflect.Slice: +// for i := 0; i < rawValue.Len(); i++ { +// rawValue.Index(i).Interface() +// } +// default: +// panic(fmt.Sprintf("parameter content should be List or Text(variables or functions call), got %v", v)) +// } +// } +//} From f43450fa6e01ead9cf1eb4396cbbba1de2b45034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Mon, 27 Dec 2021 15:31:49 +0800 Subject: [PATCH 02/42] feat: data-driven. --- convert.go | 32 ++++++++++++ examples/demo.yaml | 7 +++ parser.go | 126 +++++++++++++++++++++++++++++++++++++-------- runner.go | 26 ++++++---- 4 files changed, 160 insertions(+), 31 deletions(-) diff --git a/convert.go b/convert.go index 7f1bc830..f7579334 100644 --- a/convert.go +++ b/convert.go @@ -2,10 +2,12 @@ package hrp import ( "bytes" + "encoding/csv" "encoding/json" "fmt" "io/ioutil" "path/filepath" + "strings" "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" @@ -94,6 +96,36 @@ func loadFromYAML(path string) (*TCase, error) { return tc, err } +func loadFromCSV(path string) []map[string]string { + path, err := filepath.Abs(path) + if err != nil { + log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") + return nil + } + log.Info().Str("path", path).Msg("load csv file") + + file, err := ioutil.ReadFile(path) + if err != nil { + log.Error().Err(err).Msg("load csv file failed") + return nil + } + r := csv.NewReader(strings.NewReader(string(file))) + content, err := r.ReadAll() + if err != nil { + log.Error().Err(err).Msg("parse csv file failed") + return nil + } + var result []map[string]string + for i := 1; i < len(content); i++ { + row := make(map[string]string) + for j := 0; j < len(content[i]); j++ { + row[content[0][j]] = content[i][j] + } + result = append(result, row) + } + return result +} + func (tc *TCase) ToTestCase() (*TestCase, error) { testCase := &TestCase{ Config: &Config{cfg: tc.Config}, diff --git a/examples/demo.yaml b/examples/demo.yaml index a0cee432..e0f70360 100644 --- a/examples/demo.yaml +++ b/examples/demo.yaml @@ -7,6 +7,11 @@ config: "n": 5 varFoo1: ${gen_random_string($n)} varFoo2: ${max($a, $b)} + parameters: + username-password: ${parameterize(examples/account.csv)} + user_agent: ["iOS/10.1", "iOS/10.2"] + parameters_setting: + strategy: random teststeps: - name: transaction 1 start transaction: @@ -19,6 +24,8 @@ teststeps: params: foo1: $varFoo1 foo2: $varFoo2 + foo3: $username + foo4: $password headers: User-Agent: HttpRunnerPlus variables: diff --git a/parser.go b/parser.go index e6ecc85e..10ec4a59 100644 --- a/parser.go +++ b/parser.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/maja42/goval" + "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/httprunner/hrp/internal/builtin" @@ -247,15 +248,35 @@ func mergeVariables(variables, overriddenVariables map[string]interface{}) map[s return mergedVariables } -// callFunc call function with arguments -// only support return at most one result value -func callFunc(funcName string, arguments ...interface{}) (interface{}, error) { - function, ok := builtin.Functions[funcName] - if !ok { +func contains(s []string, e string) bool { + for _, a := range s { + if strings.EqualFold(a, e) { + return true + } + } + return false +} + +func getMappingFunction(funcName string) (interface{}, error) { + if function, ok := builtin.Functions[funcName]; ok { + // function is builtin + return function, nil + } else if contains([]string{"parameterize", "P"}, funcName) { + // parameterize function + return loadFromCSV, nil + } else { // function not found return nil, fmt.Errorf("function %s is not found", funcName) } +} +// callFunc call function with arguments +// only support return at most one result value +func callFunc(funcName string, arguments ...interface{}) (interface{}, error) { + function, err := getMappingFunction(funcName) + if err != nil { + return nil, err + } funcValue := reflect.ValueOf(function) if funcValue.Kind() != reflect.Func { // function not valid @@ -494,20 +515,81 @@ func findallVariables(raw string) variableSet { return varSet } -//func parseParameters(parameters map[string]interface{}) []map[string]interface{} { -// for k, v := range parameters { -// parameter_name_list := strings.Split(k, "-") -// rawValue := reflect.ValueOf(v) -// switch rawValue.Kind() { -// case reflect.String: -// var varList []map[string]interface{} -// -// case reflect.Slice: -// for i := 0; i < rawValue.Len(); i++ { -// rawValue.Index(i).Interface() -// } -// default: -// panic(fmt.Sprintf("parameter content should be List or Text(variables or functions call), got %v", v)) -// } -// } -//} +func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { + var cartesianProduct []map[string]interface{} + for i := 0; i < len(params)-1; i++ { + for _, param1 := range params[i] { + for _, param2 := range params[i+1] { + cartesianProduct = append(cartesianProduct, mergeVariables(param1, param2)) + } + } + } + return cartesianProduct +} + +func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) { + var parsedParametersList [][]map[string]interface{} + for k, v := range parameters { + parameterNameList := strings.Split(k, "-") + var parameterList []map[string]interface{} + rawValue := reflect.ValueOf(v) + switch rawValue.Kind() { + case reflect.String: + parsedParameterContent, err := parseData(rawValue.Interface(), variablesMapping) + if err != nil { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parse parameter error") + return nil, err + } + parsedParameterRawValue := reflect.ValueOf(parsedParameterContent) + if parsedParameterRawValue.Kind() != reflect.Slice { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") + return nil, errors.New("parameter content should be List or Text(variables or functions call)") + } + for i := 0; i < parsedParameterRawValue.Len(); i++ { + parameterMap := make(map[string]interface{}) + if parsedParameterRawValue.Index(i).Kind() == reflect.Map { + for _, key := range parameterNameList { + parameterMap[key] = parsedParameterRawValue.Index(i).MapIndex(reflect.ValueOf(key)).Interface() + } + } else if parsedParameterRawValue.Index(i).Kind() == reflect.Slice { + if len(parameterNameList) != parsedParameterRawValue.Index(i).Len() { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name list and parameter content list should have the same length") + return nil, errors.New("parameter name list and parameter content list should have the same length") + } + for i := 0; i < parsedParameterRawValue.Index(i).Len(); i++ { + parameterMap[parameterNameList[i]] = parsedParameterRawValue.Index(i).Index(i).Interface() + } + } else if len(parameterNameList) == 1 { + parameterMap[parameterNameList[0]] = parsedParameterRawValue.Index(i).Interface() + } else { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") + return nil, errors.New("parameter content should be List or Text(variables or functions call)") + } + parameterList = append(parameterList, parameterMap) + } + case reflect.Slice: + for i := 0; i < rawValue.Len(); i++ { + parameterMap := make(map[string]interface{}) + if rawValue.Index(i).Kind() == reflect.Interface || rawValue.Index(i).Kind() == reflect.String { + parameterMap[parameterNameList[0]] = rawValue.Index(i).Interface() + } else if rawValue.Index(i).Kind() == reflect.Slice { + if len(parameterNameList) != rawValue.Index(i).Len() { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name list and parameter content list should have the same length") + return nil, errors.New("parameter name list and parameter content list should have the same length") + } + for i := 0; i < rawValue.Index(i).Len(); i++ { + parameterMap[parameterNameList[i]] = rawValue.Index(i).Index(i).Interface() + } + } else { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") + return nil, errors.New("parameter content should be List or Text(variables or functions call)") + } + parameterList = append(parameterList, parameterMap) + } + default: + panic(fmt.Sprintf("parameter content should be List or Text(variables or functions call), got %v", v)) + } + parsedParametersList = append(parsedParametersList, parameterList) + } + return genCartesianProduct(parsedParametersList), nil +} diff --git a/runner.go b/runner.go index 9f89495a..b54dc9ba 100644 --- a/runner.go +++ b/runner.go @@ -130,15 +130,24 @@ func (r *hrpRunner) runCase(testcase *TestCase) error { } log.Info().Str("testcase", config.Name()).Msg("run testcase start") - r.startTime = time.Now() - for _, step := range testcase.TestSteps { - _, err := r.runStep(step, config) - if err != nil { - if r.failfast { - log.Error().Err(err).Msg("abort running due to failfast setting") - return err + // parse config parameters + parsedParams, err := parseParameters(config.ToStruct().Parameters, config.ToStruct().Variables) + if err != nil { + log.Error().Interface("params", config.ToStruct().Parameters).Err(err).Msg("parse config parameters failed") + return err + } + for _, parameter := range parsedParams { + config.ToStruct().Variables = mergeVariables(parameter, config.ToStruct().Variables) + r.startTime = time.Now() + for _, step := range testcase.TestSteps { + _, err := r.runStep(step, config) + if err != nil { + if r.failfast { + log.Error().Err(err).Msg("abort running due to failfast setting") + return err + } + log.Warn().Err(err).Msg("run step failed, continue next step") } - log.Warn().Err(err).Msg("run step failed, continue next step") } } @@ -465,7 +474,6 @@ func (r *hrpRunner) parseConfig(config IConfig) error { return err } cfg.Variables = parsedVariables - // parse config name parsedName, err := parseString(cfg.Name, cfg.Variables) if err != nil { From 09ff0cd9185def7ff8b1b897d343eaf7b785034e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Mon, 27 Dec 2021 22:03:16 +0800 Subject: [PATCH 03/42] feat: data-driven. --- boomer.go | 9 +++++++-- models.go | 15 ++++++++------- parser.go | 32 ++++++++++++++++++++++++++++++-- runner.go | 13 ++++--------- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/boomer.go b/boomer.go index fb8b5d71..c70bb005 100644 --- a/boomer.go +++ b/boomer.go @@ -45,8 +45,13 @@ func (b *hrpBoomer) Run(testcases ...ITestCase) { if err != nil { panic(err) } - task := b.convertBoomerTask(testcase) - taskSlice = append(taskSlice, task) + cfg := testcase.Config.ToStruct() + parameters := getParameters(testcase.Config) + for _, parameter := range parameters { + cfg.Variables = mergeVariables(parameter, cfg.Variables) + task := b.convertBoomerTask(testcase) + taskSlice = append(taskSlice, task) + } } b.Boomer.Run(taskSlice...) } diff --git a/models.go b/models.go index cbaf4b4e..703623fc 100644 --- a/models.go +++ b/models.go @@ -13,13 +13,14 @@ const ( // TConfig represents config data structure for testcase. // Each testcase should contain one config part. type TConfig struct { - 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"` - Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"` - Export []string `json:"export,omitempty" yaml:"export,omitempty"` - Weight int `json:"weight,omitempty" yaml:"weight,omitempty"` + 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"` + Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"` + ParametersSetting map[string]interface{} `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"` + Export []string `json:"export,omitempty" yaml:"export,omitempty"` + Weight int `json:"weight,omitempty" yaml:"weight,omitempty"` } // Request represents HTTP request data structure. diff --git a/parser.go b/parser.go index 10ec4a59..7fe8e410 100644 --- a/parser.go +++ b/parser.go @@ -3,10 +3,12 @@ package hrp import ( "encoding/json" "fmt" + "math/rand" "net/url" "reflect" "regexp" "strings" + "time" "github.com/maja42/goval" "github.com/pkg/errors" @@ -515,18 +517,44 @@ func findallVariables(raw string) variableSet { return varSet } +func shuffleCartesianProduct(slice []map[string]interface{}) { + r := rand.New(rand.NewSource(time.Now().Unix())) + for len(slice) > 0 { + n := len(slice) + randIndex := r.Intn(n) + slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1] + slice = slice[:n-1] + } +} + func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { var cartesianProduct []map[string]interface{} + cartesianProduct = params[0] for i := 0; i < len(params)-1; i++ { - for _, param1 := range params[i] { + var tempProduct []map[string]interface{} + for _, param1 := range cartesianProduct { for _, param2 := range params[i+1] { - cartesianProduct = append(cartesianProduct, mergeVariables(param1, param2)) + tempProduct = append(tempProduct, mergeVariables(param1, param2)) } } + cartesianProduct = tempProduct } return cartesianProduct } +func getParameters(config IConfig) []map[string]interface{} { + cfg := config.ToStruct() + // parse config parameters + parsedParams, err := parseParameters(cfg.Parameters, cfg.Variables) + if err != nil { + log.Error().Interface("params", cfg.Parameters).Err(err).Msg("parse config parameters failed") + } + if cfg.ParametersSetting["strategy"] != nil && strings.ToLower(cfg.ParametersSetting["strategy"].(string)) == "random" { + shuffleCartesianProduct(parsedParams) + } + return parsedParams +} + func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) { var parsedParametersList [][]map[string]interface{} for k, v := range parameters { diff --git a/runner.go b/runner.go index 24d77ef6..18dff670 100644 --- a/runner.go +++ b/runner.go @@ -128,16 +128,11 @@ func (r *hrpRunner) runCase(testcase *TestCase) error { if err := r.parseConfig(config); err != nil { return err } - + cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") - // parse config parameters - parsedParams, err := parseParameters(config.ToStruct().Parameters, config.ToStruct().Variables) - if err != nil { - log.Error().Interface("params", config.ToStruct().Parameters).Err(err).Msg("parse config parameters failed") - return err - } - for _, parameter := range parsedParams { - config.ToStruct().Variables = mergeVariables(parameter, config.ToStruct().Variables) + parameters := getParameters(config) + for _, parameter := range parameters { + cfg.Variables = mergeVariables(parameter, cfg.Variables) r.startTime = time.Now() for _, step := range testcase.TestSteps { _, err := r.runStep(step, config) From 2f5afb5ffcf7bc8636ab361dd65d1c3f3e3db875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Mon, 27 Dec 2021 22:20:29 +0800 Subject: [PATCH 04/42] feat: data-driven. --- parser.go | 46 +++++----------------------------------------- utils.go | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 utils.go diff --git a/parser.go b/parser.go index 7fe8e410..eed50964 100644 --- a/parser.go +++ b/parser.go @@ -3,16 +3,13 @@ package hrp import ( "encoding/json" "fmt" - "math/rand" + "github.com/maja42/goval" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" "net/url" "reflect" "regexp" "strings" - "time" - - "github.com/maja42/goval" - "github.com/pkg/errors" - "github.com/rs/zerolog/log" "github.com/httprunner/hrp/internal/builtin" ) @@ -250,15 +247,6 @@ func mergeVariables(variables, overriddenVariables map[string]interface{}) map[s return mergedVariables } -func contains(s []string, e string) bool { - for _, a := range s { - if strings.EqualFold(a, e) { - return true - } - } - return false -} - func getMappingFunction(funcName string) (interface{}, error) { if function, ok := builtin.Functions[funcName]; ok { // function is builtin @@ -517,31 +505,6 @@ func findallVariables(raw string) variableSet { return varSet } -func shuffleCartesianProduct(slice []map[string]interface{}) { - r := rand.New(rand.NewSource(time.Now().Unix())) - for len(slice) > 0 { - n := len(slice) - randIndex := r.Intn(n) - slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1] - slice = slice[:n-1] - } -} - -func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { - var cartesianProduct []map[string]interface{} - cartesianProduct = params[0] - for i := 0; i < len(params)-1; i++ { - var tempProduct []map[string]interface{} - for _, param1 := range cartesianProduct { - for _, param2 := range params[i+1] { - tempProduct = append(tempProduct, mergeVariables(param1, param2)) - } - } - cartesianProduct = tempProduct - } - return cartesianProduct -} - func getParameters(config IConfig) []map[string]interface{} { cfg := config.ToStruct() // parse config parameters @@ -615,7 +578,8 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str parameterList = append(parameterList, parameterMap) } default: - panic(fmt.Sprintf("parameter content should be List or Text(variables or functions call), got %v", v)) + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") + return nil, errors.New("parameter content should be List or Text(variables or functions call)") } parsedParametersList = append(parsedParametersList, parameterList) } diff --git a/utils.go b/utils.go new file mode 100644 index 00000000..455e0ff7 --- /dev/null +++ b/utils.go @@ -0,0 +1,41 @@ +package hrp + +import ( + "math/rand" + "strings" + "time" +) + +func contains(s []string, e string) bool { + for _, a := range s { + if strings.EqualFold(a, e) { + return true + } + } + return false +} + +func shuffleCartesianProduct(slice []map[string]interface{}) { + r := rand.New(rand.NewSource(time.Now().Unix())) + for len(slice) > 0 { + n := len(slice) + randIndex := r.Intn(n) + slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1] + slice = slice[:n-1] + } +} + +func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { + var cartesianProduct []map[string]interface{} + cartesianProduct = params[0] + for i := 0; i < len(params)-1; i++ { + var tempProduct []map[string]interface{} + for _, param1 := range cartesianProduct { + for _, param2 := range params[i+1] { + tempProduct = append(tempProduct, mergeVariables(param1, param2)) + } + } + cartesianProduct = tempProduct + } + return cartesianProduct +} From 43deb78b26b42f94ec5cc37f2a72349ac15ed464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 28 Dec 2021 18:16:02 +0800 Subject: [PATCH 05/42] feat: data-driven. --- boomer.go | 3 + convert.go | 6 +- examples/account.csv | 4 + examples/demo.yaml | 7 -- examples/parameters_test.json | 57 ++++++++++++++ examples/parameters_test.yaml | 38 +++++++++ internal/builtin/function.go | 5 ++ parser.go | 141 ++++++++++++++++++++++++---------- parser_test.go | 53 +++++++++++++ runner.go | 3 + utils.go | 41 ---------- 11 files changed, 268 insertions(+), 90 deletions(-) create mode 100644 examples/account.csv create mode 100644 examples/parameters_test.json create mode 100644 examples/parameters_test.yaml delete mode 100644 utils.go diff --git a/boomer.go b/boomer.go index c70bb005..62b8933e 100644 --- a/boomer.go +++ b/boomer.go @@ -47,6 +47,9 @@ func (b *hrpBoomer) Run(testcases ...ITestCase) { } cfg := testcase.Config.ToStruct() parameters := getParameters(testcase.Config) + if parameters == nil { + parameters = []map[string]interface{}{{}} + } for _, parameter := range parameters { cfg.Variables = mergeVariables(parameter, cfg.Variables) task := b.convertBoomerTask(testcase) diff --git a/convert.go b/convert.go index f7579334..ba3b8d15 100644 --- a/convert.go +++ b/convert.go @@ -100,20 +100,20 @@ func loadFromCSV(path string) []map[string]string { path, err := filepath.Abs(path) if err != nil { log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") - return nil + panic(err) } log.Info().Str("path", path).Msg("load csv file") file, err := ioutil.ReadFile(path) if err != nil { log.Error().Err(err).Msg("load csv file failed") - return nil + panic(err) } r := csv.NewReader(strings.NewReader(string(file))) content, err := r.ReadAll() if err != nil { log.Error().Err(err).Msg("parse csv file failed") - return nil + panic(err) } var result []map[string]string for i := 1; i < len(content); i++ { diff --git a/examples/account.csv b/examples/account.csv new file mode 100644 index 00000000..67ce22c6 --- /dev/null +++ b/examples/account.csv @@ -0,0 +1,4 @@ +username,password +test1,111111 +test2,222222 +test3,333333 \ No newline at end of file diff --git a/examples/demo.yaml b/examples/demo.yaml index e0f70360..a0cee432 100644 --- a/examples/demo.yaml +++ b/examples/demo.yaml @@ -7,11 +7,6 @@ config: "n": 5 varFoo1: ${gen_random_string($n)} varFoo2: ${max($a, $b)} - parameters: - username-password: ${parameterize(examples/account.csv)} - user_agent: ["iOS/10.1", "iOS/10.2"] - parameters_setting: - strategy: random teststeps: - name: transaction 1 start transaction: @@ -24,8 +19,6 @@ teststeps: params: foo1: $varFoo1 foo2: $varFoo2 - foo3: $username - foo4: $password headers: User-Agent: HttpRunnerPlus variables: diff --git a/examples/parameters_test.json b/examples/parameters_test.json new file mode 100644 index 00000000..6ad52032 --- /dev/null +++ b/examples/parameters_test.json @@ -0,0 +1,57 @@ +{ + "config": { + "name": "request methods testcase: validate with parameters", + "parameters": { + "user_agent": [ + "iOS/10.1", + "iOS/10.2" + ], + "username-password": "${parameterize(examples/account.csv)}", + "app_version": "${getAppVersion()}" + }, + "parameters_setting": { + "strategy": "random" + }, + "variables": { + "app_version": "f1" + }, + "base_url": "https://postman-echo.com", + "verify": false + }, + "teststeps": [ + { + "name": "get with params", + "variables": { + "foo1": "$username", + "foo2": "$password", + "foo3": "$app_version" + }, + "request": { + "method": "GET", + "url": "/get", + "params": { + "foo1": "$foo1", + "foo2": "$foo2", + "foo3": "$foo3" + }, + "headers": { + "User-Agent": "$user_agent,$app_version" + } + }, + "validate": [ + { + "check": "status_code", + "assert": "equals", + "expect": 200, + "msg": "check status code" + }, + { + "check": "body.args.foo3", + "assert": "not_equal", + "expect": "f1", + "msg": "check app version" + } + ] + } + ] +} \ No newline at end of file diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml new file mode 100644 index 00000000..7afb4252 --- /dev/null +++ b/examples/parameters_test.yaml @@ -0,0 +1,38 @@ +config: + name: "request methods testcase: validate with parameters" + parameters: + user_agent: ["iOS/10.1", "iOS/10.2"] + username-password: ${parameterize(examples/account.csv)} + app_version: ${getAppVersion()} + parameters_setting: + strategy: random + variables: + app_version: f1 + base_url: "https://postman-echo.com" + verify: False + +teststeps: +- + name: get with params + variables: + foo1: $username + foo2: $password + foo3: $app_version + request: + method: GET + url: /get + params: + foo1: $foo1 + foo2: $foo2 + foo3: $foo3 + headers: + User-Agent: $user_agent,$app_version + validate: + - check: status_code + assert: equals + expect: 200 + msg: check status code + - check: body.args.foo3 + assert: not_equal + expect: f1 + msg: check app version \ No newline at end of file diff --git a/internal/builtin/function.go b/internal/builtin/function.go index d1d3dd3b..2384d654 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -14,6 +14,7 @@ var Functions = map[string]interface{}{ "gen_random_string": genRandomString, // call with one argument "max": math.Max, // call with two arguments "md5": MD5, + "getAppVersion": getAppVersion, // test } func init() { @@ -44,3 +45,7 @@ func MD5(str string) string { hasher.Write([]byte(str)) return hex.EncodeToString(hasher.Sum(nil)) } + +func getAppVersion() []float64 { + return []float64{3.1, 3.3} +} diff --git a/parser.go b/parser.go index eed50964..e95946c8 100644 --- a/parser.go +++ b/parser.go @@ -3,13 +3,16 @@ package hrp import ( "encoding/json" "fmt" - "github.com/maja42/goval" - "github.com/pkg/errors" - "github.com/rs/zerolog/log" + "math/rand" "net/url" "reflect" "regexp" "strings" + "time" + + "github.com/maja42/goval" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" "github.com/httprunner/hrp/internal/builtin" ) @@ -247,6 +250,15 @@ func mergeVariables(variables, overriddenVariables map[string]interface{}) map[s return mergedVariables } +func contains(s []string, e string) bool { + for _, a := range s { + if strings.EqualFold(a, e) { + return true + } + } + return false +} + func getMappingFunction(funcName string) (interface{}, error) { if function, ok := builtin.Functions[funcName]; ok { // function is builtin @@ -505,12 +517,43 @@ func findallVariables(raw string) variableSet { return varSet } +func shuffleCartesianProduct(slice []map[string]interface{}) { + if slice == nil || len(slice) == 0 { + return + } + r := rand.New(rand.NewSource(time.Now().Unix())) + for len(slice) > 0 { + n := len(slice) + randIndex := r.Intn(n) + slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1] + slice = slice[:n-1] + } +} + +func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { + if params == nil || len(params) == 0 { + return nil + } + var cartesianProduct []map[string]interface{} + cartesianProduct = params[0] + for i := 0; i < len(params)-1; i++ { + var tempProduct []map[string]interface{} + for _, param1 := range cartesianProduct { + for _, param2 := range params[i+1] { + tempProduct = append(tempProduct, mergeVariables(param1, param2)) + } + } + cartesianProduct = tempProduct + } + return cartesianProduct +} + func getParameters(config IConfig) []map[string]interface{} { cfg := config.ToStruct() // parse config parameters parsedParams, err := parseParameters(cfg.Parameters, cfg.Variables) if err != nil { - log.Error().Interface("params", cfg.Parameters).Err(err).Msg("parse config parameters failed") + log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed") } if cfg.ParametersSetting["strategy"] != nil && strings.ToLower(cfg.ParametersSetting["strategy"].(string)) == "random" { shuffleCartesianProduct(parsedParams) @@ -519,10 +562,13 @@ func getParameters(config IConfig) []map[string]interface{} { } func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) { - var parsedParametersList [][]map[string]interface{} + if parameters == nil || len(parameters) == 0 { + return nil, nil + } + var parsedParametersSlice [][]map[string]interface{} for k, v := range parameters { - parameterNameList := strings.Split(k, "-") - var parameterList []map[string]interface{} + parameterNameSlice := strings.Split(k, "-") + var parameterSlice []map[string]interface{} rawValue := reflect.ValueOf(v) switch rawValue.Kind() { case reflect.String: @@ -533,55 +579,72 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str } parsedParameterRawValue := reflect.ValueOf(parsedParameterContent) if parsedParameterRawValue.Kind() != reflect.Slice { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") - return nil, errors.New("parameter content should be List or Text(variables or functions call)") + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parsed parameter content should be Slice, got %v") + return nil, errors.New("parsed parameter content should be Slice") } for i := 0; i < parsedParameterRawValue.Len(); i++ { parameterMap := make(map[string]interface{}) - if parsedParameterRawValue.Index(i).Kind() == reflect.Map { - for _, key := range parameterNameList { - parameterMap[key] = parsedParameterRawValue.Index(i).MapIndex(reflect.ValueOf(key)).Interface() + // e.g. + elem := reflect.ValueOf(parsedParameterRawValue.Index(i).Interface()) + if elem.Kind() == reflect.Map { + // e.g. [{"username": "test1", "password": "passwd1", "other": "111"}, {"username": "test2", "password": "passwd2", "other": ""222}] + // -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] (username, password in parameterNameSlice) + for _, key := range parameterNameSlice { + if _, ok := elem.Interface().(map[string]string)[key]; ok { + parameterMap[key] = elem.MapIndex(reflect.ValueOf(key)).Interface() + } else { + log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name not found") + return nil, errors.New("parameter name not found") + } } - } else if parsedParameterRawValue.Index(i).Kind() == reflect.Slice { - if len(parameterNameList) != parsedParameterRawValue.Index(i).Len() { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name list and parameter content list should have the same length") - return nil, errors.New("parameter name list and parameter content list should have the same length") + } else if elem.Kind() == reflect.Slice { + // e.g. [["test1", "passwd1"], ["test2", "passwd2"]] -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] + if len(parameterNameSlice) != elem.Len() { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") + return nil, errors.New("parameter name Slice and parameter cjntent Slice should have the same length") + } else { + for j := 0; j < elem.Len(); j++ { + parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface() + } } - for i := 0; i < parsedParameterRawValue.Index(i).Len(); i++ { - parameterMap[parameterNameList[i]] = parsedParameterRawValue.Index(i).Index(i).Interface() - } - } else if len(parameterNameList) == 1 { - parameterMap[parameterNameList[0]] = parsedParameterRawValue.Index(i).Interface() } else { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") - return nil, errors.New("parameter content should be List or Text(variables or functions call)") + // e.g. ${getAppVersion()} -> [3.1, 3.0] -> [{"app_version": 3.1}, {"app_version": 3.0}] + if len(parameterNameSlice) != 1 { + log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string") + return nil, errors.New("parameter name slice should have only one element when parameter content is string") + } + parameterMap[parameterNameSlice[0]] = elem.Interface() } - parameterList = append(parameterList, parameterMap) + parameterSlice = append(parameterSlice, parameterMap) } case reflect.Slice: for i := 0; i < rawValue.Len(); i++ { parameterMap := make(map[string]interface{}) - if rawValue.Index(i).Kind() == reflect.Interface || rawValue.Index(i).Kind() == reflect.String { - parameterMap[parameterNameList[0]] = rawValue.Index(i).Interface() - } else if rawValue.Index(i).Kind() == reflect.Slice { - if len(parameterNameList) != rawValue.Index(i).Len() { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name list and parameter content list should have the same length") - return nil, errors.New("parameter name list and parameter content list should have the same length") + elem := reflect.ValueOf(rawValue.Index(i).Interface()) + if elem.Kind() == reflect.Slice { + // e.g. username-password: [["test1", "passwd1"], ["test2", "passwd2"]] + if len(parameterNameSlice) != elem.Len() { + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") + return nil, errors.New("parameter name Slice and parameter content Slice should have the same length") } - for i := 0; i < rawValue.Index(i).Len(); i++ { - parameterMap[parameterNameList[i]] = rawValue.Index(i).Index(i).Interface() + for j := 0; j < elem.Len(); j++ { + parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface() } } else { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") - return nil, errors.New("parameter content should be List or Text(variables or functions call)") + // e.g. user_agent: ["iOS/10.1", "iOS/10.2"] + if len(parameterNameSlice) != 1 { + log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string") + return nil, errors.New("parameter name slice should have only one element when parameter content is string") + } + parameterMap[parameterNameSlice[0]] = elem.Interface() } - parameterList = append(parameterList, parameterMap) + parameterSlice = append(parameterSlice, parameterMap) } default: - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be List or Text(variables or functions call), got %v") - return nil, errors.New("parameter content should be List or Text(variables or functions call)") + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be Slice or Text(variables or functions call)") + return nil, errors.New("parameter content should be Slice or Text(variables or functions call)") } - parsedParametersList = append(parsedParametersList, parameterList) + parsedParametersSlice = append(parsedParametersSlice, parameterSlice) } - return genCartesianProduct(parsedParametersList), nil + return genCartesianProduct(parsedParametersSlice), nil } diff --git a/parser_test.go b/parser_test.go index 33f3ae76..194f70f1 100644 --- a/parser_test.go +++ b/parser_test.go @@ -618,3 +618,56 @@ func TestFindallVariables(t *testing.T) { } } } + +func TestParseParameters(t *testing.T) { + testData := []struct { + rawVars map[string]interface{} + expectVars []map[string]interface{} + }{ + { + map[string]interface{}{"username-password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + []map[string]interface{}{{"username": "test1", "password": "111111", "user_agent": "IOS/10.1"}, + {"username": "test1", "password": "111111", "user_agent": "IOS/10.2"}, + {"username": "test2", "password": "222222", "user_agent": "IOS/10.1"}, + {"username": "test2", "password": "222222", "user_agent": "IOS/10.2"}, + {"username": "test3", "password": "333333", "user_agent": "IOS/10.1"}, + {"username": "test3", "password": "333333", "user_agent": "IOS/10.2"}}, + }, + { + map[string]interface{}{}, + nil, + }, + { + nil, + nil, + }, + } + for _, data := range testData { + value, _ := parseParameters(data.rawVars, map[string]interface{}{}) + if !assert.Equal(t, data.expectVars, value) { + t.Fail() + } + } +} + +func TestParseParametersError(t *testing.T) { + testData := []struct { + rawVars map[string]interface{} + }{ + { + map[string]interface{}{"username_password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + }, + { + map[string]interface{}{"username-password": "${parameterize(examples/account.csv)}", "user-agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + }, + { + map[string]interface{}{"username-password": "${param(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + }, + } + for _, data := range testData { + _, err := parseParameters(data.rawVars, map[string]interface{}{}) + if !assert.Error(t, err) { + t.Fail() + } + } +} diff --git a/runner.go b/runner.go index 18dff670..fea5b69b 100644 --- a/runner.go +++ b/runner.go @@ -131,6 +131,9 @@ func (r *hrpRunner) runCase(testcase *TestCase) error { cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") parameters := getParameters(config) + if parameters == nil { + parameters = []map[string]interface{}{{}} + } for _, parameter := range parameters { cfg.Variables = mergeVariables(parameter, cfg.Variables) r.startTime = time.Now() diff --git a/utils.go b/utils.go deleted file mode 100644 index 455e0ff7..00000000 --- a/utils.go +++ /dev/null @@ -1,41 +0,0 @@ -package hrp - -import ( - "math/rand" - "strings" - "time" -) - -func contains(s []string, e string) bool { - for _, a := range s { - if strings.EqualFold(a, e) { - return true - } - } - return false -} - -func shuffleCartesianProduct(slice []map[string]interface{}) { - r := rand.New(rand.NewSource(time.Now().Unix())) - for len(slice) > 0 { - n := len(slice) - randIndex := r.Intn(n) - slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1] - slice = slice[:n-1] - } -} - -func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { - var cartesianProduct []map[string]interface{} - cartesianProduct = params[0] - for i := 0; i < len(params)-1; i++ { - var tempProduct []map[string]interface{} - for _, param1 := range cartesianProduct { - for _, param2 := range params[i+1] { - tempProduct = append(tempProduct, mergeVariables(param1, param2)) - } - } - cartesianProduct = tempProduct - } - return cartesianProduct -} From 60accfb8eb1b3d0708aea603b5d373f75c469814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 14:46:05 +0800 Subject: [PATCH 06/42] add interface request verification method. --- internal/builtin/assertion.go | 85 +++++++++++++++++++++++++++++++++-- parser_test.go | 38 ++++++++++++---- 2 files changed, 110 insertions(+), 13 deletions(-) diff --git a/internal/builtin/assertion.go b/internal/builtin/assertion.go index 31110221..a6395566 100644 --- a/internal/builtin/assertion.go +++ b/internal/builtin/assertion.go @@ -2,6 +2,7 @@ package builtin import ( "fmt" + "reflect" "strings" "github.com/stretchr/testify/assert" @@ -18,10 +19,14 @@ var Assertions = map[string]func(t assert.TestingT, expected interface{}, actual "contains": assert.Contains, "regex_match": assert.Regexp, // custom assertions - "startswith": StartsWith, // check if string starts with substring - "endswith": EndsWith, // check if string ends with substring - "length_equals": EqualLength, - "length_equal": EqualLength, // alias for length_equals + "startswith": StartsWith, // check if string starts with substring + "endswith": EndsWith, // check if string ends with substring + "length_equals": EqualLength, + "length_equal": EqualLength, // alias for length_equals + "length_less_than": LessThanLength, + "length_less_or_equals": LessOrEqualsLength, + "length_greater_than": GreaterThanLength, + "length_greater_or_equals": GreaterOrEqualsLength, } func StartsWith(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { @@ -57,6 +62,66 @@ func EqualLength(t assert.TestingT, expected, actual interface{}, msgAndArgs ... return assert.Len(t, actual, length, msgAndArgs...) } +func GreaterThanLength(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + length, err := convertInt(expected) + if err != nil { + return assert.Fail(t, fmt.Sprintf("expected type is not int, got %#v", expected), msgAndArgs...) + } + ok, l := getLen(actual) + if !ok { + return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) + } + if l > length { + return assert.Fail(t, fmt.Sprintf("\"%s\" should be more than %d item(s), but has %d", actual, length, l), msgAndArgs...) + } + return true +} + +func GreaterOrEqualsLength(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + length, err := convertInt(expected) + if err != nil { + return assert.Fail(t, fmt.Sprintf("expected type is not int, got %#v", expected), msgAndArgs...) + } + ok, l := getLen(actual) + if !ok { + return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) + } + if l >= length { + return assert.Fail(t, fmt.Sprintf("\"%s\" should be no less than %d item(s), but has %d", actual, length, l), msgAndArgs...) + } + return true +} + +func LessThanLength(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + length, err := convertInt(expected) + if err != nil { + return assert.Fail(t, fmt.Sprintf("expected type is not int, got %#v", expected), msgAndArgs...) + } + ok, l := getLen(actual) + if !ok { + return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) + } + if l < length { + return assert.Fail(t, fmt.Sprintf("\"%s\" should be less than %d item(s), but has %d", actual, length, l), msgAndArgs...) + } + return true +} + +func LessOrEqualsLength(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + length, err := convertInt(expected) + if err != nil { + return assert.Fail(t, fmt.Sprintf("expected type is not int, got %#v", expected), msgAndArgs...) + } + ok, l := getLen(actual) + if !ok { + return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) + } + if l <= length { + return assert.Fail(t, fmt.Sprintf("\"%s\" should be no more than %d item(s), but has %d", actual, length, l), msgAndArgs...) + } + return true +} + func convertInt(value interface{}) (int, error) { switch v := value.(type) { case int: @@ -83,3 +148,15 @@ func convertInt(value interface{}) (int, error) { return 0, fmt.Errorf("unsupported int convertion for %v(%T)", v, v) } } + +// getLen try to get length of object. +// return (false, 0) if impossible. +func getLen(x interface{}) (ok bool, length int) { + v := reflect.ValueOf(x) + defer func() { + if e := recover(); e != nil { + ok = false + } + }() + return true, v.Len() +} diff --git a/parser_test.go b/parser_test.go index 194f70f1..cb1bcd8f 100644 --- a/parser_test.go +++ b/parser_test.go @@ -625,8 +625,11 @@ func TestParseParameters(t *testing.T) { expectVars []map[string]interface{} }{ { - map[string]interface{}{"username-password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, - []map[string]interface{}{{"username": "test1", "password": "111111", "user_agent": "IOS/10.1"}, + map[string]interface{}{ + "username-password": "${parameterize(examples/account.csv)}", + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + []map[string]interface{}{ + {"username": "test1", "password": "111111", "user_agent": "IOS/10.1"}, {"username": "test1", "password": "111111", "user_agent": "IOS/10.2"}, {"username": "test2", "password": "222222", "user_agent": "IOS/10.1"}, {"username": "test2", "password": "222222", "user_agent": "IOS/10.2"}, @@ -634,12 +637,23 @@ func TestParseParameters(t *testing.T) { {"username": "test3", "password": "333333", "user_agent": "IOS/10.2"}}, }, { - map[string]interface{}{}, - nil, + map[string]interface{}{ + "username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}}, + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, + "app_version": []interface{}{0.3}}, + []map[string]interface{}{ + {"username": "test1", "password": "111111", "user_agent": "IOS/10.1", "app_version": 0.3}, + {"username": "test1", "password": "111111", "user_agent": "IOS/10.2", "app_version": 0.3}, + {"username": "test2", "password": "222222", "user_agent": "IOS/10.1", "app_version": 0.3}, + {"username": "test2", "password": "222222", "user_agent": "IOS/10.2", "app_version": 0.3}, + {"username": "test3", "password": "333333", "user_agent": "IOS/10.1", "app_version": 0.3}, + {"username": "test3", "password": "333333", "user_agent": "IOS/10.2", "app_version": 0.3}}, }, { - nil, - nil, + map[string]interface{}{}, nil, + }, + { + nil, nil, }, } for _, data := range testData { @@ -655,13 +669,19 @@ func TestParseParametersError(t *testing.T) { rawVars map[string]interface{} }{ { - map[string]interface{}{"username_password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + map[string]interface{}{ + "username_password": "${parameterize(examples/account.csv)}", + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, }, { - map[string]interface{}{"username-password": "${parameterize(examples/account.csv)}", "user-agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + map[string]interface{}{ + "username-password": "${parameterize(examples/account.csv)}", + "user-agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, }, { - map[string]interface{}{"username-password": "${param(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + map[string]interface{}{ + "username-password": "${param(examples/account.csv)}", + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, }, } for _, data := range testData { From 83923affa871b28ea7b9ef66b4a2f1f60a324f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 15:02:12 +0800 Subject: [PATCH 07/42] feat: data-driven. --- convert.go | 2 +- internal/builtin/function.go | 8 +++----- parser.go | 20 ++++--------------- parser_test.go | 38 +++++++++++++++++++++++++++--------- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/convert.go b/convert.go index ba3b8d15..3d9880eb 100644 --- a/convert.go +++ b/convert.go @@ -96,7 +96,7 @@ func loadFromYAML(path string) (*TCase, error) { return tc, err } -func loadFromCSV(path string) []map[string]string { +func LoadFromCSV(path string) []map[string]string { path, err := filepath.Abs(path) if err != nil { log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") diff --git a/internal/builtin/function.go b/internal/builtin/function.go index 2384d654..be7c129e 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -3,6 +3,7 @@ package builtin import ( "crypto/md5" "encoding/hex" + "github.com/httprunner/hrp" "math" "math/rand" "time" @@ -14,7 +15,8 @@ var Functions = map[string]interface{}{ "gen_random_string": genRandomString, // call with one argument "max": math.Max, // call with two arguments "md5": MD5, - "getAppVersion": getAppVersion, // test + "parameterize": hrp.LoadFromCSV, + "P": hrp.LoadFromCSV, } func init() { @@ -45,7 +47,3 @@ func MD5(str string) string { hasher.Write([]byte(str)) return hex.EncodeToString(hasher.Sum(nil)) } - -func getAppVersion() []float64 { - return []float64{3.1, 3.3} -} diff --git a/parser.go b/parser.go index e95946c8..1c836f36 100644 --- a/parser.go +++ b/parser.go @@ -259,25 +259,13 @@ func contains(s []string, e string) bool { return false } -func getMappingFunction(funcName string) (interface{}, error) { - if function, ok := builtin.Functions[funcName]; ok { - // function is builtin - return function, nil - } else if contains([]string{"parameterize", "P"}, funcName) { - // parameterize function - return loadFromCSV, nil - } else { - // function not found - return nil, fmt.Errorf("function %s is not found", funcName) - } -} - // callFunc call function with arguments // only support return at most one result value func callFunc(funcName string, arguments ...interface{}) (interface{}, error) { - function, err := getMappingFunction(funcName) - if err != nil { - return nil, err + function, ok := builtin.Functions[funcName] + if !ok { + // function not found + return nil, fmt.Errorf("function %s is not found", funcName) } funcValue := reflect.ValueOf(function) if funcValue.Kind() != reflect.Func { diff --git a/parser_test.go b/parser_test.go index 194f70f1..cb1bcd8f 100644 --- a/parser_test.go +++ b/parser_test.go @@ -625,8 +625,11 @@ func TestParseParameters(t *testing.T) { expectVars []map[string]interface{} }{ { - map[string]interface{}{"username-password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, - []map[string]interface{}{{"username": "test1", "password": "111111", "user_agent": "IOS/10.1"}, + map[string]interface{}{ + "username-password": "${parameterize(examples/account.csv)}", + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + []map[string]interface{}{ + {"username": "test1", "password": "111111", "user_agent": "IOS/10.1"}, {"username": "test1", "password": "111111", "user_agent": "IOS/10.2"}, {"username": "test2", "password": "222222", "user_agent": "IOS/10.1"}, {"username": "test2", "password": "222222", "user_agent": "IOS/10.2"}, @@ -634,12 +637,23 @@ func TestParseParameters(t *testing.T) { {"username": "test3", "password": "333333", "user_agent": "IOS/10.2"}}, }, { - map[string]interface{}{}, - nil, + map[string]interface{}{ + "username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}}, + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, + "app_version": []interface{}{0.3}}, + []map[string]interface{}{ + {"username": "test1", "password": "111111", "user_agent": "IOS/10.1", "app_version": 0.3}, + {"username": "test1", "password": "111111", "user_agent": "IOS/10.2", "app_version": 0.3}, + {"username": "test2", "password": "222222", "user_agent": "IOS/10.1", "app_version": 0.3}, + {"username": "test2", "password": "222222", "user_agent": "IOS/10.2", "app_version": 0.3}, + {"username": "test3", "password": "333333", "user_agent": "IOS/10.1", "app_version": 0.3}, + {"username": "test3", "password": "333333", "user_agent": "IOS/10.2", "app_version": 0.3}}, }, { - nil, - nil, + map[string]interface{}{}, nil, + }, + { + nil, nil, }, } for _, data := range testData { @@ -655,13 +669,19 @@ func TestParseParametersError(t *testing.T) { rawVars map[string]interface{} }{ { - map[string]interface{}{"username_password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + map[string]interface{}{ + "username_password": "${parameterize(examples/account.csv)}", + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, }, { - map[string]interface{}{"username-password": "${parameterize(examples/account.csv)}", "user-agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + map[string]interface{}{ + "username-password": "${parameterize(examples/account.csv)}", + "user-agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, }, { - map[string]interface{}{"username-password": "${param(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + map[string]interface{}{ + "username-password": "${param(examples/account.csv)}", + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, }, } for _, data := range testData { From 86b50e6d0d6dd8ccc589bc07281c5c934684165b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 15:23:36 +0800 Subject: [PATCH 08/42] add interface request verification method. --- convert.go | 37 +------------- internal/builtin/assertion.go | 8 ++-- internal/builtin/assertion_test.go | 77 ++++++++++++++++++++++++++++++ internal/builtin/function.go | 40 ++++++++++++++-- validate.go | 44 +++++++++++++++++ 5 files changed, 164 insertions(+), 42 deletions(-) diff --git a/convert.go b/convert.go index 3d9880eb..7cdedfae 100644 --- a/convert.go +++ b/convert.go @@ -2,15 +2,12 @@ package hrp import ( "bytes" - "encoding/csv" "encoding/json" "fmt" - "io/ioutil" - "path/filepath" - "strings" - "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" + "io/ioutil" + "path/filepath" ) func (tc *TCase) Dump2JSON(path string) error { @@ -96,36 +93,6 @@ func loadFromYAML(path string) (*TCase, error) { return tc, err } -func LoadFromCSV(path string) []map[string]string { - path, err := filepath.Abs(path) - if err != nil { - log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") - panic(err) - } - log.Info().Str("path", path).Msg("load csv file") - - file, err := ioutil.ReadFile(path) - if err != nil { - log.Error().Err(err).Msg("load csv file failed") - panic(err) - } - r := csv.NewReader(strings.NewReader(string(file))) - content, err := r.ReadAll() - if err != nil { - log.Error().Err(err).Msg("parse csv file failed") - panic(err) - } - var result []map[string]string - for i := 1; i < len(content); i++ { - row := make(map[string]string) - for j := 0; j < len(content[i]); j++ { - row[content[0][j]] = content[i][j] - } - result = append(result, row) - } - return result -} - func (tc *TCase) ToTestCase() (*TestCase, error) { testCase := &TestCase{ Config: &Config{cfg: tc.Config}, diff --git a/internal/builtin/assertion.go b/internal/builtin/assertion.go index a6395566..c995e26e 100644 --- a/internal/builtin/assertion.go +++ b/internal/builtin/assertion.go @@ -71,7 +71,7 @@ func GreaterThanLength(t assert.TestingT, expected, actual interface{}, msgAndAr if !ok { return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) } - if l > length { + if l <= length { return assert.Fail(t, fmt.Sprintf("\"%s\" should be more than %d item(s), but has %d", actual, length, l), msgAndArgs...) } return true @@ -86,7 +86,7 @@ func GreaterOrEqualsLength(t assert.TestingT, expected, actual interface{}, msgA if !ok { return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) } - if l >= length { + if l < length { return assert.Fail(t, fmt.Sprintf("\"%s\" should be no less than %d item(s), but has %d", actual, length, l), msgAndArgs...) } return true @@ -101,7 +101,7 @@ func LessThanLength(t assert.TestingT, expected, actual interface{}, msgAndArgs if !ok { return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) } - if l < length { + if l >= length { return assert.Fail(t, fmt.Sprintf("\"%s\" should be less than %d item(s), but has %d", actual, length, l), msgAndArgs...) } return true @@ -116,7 +116,7 @@ func LessOrEqualsLength(t assert.TestingT, expected, actual interface{}, msgAndA if !ok { return assert.Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", actual), msgAndArgs...) } - if l <= length { + if l > length { return assert.Fail(t, fmt.Sprintf("\"%s\" should be no more than %d item(s), but has %d", actual, length, l), msgAndArgs...) } return true diff --git a/internal/builtin/assertion_test.go b/internal/builtin/assertion_test.go index 632dad30..52d8d5d0 100644 --- a/internal/builtin/assertion_test.go +++ b/internal/builtin/assertion_test.go @@ -61,3 +61,80 @@ func TestEqualLength(t *testing.T) { } } } + +func TestLessThanLength(t *testing.T) { + testData := []struct { + raw interface{} + expected int + }{ + {"", 1}, + {[]string{}, 1}, + {map[string]interface{}{}, 1}, + {"a", 2}, + {[]string{"a"}, 2}, + {map[string]interface{}{"a": 123}, 2}, + } + + for _, data := range testData { + if !assert.True(t, LessThanLength(t, data.expected, data.raw)) { + t.Fail() + } + } +} + +func TestLessOrEqualsLength(t *testing.T) { + testData := []struct { + raw interface{} + expected int + }{ + {"", 1}, + {[]string{}, 1}, + {map[string]interface{}{"A": 111}, 1}, + {"a", 1}, + {[]string{"a"}, 2}, + {map[string]interface{}{"a": 123}, 2}, + } + + for _, data := range testData { + if !assert.True(t, LessOrEqualsLength(t, data.expected, data.raw)) { + t.Fail() + } + } +} + +func TestGreaterThanLength(t *testing.T) { + testData := []struct { + raw interface{} + expected int + }{ + {"abcd", 3}, + {[]string{"a", "b", "c"}, 2}, + {map[string]interface{}{"a": 123, "b": 223, "c": 323}, 2}, + } + + for _, data := range testData { + if !assert.True(t, GreaterThanLength(t, data.expected, data.raw)) { + t.Fail() + } + } +} + +func TestGreaterOrEqualsLength(t *testing.T) { + testData := []struct { + raw interface{} + expected int + }{ + {"abcd", 3}, + {[]string{"w"}, 1}, + {map[string]interface{}{"A": 111}, 1}, + {"a", 1}, + {[]string{"a", "b", "c"}, 2}, + {map[string]interface{}{"a": 123, "b": 223, "c": 323}, 2}, + } + + for _, data := range testData { + if !assert.True(t, GreaterOrEqualsLength(t, data.expected, data.raw)) { + t.Fail() + } + } +} diff --git a/internal/builtin/function.go b/internal/builtin/function.go index be7c129e..3d5c96de 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -2,10 +2,14 @@ package builtin import ( "crypto/md5" + "encoding/csv" "encoding/hex" - "github.com/httprunner/hrp" + "github.com/rs/zerolog/log" + "io/ioutil" "math" "math/rand" + "path/filepath" + "strings" "time" ) @@ -15,8 +19,8 @@ var Functions = map[string]interface{}{ "gen_random_string": genRandomString, // call with one argument "max": math.Max, // call with two arguments "md5": MD5, - "parameterize": hrp.LoadFromCSV, - "P": hrp.LoadFromCSV, + "parameterize": LoadFromCSV, + "P": LoadFromCSV, } func init() { @@ -47,3 +51,33 @@ func MD5(str string) string { hasher.Write([]byte(str)) return hex.EncodeToString(hasher.Sum(nil)) } + +func LoadFromCSV(path string) []map[string]string { + path, err := filepath.Abs(path) + if err != nil { + log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") + panic(err) + } + log.Info().Str("path", path).Msg("load csv file") + + file, err := ioutil.ReadFile(path) + if err != nil { + log.Error().Err(err).Msg("load csv file failed") + panic(err) + } + r := csv.NewReader(strings.NewReader(string(file))) + content, err := r.ReadAll() + if err != nil { + log.Error().Err(err).Msg("parse csv file failed") + panic(err) + } + var result []map[string]string + for i := 1; i < len(content); i++ { + row := make(map[string]string) + for j := 0; j < len(content[i]); j++ { + row[content[0][j]] = content[i][j] + } + result = append(result, row) + } + return result +} diff --git a/validate.go b/validate.go index f5d67a8a..f8113779 100644 --- a/validate.go +++ b/validate.go @@ -67,3 +67,47 @@ func (s *StepRequestValidation) AssertLengthEqual(jmesPath string, expected inte s.step.Validators = append(s.step.Validators, v) return s } + +func (s *StepRequestValidation) AssertLengthLessThan(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "length_less_than", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertLengthLessOrEquals(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "length_less_or_equals", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertLengthGreaterThan(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "length_greater_than", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertLengthGreaterOrEquals(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "length_greater_or_equals", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} From 11ea588ee29c93ff601a129d82724de12e43c669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 15:25:57 +0800 Subject: [PATCH 09/42] feat: data-driven. --- convert.go | 37 ++------------------------------- internal/builtin/function.go | 40 +++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/convert.go b/convert.go index 3d9880eb..7cdedfae 100644 --- a/convert.go +++ b/convert.go @@ -2,15 +2,12 @@ package hrp import ( "bytes" - "encoding/csv" "encoding/json" "fmt" - "io/ioutil" - "path/filepath" - "strings" - "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" + "io/ioutil" + "path/filepath" ) func (tc *TCase) Dump2JSON(path string) error { @@ -96,36 +93,6 @@ func loadFromYAML(path string) (*TCase, error) { return tc, err } -func LoadFromCSV(path string) []map[string]string { - path, err := filepath.Abs(path) - if err != nil { - log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") - panic(err) - } - log.Info().Str("path", path).Msg("load csv file") - - file, err := ioutil.ReadFile(path) - if err != nil { - log.Error().Err(err).Msg("load csv file failed") - panic(err) - } - r := csv.NewReader(strings.NewReader(string(file))) - content, err := r.ReadAll() - if err != nil { - log.Error().Err(err).Msg("parse csv file failed") - panic(err) - } - var result []map[string]string - for i := 1; i < len(content); i++ { - row := make(map[string]string) - for j := 0; j < len(content[i]); j++ { - row[content[0][j]] = content[i][j] - } - result = append(result, row) - } - return result -} - func (tc *TCase) ToTestCase() (*TestCase, error) { testCase := &TestCase{ Config: &Config{cfg: tc.Config}, diff --git a/internal/builtin/function.go b/internal/builtin/function.go index be7c129e..3d5c96de 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -2,10 +2,14 @@ package builtin import ( "crypto/md5" + "encoding/csv" "encoding/hex" - "github.com/httprunner/hrp" + "github.com/rs/zerolog/log" + "io/ioutil" "math" "math/rand" + "path/filepath" + "strings" "time" ) @@ -15,8 +19,8 @@ var Functions = map[string]interface{}{ "gen_random_string": genRandomString, // call with one argument "max": math.Max, // call with two arguments "md5": MD5, - "parameterize": hrp.LoadFromCSV, - "P": hrp.LoadFromCSV, + "parameterize": LoadFromCSV, + "P": LoadFromCSV, } func init() { @@ -47,3 +51,33 @@ func MD5(str string) string { hasher.Write([]byte(str)) return hex.EncodeToString(hasher.Sum(nil)) } + +func LoadFromCSV(path string) []map[string]string { + path, err := filepath.Abs(path) + if err != nil { + log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") + panic(err) + } + log.Info().Str("path", path).Msg("load csv file") + + file, err := ioutil.ReadFile(path) + if err != nil { + log.Error().Err(err).Msg("load csv file failed") + panic(err) + } + r := csv.NewReader(strings.NewReader(string(file))) + content, err := r.ReadAll() + if err != nil { + log.Error().Err(err).Msg("parse csv file failed") + panic(err) + } + var result []map[string]string + for i := 1; i < len(content); i++ { + row := make(map[string]string) + for j := 0; j < len(content[i]); j++ { + row[content[0][j]] = content[i][j] + } + result = append(result, row) + } + return result +} From 6e9c55e93df721be0adeca4fa542a454e0c30181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 15:59:10 +0800 Subject: [PATCH 10/42] feat: data-driven. --- parser.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/parser.go b/parser.go index 1c836f36..7bab526d 100644 --- a/parser.go +++ b/parser.go @@ -250,15 +250,6 @@ func mergeVariables(variables, overriddenVariables map[string]interface{}) map[s return mergedVariables } -func contains(s []string, e string) bool { - for _, a := range s { - if strings.EqualFold(a, e) { - return true - } - } - return false -} - // callFunc call function with arguments // only support return at most one result value func callFunc(funcName string, arguments ...interface{}) (interface{}, error) { From c1d1d060de1a5f6d957d6bef04754cad3cad3d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 16:43:43 +0800 Subject: [PATCH 11/42] add interface request verification method. --- validate.go | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/validate.go b/validate.go index f8113779..9464ea1b 100644 --- a/validate.go +++ b/validate.go @@ -35,6 +35,83 @@ func (s *StepRequestValidation) AssertEqual(jmesPath string, expected interface{ return s } +func (s *StepRequestValidation) AssertGreater(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "greater_than", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertLess(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "less_than", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertGreaterOrEqual(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "greater_or_equals", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertLessOrEqual(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "less_or_equals", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertNotEqual(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "not_equal", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertContains(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "contains", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertRegexp(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "regex_match", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + func (s *StepRequestValidation) AssertStartsWith(jmesPath string, expected interface{}, msg string) *StepRequestValidation { v := Validator{ Check: jmesPath, From 5e017a4ee789f4141b1b2cf949c99a3d5cdcb55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 29 Dec 2021 18:48:37 +0800 Subject: [PATCH 12/42] feat: data-driven. --- parser.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parser.go b/parser.go index 7bab526d..300293b5 100644 --- a/parser.go +++ b/parser.go @@ -553,12 +553,12 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str case reflect.String: parsedParameterContent, err := parseData(rawValue.Interface(), variablesMapping) if err != nil { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parse parameter error") + log.Error().Interface("parameterContent", rawValue).Msg("[parseParameters] parse parameter content error") return nil, err } parsedParameterRawValue := reflect.ValueOf(parsedParameterContent) if parsedParameterRawValue.Kind() != reflect.Slice { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parsed parameter content should be Slice, got %v") + log.Error().Interface("parameterContent", parsedParameterRawValue).Msg("[parseParameters] parsed parameter content should be Slice, got %v") return nil, errors.New("parsed parameter content should be Slice") } for i := 0; i < parsedParameterRawValue.Len(); i++ { @@ -579,7 +579,7 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str } else if elem.Kind() == reflect.Slice { // e.g. [["test1", "passwd1"], ["test2", "passwd2"]] -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] if len(parameterNameSlice) != elem.Len() { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") + log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") return nil, errors.New("parameter name Slice and parameter cjntent Slice should have the same length") } else { for j := 0; j < elem.Len(); j++ { @@ -603,7 +603,7 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str if elem.Kind() == reflect.Slice { // e.g. username-password: [["test1", "passwd1"], ["test2", "passwd2"]] if len(parameterNameSlice) != elem.Len() { - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") + log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") return nil, errors.New("parameter name Slice and parameter content Slice should have the same length") } for j := 0; j < elem.Len(); j++ { From a1e7d0e13cee78b69c24da6fbfe305105e188306 Mon Sep 17 00:00:00 2001 From: buyuxiang Date: Thu, 30 Dec 2021 14:47:10 +0800 Subject: [PATCH 13/42] fix: contains assertion bug; feat: add type_match, contained_by, string_equals assertion methods Change-Id: Icb15fe33a58d1ff69991435bbe70c3cd53bb8dea --- examples/function_test.go | 8 +++++-- internal/builtin/assertion.go | 22 +++++++++++++++++- validate.go | 44 +++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/examples/function_test.go b/examples/function_test.go index cd2c2d98..44c8c590 100644 --- a/examples/function_test.go +++ b/examples/function_test.go @@ -19,14 +19,18 @@ func TestCaseCallFunction(t *testing.T) { TestSteps: []hrp.IStep{ hrp.NewStep("get with params"). GET("/get"). - WithParams(map[string]interface{}{"foo1": "${gen_random_string($n)}", "foo2": "${max($a, $b)}"}). + WithParams(map[string]interface{}{"foo1": "${gen_random_string($n)}", "foo2": "${max($a, $b)}", "foo3": "Foo3"}). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). Extract(). WithJmesPath("body.args.foo1", "varFoo1"). Validate(). 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 + AssertEqual("body.args.foo2", "12.3", "check args foo2"). + AssertTypeMatch("body.args.foo3", "str", "check args foo3 is type string"). + AssertStringEqual("body.args.foo3", "foo3", "check args foo3 case-insensitivity"). + AssertContains("body.args.foo3", "Foo", "check contains "). + AssertContainedBy("body.args.foo3", "this is Foo3 test", "check contained by"), // notice: request params value will be converted to string hrp.NewStep("post json data with functions"). POST("/post"). WithHeaders(map[string]string{"User-Agent": "HttpRunnerPlus"}). diff --git a/internal/builtin/assertion.go b/internal/builtin/assertion.go index 31110221..87e4709b 100644 --- a/internal/builtin/assertion.go +++ b/internal/builtin/assertion.go @@ -15,13 +15,16 @@ var Assertions = map[string]func(t assert.TestingT, expected interface{}, actual "greater_or_equals": assert.GreaterOrEqual, "less_or_equals": assert.LessOrEqual, "not_equal": assert.NotEqual, - "contains": assert.Contains, + "contained_by": assert.Contains, "regex_match": assert.Regexp, + "type_match": assert.IsType, // custom assertions "startswith": StartsWith, // check if string starts with substring "endswith": EndsWith, // check if string ends with substring "length_equals": EqualLength, "length_equal": EqualLength, // alias for length_equals + "contains": Contains, + "string_equals": EqualString, } func StartsWith(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { @@ -83,3 +86,20 @@ func convertInt(value interface{}) (int, error) { return 0, fmt.Errorf("unsupported int convertion for %v(%T)", v, v) } } + +// Contains assert whether actual +func Contains(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + return assert.Contains(t, actual, expected, msgAndArgs) +} + +func EqualString(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { + if !assert.IsType(t, "string", actual, msgAndArgs) { + return false + } + if !assert.IsType(t, "string", expected, msgAndArgs) { + return false + } + actualString := actual.(string) + expectedString := expected.(string) + return assert.True(t, strings.EqualFold(actualString, expectedString), msgAndArgs) +} diff --git a/validate.go b/validate.go index f5d67a8a..9748ac05 100644 --- a/validate.go +++ b/validate.go @@ -35,6 +35,28 @@ func (s *StepRequestValidation) AssertEqual(jmesPath string, expected interface{ return s } +func (s *StepRequestValidation) AssertContains(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "contains", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertTypeMatch(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "type_match", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + func (s *StepRequestValidation) AssertStartsWith(jmesPath string, expected interface{}, msg string) *StepRequestValidation { v := Validator{ Check: jmesPath, @@ -67,3 +89,25 @@ func (s *StepRequestValidation) AssertLengthEqual(jmesPath string, expected inte s.step.Validators = append(s.step.Validators, v) return s } + +func (s *StepRequestValidation) AssertContainedBy(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "contained_by", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} + +func (s *StepRequestValidation) AssertStringEqual(jmesPath string, expected interface{}, msg string) *StepRequestValidation { + v := Validator{ + Check: jmesPath, + Assert: "string_equals", + Expect: expected, + Message: msg, + } + s.step.Validators = append(s.step.Validators, v) + return s +} \ No newline at end of file From fc3c9c19a29c2c226d5b1243882008c6a1344b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Thu, 30 Dec 2021 17:31:14 +0800 Subject: [PATCH 14/42] feat: data-driven. --- examples/parameters_test.json | 7 +- examples/parameters_test.yaml | 1 - internal/builtin/function.go | 6 +- parser.go | 117 ++++++++++++++++------------------ parser_test.go | 39 ++++++++++++ 5 files changed, 102 insertions(+), 68 deletions(-) diff --git a/examples/parameters_test.json b/examples/parameters_test.json index 6ad52032..c519e928 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -6,8 +6,11 @@ "iOS/10.1", "iOS/10.2" ], - "username-password": "${parameterize(examples/account.csv)}", - "app_version": "${getAppVersion()}" + "username1-password1": [ + ["a", "123"], + ["b", "456"] + ], + "username-password": "${parameterize(examples/account.csv)}" }, "parameters_setting": { "strategy": "random" diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 7afb4252..65c307a8 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -3,7 +3,6 @@ config: parameters: user_agent: ["iOS/10.1", "iOS/10.2"] username-password: ${parameterize(examples/account.csv)} - app_version: ${getAppVersion()} parameters_setting: strategy: random variables: diff --git a/internal/builtin/function.go b/internal/builtin/function.go index 3d5c96de..8d6fd87e 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -52,7 +52,7 @@ func MD5(str string) string { return hex.EncodeToString(hasher.Sum(nil)) } -func LoadFromCSV(path string) []map[string]string { +func LoadFromCSV(path string) []map[string]interface{} { path, err := filepath.Abs(path) if err != nil { log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") @@ -71,9 +71,9 @@ func LoadFromCSV(path string) []map[string]string { log.Error().Err(err).Msg("parse csv file failed") panic(err) } - var result []map[string]string + var result []map[string]interface{} for i := 1; i < len(content); i++ { - row := make(map[string]string) + row := make(map[string]interface{}) for j := 0; j < len(content[i]); j++ { row[content[0][j]] = content[i][j] } diff --git a/parser.go b/parser.go index 300293b5..cc92fde8 100644 --- a/parser.go +++ b/parser.go @@ -497,7 +497,7 @@ func findallVariables(raw string) variableSet { } func shuffleCartesianProduct(slice []map[string]interface{}) { - if slice == nil || len(slice) == 0 { + if len(slice) == 0 { return } r := rand.New(rand.NewSource(time.Now().Unix())) @@ -510,7 +510,7 @@ func shuffleCartesianProduct(slice []map[string]interface{}) { } func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { - if params == nil || len(params) == 0 { + if len(params) == 0 { return nil } var cartesianProduct []map[string]interface{} @@ -541,17 +541,18 @@ func getParameters(config IConfig) []map[string]interface{} { } func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) { - if parameters == nil || len(parameters) == 0 { + if len(parameters) == 0 { return nil, nil } var parsedParametersSlice [][]map[string]interface{} + var err error for k, v := range parameters { - parameterNameSlice := strings.Split(k, "-") var parameterSlice []map[string]interface{} rawValue := reflect.ValueOf(v) switch rawValue.Kind() { case reflect.String: - parsedParameterContent, err := parseData(rawValue.Interface(), variablesMapping) + var parsedParameterContent interface{} + parsedParameterContent, err = parseData(rawValue.Interface(), variablesMapping) if err != nil { log.Error().Interface("parameterContent", rawValue).Msg("[parseParameters] parse parameter content error") return nil, err @@ -561,69 +562,61 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str log.Error().Interface("parameterContent", parsedParameterRawValue).Msg("[parseParameters] parsed parameter content should be Slice, got %v") return nil, errors.New("parsed parameter content should be Slice") } - for i := 0; i < parsedParameterRawValue.Len(); i++ { - parameterMap := make(map[string]interface{}) - // e.g. - elem := reflect.ValueOf(parsedParameterRawValue.Index(i).Interface()) - if elem.Kind() == reflect.Map { - // e.g. [{"username": "test1", "password": "passwd1", "other": "111"}, {"username": "test2", "password": "passwd2", "other": ""222}] - // -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] (username, password in parameterNameSlice) - for _, key := range parameterNameSlice { - if _, ok := elem.Interface().(map[string]string)[key]; ok { - parameterMap[key] = elem.MapIndex(reflect.ValueOf(key)).Interface() - } else { - log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name not found") - return nil, errors.New("parameter name not found") - } - } - } else if elem.Kind() == reflect.Slice { - // e.g. [["test1", "passwd1"], ["test2", "passwd2"]] -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] - if len(parameterNameSlice) != elem.Len() { - log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") - return nil, errors.New("parameter name Slice and parameter cjntent Slice should have the same length") - } else { - for j := 0; j < elem.Len(); j++ { - parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface() - } - } - } else { - // e.g. ${getAppVersion()} -> [3.1, 3.0] -> [{"app_version": 3.1}, {"app_version": 3.0}] - if len(parameterNameSlice) != 1 { - log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string") - return nil, errors.New("parameter name slice should have only one element when parameter content is string") - } - parameterMap[parameterNameSlice[0]] = elem.Interface() - } - parameterSlice = append(parameterSlice, parameterMap) - } + parameterSlice, err = handleSlice(k, parsedParameterRawValue.Interface()) case reflect.Slice: - for i := 0; i < rawValue.Len(); i++ { - parameterMap := make(map[string]interface{}) - elem := reflect.ValueOf(rawValue.Index(i).Interface()) - if elem.Kind() == reflect.Slice { - // e.g. username-password: [["test1", "passwd1"], ["test2", "passwd2"]] - if len(parameterNameSlice) != elem.Len() { - log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") - return nil, errors.New("parameter name Slice and parameter content Slice should have the same length") - } - for j := 0; j < elem.Len(); j++ { - parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface() - } - } else { - // e.g. user_agent: ["iOS/10.1", "iOS/10.2"] - if len(parameterNameSlice) != 1 { - log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string") - return nil, errors.New("parameter name slice should have only one element when parameter content is string") - } - parameterMap[parameterNameSlice[0]] = elem.Interface() - } - parameterSlice = append(parameterSlice, parameterMap) - } + parameterSlice, err = handleSlice(k, rawValue.Interface()) default: log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be Slice or Text(variables or functions call)") return nil, errors.New("parameter content should be Slice or Text(variables or functions call)") } + if err != nil { + return nil, err + } parsedParametersSlice = append(parsedParametersSlice, parameterSlice) } return genCartesianProduct(parsedParametersSlice), nil } + +func handleSlice(parameterName string, parameterContent interface{}) ([]map[string]interface{}, error) { + parameterNameSlice := strings.Split(parameterName, "-") + var parameterSlice []map[string]interface{} + parameterContentSlice := reflect.ValueOf(parameterContent) + for i := 0; i < parameterContentSlice.Len(); i++ { + parameterMap := make(map[string]interface{}) + elem := reflect.ValueOf(parameterContentSlice.Index(i).Interface()) + switch elem.Kind() { + case reflect.Map: + // e.g. "username-password": [{"username": "test1", "password": "passwd1", "other": "111"}, {"username": "test2", "password": "passwd2", "other": ""222}] + // -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] + for _, key := range parameterNameSlice { + if _, ok := elem.Interface().(map[string]interface{})[key]; ok { + parameterMap[key] = elem.MapIndex(reflect.ValueOf(key)).Interface() + } else { + log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name not found") + return nil, errors.New("parameter name not found") + } + } + case reflect.Slice: + // e.g. "username-password": [["test1", "passwd1"], ["test2", "passwd2"]] + // -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] + if len(parameterNameSlice) != elem.Len() { + log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") + return nil, errors.New("parameter name Slice and parameter cjntent Slice should have the same length") + } else { + for j := 0; j < elem.Len(); j++ { + parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface() + } + } + default: + // e.g. "app_version": [3.1, 3.0] + // -> [{"app_version": 3.1}, {"app_version": 3.0}] + if len(parameterNameSlice) != 1 { + log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string") + return nil, errors.New("parameter name slice should have only one element when parameter content is string") + } + parameterMap[parameterNameSlice[0]] = elem.Interface() + } + parameterSlice = append(parameterSlice, parameterMap) + } + return parameterSlice, nil +} diff --git a/parser_test.go b/parser_test.go index cb1bcd8f..c69a584d 100644 --- a/parser_test.go +++ b/parser_test.go @@ -691,3 +691,42 @@ func TestParseParametersError(t *testing.T) { } } } + +func TestHandleSlice(t *testing.T) { + testData := []struct { + rawVar1 string + rawVar2 interface{} + expect []map[string]interface{} + }{ + { + "username-password", + []map[string]interface{}{{"username": "test1", "password": 111111, "other": "111"}, {"username": "test2", "password": 222222, "other": "222"}}, + []map[string]interface{}{ + {"username": "test1", "password": 111111}, + {"username": "test2", "password": 222222}, + }, + }, + { + "username-password", + [][]string{{"test1", "111111"}, {"test2", "222222"}}, + []map[string]interface{}{ + {"username": "test1", "password": "111111"}, + {"username": "test2", "password": "222222"}, + }, + }, + { + "app_version", + []float64{3.1, 3.0}, + []map[string]interface{}{ + {"app_version": 3.1}, + {"app_version": 3.0}, + }, + }, + } + for _, data := range testData { + value, _ := handleSlice(data.rawVar1, data.rawVar2) + if !assert.Equal(t, data.expect, value) { + t.Fail() + } + } +} From e3b481a273e34f411de1d57fa219852b832160db Mon Sep 17 00:00:00 2001 From: buyuxiang Date: Thu, 30 Dec 2021 18:27:58 +0800 Subject: [PATCH 15/42] complete the comment of builtin.Contains Change-Id: I949e2ccda53960dd12f64bda3c9c69513f59d4ed --- internal/builtin/assertion.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/builtin/assertion.go b/internal/builtin/assertion.go index 87e4709b..20813392 100644 --- a/internal/builtin/assertion.go +++ b/internal/builtin/assertion.go @@ -87,7 +87,7 @@ func convertInt(value interface{}) (int, error) { } } -// Contains assert whether actual +// Contains assert whether actual element contains expected element func Contains(t assert.TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool { return assert.Contains(t, actual, expected, msgAndArgs) } From e5608f77581dc8e67aab1d3bc938d2ddb7fe80da Mon Sep 17 00:00:00 2001 From: buyuxiang Date: Thu, 30 Dec 2021 19:50:55 +0800 Subject: [PATCH 16/42] chore: add BUILTIN.md, append CHANGELOG.md Change-Id: I12e0c6ba3621d383fa46a811abbdcd55dbf80a17 --- docs/BUILTIN.md | 44 ++++++++++++++++++++++++++++++++++++ docs/CHANGELOG.md | 2 ++ internal/builtin/function.go | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 docs/BUILTIN.md diff --git a/docs/BUILTIN.md b/docs/BUILTIN.md new file mode 100644 index 00000000..e90b0a04 --- /dev/null +++ b/docs/BUILTIN.md @@ -0,0 +1,44 @@ +# Builtin + +## Assertion Methods + +### Usage +In "teststeps" of each json/yaml testcase, the "validate" part contains four fields: "check", "assert", "expect" and +"msg", when using assertion methods, method name should be put in "assert" field. The assertion result of "check" +element will be checked out using the regulation you put in "assert" field and compared with the element in "expect" +field. + +### Method List + +- equals: assert the element to check equals the expected element. +- equal: alias for equals. +- greater_than: assert the element to check is greater than the expected element. +- less_than: assert the element to check is less than the expected element. +- greater_or_equals: assert the element to check is greater than or equal with the expected element. +- less_or_equals: assert the element to check is less than or equal with the expected element. +- not_equal: assert the element to check is not equal with the expected element. +- contained_by: assert the expected element contains the element to check. +- regex_match: assert the element to check matches the expected element using regex. +- type_match: assert the element to check matches the expected element in type. +- startswith: assert the element to check starts with the expected element. +- endswith: assert the element to check ends with the expected element. +- length_equals: assert the length of the element to check is equal with the expected element. +- length_equal: alias for length_equals. +- contains: assert the element to check contains the expected element. +- string_equals: assert the string is equal with the expected string. + +## Common Functions + +### Usage +The common functions are useful during the variables configuration, you can use "${FUNCTION_NAME}" to call the specific +function to define variables. + +### Function List +- get_timestamp: get the thirteen-digit timestamp of current time. (call without argument) +- sleep: sleep n seconds to simulate the thinking time. (call with one argument n) +- gen_random_string: get the n-digit random string. (call with one argument n) +- max: get the maximum of two numbers m and n. (call with two argument m and n) +- md5: get the MD5 of the input string s. (call with one argument s) + + + diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 67354670..d428e4f1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,7 @@ # Release History +-feat: add more plentiful response assertion methods + ## v0.3.0 (2021-12-22) - feat: implement `transaction` mechanism for load test diff --git a/internal/builtin/function.go b/internal/builtin/function.go index d1d3dd3b..e11529eb 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -13,7 +13,7 @@ var Functions = map[string]interface{}{ "sleep": sleep, // call with one argument "gen_random_string": genRandomString, // call with one argument "max": math.Max, // call with two arguments - "md5": MD5, + "md5": MD5, // call with one argument } func init() { From 57816f504bab0ac60e057a426fb4f22dfeed3e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Thu, 30 Dec 2021 21:28:05 +0800 Subject: [PATCH 17/42] feat: data-driven. --- boomer.go | 17 +++++---- examples/parameters_test.json | 7 +--- examples/parameters_test.yaml | 1 + models.go | 53 +++++++++++++++++++++++++- parser.go | 72 ++++++++++++++++++----------------- parser_test.go | 26 ++++++++++++- runner.go | 22 ++++++++--- 7 files changed, 141 insertions(+), 57 deletions(-) diff --git a/boomer.go b/boomer.go index 08644c6e..6e973d83 100644 --- a/boomer.go +++ b/boomer.go @@ -46,15 +46,12 @@ func (b *hrpBoomer) Run(testcases ...ITestCase) { panic(err) } cfg := testcase.Config.ToStruct() - parameters := getParameters(testcase.Config) - if parameters == nil { - parameters = []map[string]interface{}{{}} - } - for _, parameter := range parameters { - cfg.Variables = mergeVariables(parameter, cfg.Variables) - task := b.convertBoomerTask(testcase) - taskSlice = append(taskSlice, task) + err = initParameterIterator(cfg, "boomer") + if err != nil { + panic(err) } + task := b.convertBoomerTask(testcase) + taskSlice = append(taskSlice, task) } b.Boomer.Run(taskSlice...) } @@ -71,6 +68,10 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { testcaseSuccess := true // flag whole testcase result var transactionSuccess = true // flag current transaction result + cfg := testcase.Config.ToStruct() + if it := cfg.ParameterIterator; it.HasNext() { + cfg.Variables = mergeVariables(it.Next(), cfg.Variables) + } startTime := time.Now() for index, step := range testcase.TestSteps { stepData, err := runner.runStep(index) diff --git a/examples/parameters_test.json b/examples/parameters_test.json index c519e928..d61fd85f 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -6,14 +6,11 @@ "iOS/10.1", "iOS/10.2" ], - "username1-password1": [ - ["a", "123"], - ["b", "456"] - ], "username-password": "${parameterize(examples/account.csv)}" }, "parameters_setting": { - "strategy": "random" + "strategy": "random", + "iteration": 1 }, "variables": { "app_version": "f1" diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 65c307a8..b19ddcf4 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -5,6 +5,7 @@ config: username-password: ${parameterize(examples/account.csv)} parameters_setting: strategy: random + iteration: 1 variables: app_version: f1 base_url: "https://postman-echo.com" diff --git a/models.go b/models.go index d587a9c0..9ded19c3 100644 --- a/models.go +++ b/models.go @@ -1,5 +1,11 @@ package hrp +import ( + "math/rand" + "strings" + "time" +) + const ( httpGET string = "GET" httpHEAD string = "HEAD" @@ -18,11 +24,56 @@ type TConfig struct { BaseURL string `json:"base_url,omitempty" yaml:"base_url,omitempty"` Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"` Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"` - ParametersSetting map[string]interface{} `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"` + ParametersSetting *TParamsConfig `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"` + ParameterIterator *Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` Export []string `json:"export,omitempty" yaml:"export,omitempty"` Weight int `json:"weight,omitempty" yaml:"weight,omitempty"` } +type TParamsConfig struct { + Strategy string `json:"strategy,omitempty" yaml:"strategy,omitempty"` + Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"` +} + +type paramsType []map[string]interface{} + +type Iterator struct { + data paramsType + strategy string + iteration int + index int +} + +func (params paramsType) Iterator() *Iterator { + return &Iterator{ + data: params, + iteration: len(params), + index: 0, + } +} + +func (iter *Iterator) HasNext() bool { + if iter.iteration == -1 { + return true + } + return iter.index < iter.iteration +} + +func (iter *Iterator) Next() (value map[string]interface{}) { + iter.index++ + if len(iter.data) == 0 { + return map[string]interface{}{} + } + if strings.ToLower(iter.strategy) == "random" { + randSource := rand.New(rand.NewSource(time.Now().Unix())) + randIndex := randSource.Intn(len(iter.data)) + value = iter.data[randIndex] + } else { + value = iter.data[iter.index%len(iter.data)] + } + return value +} + // Request represents HTTP request data structure. // This is used for teststep. type Request struct { diff --git a/parser.go b/parser.go index cc92fde8..7f34539b 100644 --- a/parser.go +++ b/parser.go @@ -3,16 +3,13 @@ package hrp import ( "encoding/json" "fmt" - "math/rand" + "github.com/maja42/goval" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" "net/url" "reflect" "regexp" "strings" - "time" - - "github.com/maja42/goval" - "github.com/pkg/errors" - "github.com/rs/zerolog/log" "github.com/httprunner/hrp/internal/builtin" ) @@ -496,19 +493,6 @@ func findallVariables(raw string) variableSet { return varSet } -func shuffleCartesianProduct(slice []map[string]interface{}) { - if len(slice) == 0 { - return - } - r := rand.New(rand.NewSource(time.Now().Unix())) - for len(slice) > 0 { - n := len(slice) - randIndex := r.Intn(n) - slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1] - slice = slice[:n-1] - } -} - func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { if len(params) == 0 { return nil @@ -527,19 +511,6 @@ func genCartesianProduct(params [][]map[string]interface{}) []map[string]interfa return cartesianProduct } -func getParameters(config IConfig) []map[string]interface{} { - cfg := config.ToStruct() - // parse config parameters - parsedParams, err := parseParameters(cfg.Parameters, cfg.Variables) - if err != nil { - log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed") - } - if cfg.ParametersSetting["strategy"] != nil && strings.ToLower(cfg.ParametersSetting["strategy"].(string)) == "random" { - shuffleCartesianProduct(parsedParams) - } - return parsedParams -} - func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) { if len(parameters) == 0 { return nil, nil @@ -562,9 +533,9 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str log.Error().Interface("parameterContent", parsedParameterRawValue).Msg("[parseParameters] parsed parameter content should be Slice, got %v") return nil, errors.New("parsed parameter content should be Slice") } - parameterSlice, err = handleSlice(k, parsedParameterRawValue.Interface()) + parameterSlice, err = parseSlice(k, parsedParameterRawValue.Interface()) case reflect.Slice: - parameterSlice, err = handleSlice(k, rawValue.Interface()) + parameterSlice, err = parseSlice(k, rawValue.Interface()) default: log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be Slice or Text(variables or functions call)") return nil, errors.New("parameter content should be Slice or Text(variables or functions call)") @@ -577,10 +548,13 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str return genCartesianProduct(parsedParametersSlice), nil } -func handleSlice(parameterName string, parameterContent interface{}) ([]map[string]interface{}, error) { +func parseSlice(parameterName string, parameterContent interface{}) ([]map[string]interface{}, error) { parameterNameSlice := strings.Split(parameterName, "-") var parameterSlice []map[string]interface{} parameterContentSlice := reflect.ValueOf(parameterContent) + if parameterContentSlice.Kind() != reflect.Slice { + return nil, errors.New("parameterContent should be Slice") + } for i := 0; i < parameterContentSlice.Len(); i++ { parameterMap := make(map[string]interface{}) elem := reflect.ValueOf(parameterContentSlice.Index(i).Interface()) @@ -620,3 +594,31 @@ func handleSlice(parameterName string, parameterContent interface{}) ([]map[stri } return parameterSlice, nil } + +func initParameterIterator(cfg *TConfig, mode string) (err error) { + var parameters paramsType + parameters, err = parseParameters(cfg.Parameters, cfg.Variables) + cfg.ParameterIterator = parameters.Iterator() + if err != nil { + return err + } + // parse config parameters setting + if cfg.ParametersSetting == nil { + cfg.ParametersSetting = &TParamsConfig{} + } + if len(cfg.ParametersSetting.Strategy) == 0 { + cfg.ParametersSetting.Strategy = "sequential" + } else { + cfg.ParametersSetting.Strategy = strings.ToLower(cfg.ParametersSetting.Strategy) + } + cfg.ParameterIterator.strategy = cfg.ParametersSetting.Strategy + if mode == "boomer" { + cfg.ParametersSetting.Iteration = -1 + cfg.ParameterIterator.iteration = cfg.ParametersSetting.Iteration + } else { + if cfg.ParametersSetting.Iteration != 0 { + cfg.ParameterIterator.iteration = cfg.ParametersSetting.Iteration + } + } + return nil +} diff --git a/parser_test.go b/parser_test.go index c69a584d..a8d4bdea 100644 --- a/parser_test.go +++ b/parser_test.go @@ -692,7 +692,7 @@ func TestParseParametersError(t *testing.T) { } } -func TestHandleSlice(t *testing.T) { +func TestParseSlice(t *testing.T) { testData := []struct { rawVar1 string rawVar2 interface{} @@ -724,9 +724,31 @@ func TestHandleSlice(t *testing.T) { }, } for _, data := range testData { - value, _ := handleSlice(data.rawVar1, data.rawVar2) + value, _ := parseSlice(data.rawVar1, data.rawVar2) if !assert.Equal(t, data.expect, value) { t.Fail() } } } + +func TestParseSliceError(t *testing.T) { + testData := []struct { + rawVar1 string + rawVar2 interface{} + }{ + { + "app_version", + 123, + }, + { + "app_version", + "123", + }, + } + for _, data := range testData { + _, err := parseSlice(data.rawVar1, data.rawVar2) + if !assert.Error(t, err) { + t.Fail() + } + } +} diff --git a/runner.go b/runner.go index b33d44d3..f568c818 100644 --- a/runner.go +++ b/runner.go @@ -141,13 +141,17 @@ func (r *caseRunner) run() error { if err := r.parseConfig(config); err != nil { return err } + cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") - r.startTime = time.Now() - for index := range r.TestCase.TestSteps { - _, err := r.runStep(index) - if err != nil { - if r.hrpRunner.failfast { - return errors.Wrap(err, "abort running due to failfast setting") + for it := cfg.ParameterIterator; it.HasNext(); { + cfg.Variables = mergeVariables(it.Next(), cfg.Variables) + r.startTime = time.Now() + for index := range r.TestCase.TestSteps { + _, err := r.runStep(index) + if err != nil { + if r.hrpRunner.failfast { + return errors.Wrap(err, "abort running due to failfast setting") + } } } } @@ -482,6 +486,12 @@ func (r *caseRunner) parseConfig(config IConfig) error { return err } cfg.Variables = parsedVariables + // parse config parameters + err = initParameterIterator(cfg, "runner") + if err != nil { + log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed") + return err + } // parse config name parsedName, err := parseString(cfg.Name, cfg.Variables) if err != nil { From cfc46b0a63c1aff5891936d4696476ae01acdf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Thu, 30 Dec 2021 22:31:39 +0800 Subject: [PATCH 18/42] feat: data-driven. --- boomer.go | 2 +- convert.go | 5 +++-- internal/builtin/function.go | 9 +++++---- models.go | 16 ++++++++++------ parser.go | 35 +++++++++++++++++++---------------- runner.go | 2 +- 6 files changed, 39 insertions(+), 30 deletions(-) diff --git a/boomer.go b/boomer.go index 6e973d83..48593fbd 100644 --- a/boomer.go +++ b/boomer.go @@ -69,7 +69,7 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { var transactionSuccess = true // flag current transaction result cfg := testcase.Config.ToStruct() - if it := cfg.ParameterIterator; it.HasNext() { + if it := cfg.ParametersSetting.Iterator; it.HasNext() { cfg.Variables = mergeVariables(it.Next(), cfg.Variables) } startTime := time.Now() diff --git a/convert.go b/convert.go index 7cdedfae..7f1bc830 100644 --- a/convert.go +++ b/convert.go @@ -4,10 +4,11 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/rs/zerolog/log" - "gopkg.in/yaml.v3" "io/ioutil" "path/filepath" + + "github.com/rs/zerolog/log" + "gopkg.in/yaml.v3" ) func (tc *TCase) Dump2JSON(path string) error { diff --git a/internal/builtin/function.go b/internal/builtin/function.go index 8d6fd87e..f4f7aaae 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -4,13 +4,14 @@ import ( "crypto/md5" "encoding/csv" "encoding/hex" - "github.com/rs/zerolog/log" "io/ioutil" "math" "math/rand" "path/filepath" "strings" "time" + + "github.com/rs/zerolog/log" ) var Functions = map[string]interface{}{ @@ -19,8 +20,8 @@ var Functions = map[string]interface{}{ "gen_random_string": genRandomString, // call with one argument "max": math.Max, // call with two arguments "md5": MD5, - "parameterize": LoadFromCSV, - "P": LoadFromCSV, + "parameterize": loadFromCSV, + "P": loadFromCSV, } func init() { @@ -52,7 +53,7 @@ func MD5(str string) string { return hex.EncodeToString(hasher.Sum(nil)) } -func LoadFromCSV(path string) []map[string]interface{} { +func loadFromCSV(path string) []map[string]interface{} { path, err := filepath.Abs(path) if err != nil { log.Error().Str("path", path).Err(err).Msg("convert absolute path failed") diff --git a/models.go b/models.go index 9ded19c3..0fb93199 100644 --- a/models.go +++ b/models.go @@ -2,7 +2,6 @@ package hrp import ( "math/rand" - "strings" "time" ) @@ -25,21 +24,26 @@ type TConfig struct { Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"` Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"` ParametersSetting *TParamsConfig `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"` - ParameterIterator *Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` Export []string `json:"export,omitempty" yaml:"export,omitempty"` Weight int `json:"weight,omitempty" yaml:"weight,omitempty"` } type TParamsConfig struct { - Strategy string `json:"strategy,omitempty" yaml:"strategy,omitempty"` - Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"` + Strategy string `json:"strategy,omitempty" yaml:"strategy,omitempty"` + Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"` + Iterator *Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` } +const ( + strategyRandom string = "random" + strategySequential string = "Sequential" +) + type paramsType []map[string]interface{} type Iterator struct { data paramsType - strategy string + strategy string // random, sequential iteration int index int } @@ -64,7 +68,7 @@ func (iter *Iterator) Next() (value map[string]interface{}) { if len(iter.data) == 0 { return map[string]interface{}{} } - if strings.ToLower(iter.strategy) == "random" { + if iter.strategy == strategyRandom { randSource := rand.New(rand.NewSource(time.Now().Unix())) randIndex := randSource.Intn(len(iter.data)) value = iter.data[randIndex] diff --git a/parser.go b/parser.go index 7f34539b..389111a3 100644 --- a/parser.go +++ b/parser.go @@ -3,14 +3,15 @@ package hrp import ( "encoding/json" "fmt" - "github.com/maja42/goval" - "github.com/pkg/errors" - "github.com/rs/zerolog/log" "net/url" "reflect" "regexp" "strings" + "github.com/maja42/goval" + "github.com/pkg/errors" + "github.com/rs/zerolog/log" + "github.com/httprunner/hrp/internal/builtin" ) @@ -522,23 +523,25 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str rawValue := reflect.ValueOf(v) switch rawValue.Kind() { case reflect.String: + // e.g. username-password: ${parameterize(examples/account.csv)} -> [{"username": "test1", "password": "111111"}, {"username": "test2", "password": "222222"}] var parsedParameterContent interface{} - parsedParameterContent, err = parseData(rawValue.Interface(), variablesMapping) + parsedParameterContent, err = parseString(rawValue.String(), variablesMapping) if err != nil { log.Error().Interface("parameterContent", rawValue).Msg("[parseParameters] parse parameter content error") return nil, err } parsedParameterRawValue := reflect.ValueOf(parsedParameterContent) if parsedParameterRawValue.Kind() != reflect.Slice { - log.Error().Interface("parameterContent", parsedParameterRawValue).Msg("[parseParameters] parsed parameter content should be Slice, got %v") - return nil, errors.New("parsed parameter content should be Slice") + log.Error().Interface("parameterContent", parsedParameterRawValue).Msg("[parseParameters] parsed parameter content should be slice") + return nil, errors.New("parsed parameter content should be slice") } parameterSlice, err = parseSlice(k, parsedParameterRawValue.Interface()) case reflect.Slice: + // e.g. user_agent: ["iOS/10.1", "iOS/10.2"] -> [{"user_agent": "iOS/10.1"}, {"user_agent": "iOS/10.2"}] parameterSlice, err = parseSlice(k, rawValue.Interface()) default: - log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be Slice or Text(variables or functions call)") - return nil, errors.New("parameter content should be Slice or Text(variables or functions call)") + log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be slice or text(functions call)") + return nil, errors.New("parameter content should be slice or text(functions call)") } if err != nil { return nil, err @@ -553,7 +556,7 @@ func parseSlice(parameterName string, parameterContent interface{}) ([]map[strin var parameterSlice []map[string]interface{} parameterContentSlice := reflect.ValueOf(parameterContent) if parameterContentSlice.Kind() != reflect.Slice { - return nil, errors.New("parameterContent should be Slice") + return nil, errors.New("parameterContent should be slice") } for i := 0; i < parameterContentSlice.Len(); i++ { parameterMap := make(map[string]interface{}) @@ -574,8 +577,8 @@ func parseSlice(parameterName string, parameterContent interface{}) ([]map[strin // e.g. "username-password": [["test1", "passwd1"], ["test2", "passwd2"]] // -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] if len(parameterNameSlice) != elem.Len() { - log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length") - return nil, errors.New("parameter name Slice and parameter cjntent Slice should have the same length") + log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name slice and parameter content slice should have the same length") + return nil, errors.New("parameter name slice and parameter content slice should have the same length") } else { for j := 0; j < elem.Len(); j++ { parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface() @@ -598,7 +601,7 @@ func parseSlice(parameterName string, parameterContent interface{}) ([]map[strin func initParameterIterator(cfg *TConfig, mode string) (err error) { var parameters paramsType parameters, err = parseParameters(cfg.Parameters, cfg.Variables) - cfg.ParameterIterator = parameters.Iterator() + cfg.ParametersSetting.Iterator = parameters.Iterator() if err != nil { return err } @@ -607,17 +610,17 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { cfg.ParametersSetting = &TParamsConfig{} } if len(cfg.ParametersSetting.Strategy) == 0 { - cfg.ParametersSetting.Strategy = "sequential" + cfg.ParametersSetting.Strategy = strategySequential } else { cfg.ParametersSetting.Strategy = strings.ToLower(cfg.ParametersSetting.Strategy) } - cfg.ParameterIterator.strategy = cfg.ParametersSetting.Strategy + cfg.ParametersSetting.Iterator.strategy = cfg.ParametersSetting.Strategy if mode == "boomer" { cfg.ParametersSetting.Iteration = -1 - cfg.ParameterIterator.iteration = cfg.ParametersSetting.Iteration + cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration } else { if cfg.ParametersSetting.Iteration != 0 { - cfg.ParameterIterator.iteration = cfg.ParametersSetting.Iteration + cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration } } return nil diff --git a/runner.go b/runner.go index f568c818..c227064a 100644 --- a/runner.go +++ b/runner.go @@ -143,7 +143,7 @@ func (r *caseRunner) run() error { } cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") - for it := cfg.ParameterIterator; it.HasNext(); { + for it := cfg.ParametersSetting.Iterator; it.HasNext(); { cfg.Variables = mergeVariables(it.Next(), cfg.Variables) r.startTime = time.Now() for index := range r.TestCase.TestSteps { From 6e5d8ca77a670038aa6de1d9b284a13411f41cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 11:03:55 +0800 Subject: [PATCH 19/42] feat: data-driven. --- parser.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parser.go b/parser.go index 389111a3..19a866d4 100644 --- a/parser.go +++ b/parser.go @@ -607,7 +607,7 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } // parse config parameters setting if cfg.ParametersSetting == nil { - cfg.ParametersSetting = &TParamsConfig{} + cfg.ParametersSetting = &TParamsConfig{Iterator: &Iterator{}} } if len(cfg.ParametersSetting.Strategy) == 0 { cfg.ParametersSetting.Strategy = strategySequential @@ -619,7 +619,7 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { cfg.ParametersSetting.Iteration = -1 cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration } else { - if cfg.ParametersSetting.Iteration != 0 { + if cfg.ParametersSetting.Iteration > 0 { cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration } } From e84f1367bb9fb632ce62b280bce89a704637c641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 11:24:06 +0800 Subject: [PATCH 20/42] feat: data-driven. --- parser.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parser.go b/parser.go index 19a866d4..395b8972 100644 --- a/parser.go +++ b/parser.go @@ -601,14 +601,14 @@ func parseSlice(parameterName string, parameterContent interface{}) ([]map[strin func initParameterIterator(cfg *TConfig, mode string) (err error) { var parameters paramsType parameters, err = parseParameters(cfg.Parameters, cfg.Variables) - cfg.ParametersSetting.Iterator = parameters.Iterator() - if err != nil { - return err - } // parse config parameters setting if cfg.ParametersSetting == nil { cfg.ParametersSetting = &TParamsConfig{Iterator: &Iterator{}} } + cfg.ParametersSetting.Iterator = parameters.Iterator() + if err != nil { + return err + } if len(cfg.ParametersSetting.Strategy) == 0 { cfg.ParametersSetting.Strategy = strategySequential } else { From 0158e9e7ba5655d3702ba45fd15013a2fac78501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 12:02:38 +0800 Subject: [PATCH 21/42] feat: data-driven. --- parser.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parser.go b/parser.go index 395b8972..9cd49a00 100644 --- a/parser.go +++ b/parser.go @@ -621,6 +621,8 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } else { if cfg.ParametersSetting.Iteration > 0 { cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration + } else if cfg.ParametersSetting.Iterator.iteration == 0 { + cfg.ParametersSetting.Iterator.iteration = 1 } } return nil From b8e9f320eb55c4720c285110eb66c92f03331c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 14:24:19 +0800 Subject: [PATCH 22/42] feat: data-driven. --- parser_test.go | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/parser_test.go b/parser_test.go index a8d4bdea..b66c5f79 100644 --- a/parser_test.go +++ b/parser_test.go @@ -621,44 +621,39 @@ func TestFindallVariables(t *testing.T) { func TestParseParameters(t *testing.T) { testData := []struct { - rawVars map[string]interface{} - expectVars []map[string]interface{} + rawVars map[string]interface{} + expectLength int }{ { map[string]interface{}{ "username-password": "${parameterize(examples/account.csv)}", "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, - []map[string]interface{}{ - {"username": "test1", "password": "111111", "user_agent": "IOS/10.1"}, - {"username": "test1", "password": "111111", "user_agent": "IOS/10.2"}, - {"username": "test2", "password": "222222", "user_agent": "IOS/10.1"}, - {"username": "test2", "password": "222222", "user_agent": "IOS/10.2"}, - {"username": "test3", "password": "333333", "user_agent": "IOS/10.1"}, - {"username": "test3", "password": "333333", "user_agent": "IOS/10.2"}}, + 6, }, { map[string]interface{}{ "username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}}, "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, "app_version": []interface{}{0.3}}, - []map[string]interface{}{ - {"username": "test1", "password": "111111", "user_agent": "IOS/10.1", "app_version": 0.3}, - {"username": "test1", "password": "111111", "user_agent": "IOS/10.2", "app_version": 0.3}, - {"username": "test2", "password": "222222", "user_agent": "IOS/10.1", "app_version": 0.3}, - {"username": "test2", "password": "222222", "user_agent": "IOS/10.2", "app_version": 0.3}, - {"username": "test3", "password": "333333", "user_agent": "IOS/10.1", "app_version": 0.3}, - {"username": "test3", "password": "333333", "user_agent": "IOS/10.2", "app_version": 0.3}}, + 6, }, { - map[string]interface{}{}, nil, + map[string]interface{}{ + "username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}}, + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, + "app_version": []interface{}{0.3, 0.4, 0.5}}, + 18, }, { - nil, nil, + map[string]interface{}{}, 0, + }, + { + nil, 0, }, } for _, data := range testData { value, _ := parseParameters(data.rawVars, map[string]interface{}{}) - if !assert.Equal(t, data.expectVars, value) { + if !assert.Len(t, value, data.expectLength) { t.Fail() } } From 5d82873e1d5c52d7975e1569ea3673048a1b6840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 15:36:01 +0800 Subject: [PATCH 23/42] fix: avoid data racing. --- boomer.go | 10 ++++++++-- runner.go | 16 +++++----------- step_test.go | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/boomer.go b/boomer.go index 48593fbd..7096aee9 100644 --- a/boomer.go +++ b/boomer.go @@ -1,6 +1,7 @@ package hrp import ( + "github.com/jinzhu/copier" "time" "github.com/rs/zerolog/log" @@ -69,12 +70,17 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { var transactionSuccess = true // flag current transaction result cfg := testcase.Config.ToStruct() + testCaseVariables := &TConfig{} + // copy config to avoid data racing + if err := copier.Copy(testCaseVariables, cfg); err != nil { + log.Error().Err(err).Msg("copy config data failed") + } if it := cfg.ParametersSetting.Iterator; it.HasNext() { - cfg.Variables = mergeVariables(it.Next(), cfg.Variables) + testCaseVariables.Variables = mergeVariables(it.Next(), cfg.Variables) } startTime := time.Now() for index, step := range testcase.TestSteps { - stepData, err := runner.runStep(index) + stepData, err := runner.runStep(index, testCaseVariables) if err != nil { // step failed var elapsed int64 diff --git a/runner.go b/runner.go index c227064a..df33b966 100644 --- a/runner.go +++ b/runner.go @@ -147,7 +147,7 @@ func (r *caseRunner) run() error { cfg.Variables = mergeVariables(it.Next(), cfg.Variables) r.startTime = time.Now() for index := range r.TestCase.TestSteps { - _, err := r.runStep(index) + _, err := r.runStep(index, cfg) if err != nil { if r.hrpRunner.failfast { return errors.Wrap(err, "abort running due to failfast setting") @@ -160,8 +160,7 @@ func (r *caseRunner) run() error { return nil } -func (r *caseRunner) runStep(index int) (stepResult *stepData, err error) { - config := r.TestCase.Config +func (r *caseRunner) runStep(index int, caseConfig *TConfig) (stepResult *stepData, err error) { step := r.TestCase.TestSteps[index] // step type priority order: transaction > rendezvous > testcase > request @@ -181,23 +180,18 @@ func (r *caseRunner) runStep(index int) (stepResult *stepData, err error) { log.Error().Err(err).Msg("copy step data failed") return nil, err } - copiedConfig := &TConfig{} - if err = copier.Copy(copiedConfig, config.ToStruct()); err != nil { - log.Error().Err(err).Msg("copy config data failed") - return nil, err - } stepVariables := copiedStep.Variables // override variables // step variables > session variables (extracted variables from previous steps) stepVariables = mergeVariables(stepVariables, r.sessionVariables) // step variables > testcase config variables - stepVariables = mergeVariables(stepVariables, copiedConfig.Variables) + stepVariables = mergeVariables(stepVariables, caseConfig.Variables) // parse step variables parsedVariables, err := parseVariables(stepVariables) if err != nil { - log.Error().Interface("variables", copiedConfig.Variables).Err(err).Msg("parse step variables failed") + log.Error().Interface("variables", caseConfig.Variables).Err(err).Msg("parse step variables failed") return nil, err } copiedStep.Variables = parsedVariables // avoid data racing @@ -214,7 +208,7 @@ func (r *caseRunner) runStep(index int) (stepResult *stepData, err error) { } } else { // run request - copiedStep.Request.URL = buildURL(copiedConfig.BaseURL, copiedStep.Request.URL) // avoid data racing + copiedStep.Request.URL = buildURL(caseConfig.BaseURL, copiedStep.Request.URL) // avoid data racing stepResult, err = r.runStepRequest(copiedStep) if err != nil { log.Error().Err(err).Msg("run request step failed") diff --git a/step_test.go b/step_test.go index 5fdd3c02..d7e3ee17 100644 --- a/step_test.go +++ b/step_test.go @@ -79,10 +79,10 @@ func TestRunRequestRun(t *testing.T) { TestSteps: []IStep{stepGET, stepPOSTData}, } runner := NewRunner(t).SetDebug(true).newCaseRunner(testcase) - if _, err := runner.runStep(0); err != nil { + if _, err := runner.runStep(0, testcase.Config.ToStruct()); err != nil { t.Fatalf("tStep.Run() error: %s", err) } - if _, err := runner.runStep(1); err != nil { + if _, err := runner.runStep(1, testcase.Config.ToStruct()); err != nil { t.Fatalf("tStepPOSTData.Run() error: %s", err) } } From a60a6f6aefec2886ac457e59faed3d644c136cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 15:43:58 +0800 Subject: [PATCH 24/42] fix: avoid data racing. --- models.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/models.go b/models.go index 0fb93199..880d6756 100644 --- a/models.go +++ b/models.go @@ -2,6 +2,7 @@ package hrp import ( "math/rand" + "sync" "time" ) @@ -42,6 +43,7 @@ const ( type paramsType []map[string]interface{} type Iterator struct { + sync.Mutex data paramsType strategy string // random, sequential iteration int @@ -64,6 +66,8 @@ func (iter *Iterator) HasNext() bool { } func (iter *Iterator) Next() (value map[string]interface{}) { + iter.Lock() + defer iter.Unlock() iter.index++ if len(iter.data) == 0 { return map[string]interface{}{} From cd04c44a70a97f6ddde84fb415dd017e76dbadb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 15:50:21 +0800 Subject: [PATCH 25/42] feat: data-driven. --- boomer.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/boomer.go b/boomer.go index 7096aee9..f547938b 100644 --- a/boomer.go +++ b/boomer.go @@ -1,9 +1,10 @@ package hrp import ( - "github.com/jinzhu/copier" "time" + "github.com/jinzhu/copier" + "github.com/rs/zerolog/log" "github.com/httprunner/hrp/internal/boomer" @@ -70,17 +71,17 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { var transactionSuccess = true // flag current transaction result cfg := testcase.Config.ToStruct() - testCaseVariables := &TConfig{} + caseConfig := &TConfig{} // copy config to avoid data racing - if err := copier.Copy(testCaseVariables, cfg); err != nil { + if err := copier.Copy(caseConfig, cfg); err != nil { log.Error().Err(err).Msg("copy config data failed") } if it := cfg.ParametersSetting.Iterator; it.HasNext() { - testCaseVariables.Variables = mergeVariables(it.Next(), cfg.Variables) + caseConfig.Variables = mergeVariables(it.Next(), cfg.Variables) } startTime := time.Now() for index, step := range testcase.TestSteps { - stepData, err := runner.runStep(index, testCaseVariables) + stepData, err := runner.runStep(index, caseConfig) if err != nil { // step failed var elapsed int64 From 5d2e0c5636656797b7cb38958519d2d4d5280f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 16:31:50 +0800 Subject: [PATCH 26/42] feat: data-driven. --- examples/parameters_test.json | 7 ++++--- examples/parameters_test.yaml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/parameters_test.json b/examples/parameters_test.json index d61fd85f..e2325095 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -13,7 +13,8 @@ "iteration": 1 }, "variables": { - "app_version": "f1" + "app_version": "f1", + "user_agent": "iOS/10.3" }, "base_url": "https://postman-echo.com", "verify": false @@ -24,7 +25,7 @@ "variables": { "foo1": "$username", "foo2": "$password", - "foo3": "$app_version" + "foo3": "$user_agent" }, "request": { "method": "GET", @@ -48,7 +49,7 @@ { "check": "body.args.foo3", "assert": "not_equal", - "expect": "f1", + "expect": "iOS/10.3", "msg": "check app version" } ] diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index b19ddcf4..cdb4f627 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -8,6 +8,7 @@ config: iteration: 1 variables: app_version: f1 + user_agent: iOS/10.3 base_url: "https://postman-echo.com" verify: False @@ -17,7 +18,7 @@ teststeps: variables: foo1: $username foo2: $password - foo3: $app_version + foo3: $user_agent request: method: GET url: /get @@ -34,5 +35,5 @@ teststeps: msg: check status code - check: body.args.foo3 assert: not_equal - expect: f1 + expect: iOS/10.3 msg: check app version \ No newline at end of file From 57b6231d072e4c557dbf76be636464553ac4f054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 17:06:03 +0800 Subject: [PATCH 27/42] feat: data-driven. --- examples/parameters_test.json | 2 +- examples/parameters_test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/parameters_test.json b/examples/parameters_test.json index e2325095..e88cf8fb 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -13,7 +13,7 @@ "iteration": 1 }, "variables": { - "app_version": "f1", + "app_version": "v1", "user_agent": "iOS/10.3" }, "base_url": "https://postman-echo.com", diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index cdb4f627..9ef16dd1 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -7,7 +7,7 @@ config: strategy: random iteration: 1 variables: - app_version: f1 + app_version: v1 user_agent: iOS/10.3 base_url: "https://postman-echo.com" verify: False From 70cf171ee3de96bfeb4de1e57de06c47ca8ee4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 17:13:17 +0800 Subject: [PATCH 28/42] fix: avoid data racing. --- boomer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boomer.go b/boomer.go index f547938b..d196cc75 100644 --- a/boomer.go +++ b/boomer.go @@ -77,7 +77,7 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { log.Error().Err(err).Msg("copy config data failed") } if it := cfg.ParametersSetting.Iterator; it.HasNext() { - caseConfig.Variables = mergeVariables(it.Next(), cfg.Variables) + caseConfig.Variables = mergeVariables(it.Next(), caseConfig.Variables) } startTime := time.Now() for index, step := range testcase.TestSteps { From 6fd07a438839a61602860aa4d9e3fe1369a972d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 20:34:43 +0800 Subject: [PATCH 29/42] feat: data-driven. --- boomer.go | 6 ++- examples/parameters_test.json | 7 +++- examples/parameters_test.yaml | 65 ++++++++++++++++---------------- models.go | 8 ++-- parser.go | 71 +++++++++++++++++++++++------------ runner.go | 8 +++- 6 files changed, 98 insertions(+), 67 deletions(-) diff --git a/boomer.go b/boomer.go index d196cc75..eae914ea 100644 --- a/boomer.go +++ b/boomer.go @@ -76,8 +76,10 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { if err := copier.Copy(caseConfig, cfg); err != nil { log.Error().Err(err).Msg("copy config data failed") } - if it := cfg.ParametersSetting.Iterator; it.HasNext() { - caseConfig.Variables = mergeVariables(it.Next(), caseConfig.Variables) + for _, it := range cfg.ParametersSetting.Iterator { + if it.HasNext() { + caseConfig.Variables = mergeVariables(it.Next(), caseConfig.Variables) + } } startTime := time.Now() for index, step := range testcase.TestSteps { diff --git a/examples/parameters_test.json b/examples/parameters_test.json index e88cf8fb..61bc5ead 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -9,8 +9,11 @@ "username-password": "${parameterize(examples/account.csv)}" }, "parameters_setting": { - "strategy": "random", - "iteration": 1 + "strategy": [ + "random", + "sequential" + ], + "iteration": 10 }, "variables": { "app_version": "v1", diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 9ef16dd1..412acaab 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -1,39 +1,38 @@ config: - name: "request methods testcase: validate with parameters" - parameters: - user_agent: ["iOS/10.1", "iOS/10.2"] - username-password: ${parameterize(examples/account.csv)} - parameters_setting: - strategy: random - iteration: 1 - variables: - app_version: v1 - user_agent: iOS/10.3 - base_url: "https://postman-echo.com" - verify: False + name: "request methods testcase: validate with parameters" + parameters: + user_agent: [ "iOS/10.1", "iOS/10.2" ] + username-password: ${parameterize(examples/account.csv)} + parameters_setting: + strategy: ["random", "sequential"] + iteration: 10 + variables: + app_version: v1 + user_agent: iOS/10.3 + base_url: "https://postman-echo.com" + verify: False teststeps: -- - name: get with params + - name: get with params variables: - foo1: $username - foo2: $password - foo3: $user_agent + foo1: $username + foo2: $password + foo3: $user_agent request: - method: GET - url: /get - params: - foo1: $foo1 - foo2: $foo2 - foo3: $foo3 - headers: - User-Agent: $user_agent,$app_version + method: GET + url: /get + params: + foo1: $foo1 + foo2: $foo2 + foo3: $foo3 + headers: + User-Agent: $user_agent,$app_version validate: - - check: status_code - assert: equals - expect: 200 - msg: check status code - - check: body.args.foo3 - assert: not_equal - expect: iOS/10.3 - msg: check app version \ No newline at end of file + - check: status_code + assert: equals + expect: 200 + msg: check status code + - check: body.args.foo3 + assert: not_equal + expect: iOS/10.3 + msg: check app version \ No newline at end of file diff --git a/models.go b/models.go index 880d6756..839234e8 100644 --- a/models.go +++ b/models.go @@ -30,9 +30,9 @@ type TConfig struct { } type TParamsConfig struct { - Strategy string `json:"strategy,omitempty" yaml:"strategy,omitempty"` - Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"` - Iterator *Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` + Strategy interface{} `json:"strategy,omitempty" yaml:"strategy,omitempty"` + Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"` + Iterator []*Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` } const ( @@ -68,7 +68,6 @@ func (iter *Iterator) HasNext() bool { func (iter *Iterator) Next() (value map[string]interface{}) { iter.Lock() defer iter.Unlock() - iter.index++ if len(iter.data) == 0 { return map[string]interface{}{} } @@ -79,6 +78,7 @@ func (iter *Iterator) Next() (value map[string]interface{}) { } else { value = iter.data[iter.index%len(iter.data)] } + iter.index++ return value } diff --git a/parser.go b/parser.go index 9cd49a00..0a337f37 100644 --- a/parser.go +++ b/parser.go @@ -494,14 +494,14 @@ func findallVariables(raw string) variableSet { return varSet } -func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} { +func genCartesianProduct(params []paramsType) paramsType { if len(params) == 0 { return nil } - var cartesianProduct []map[string]interface{} + var cartesianProduct paramsType cartesianProduct = params[0] for i := 0; i < len(params)-1; i++ { - var tempProduct []map[string]interface{} + var tempProduct paramsType for _, param1 := range cartesianProduct { for _, param2 := range params[i+1] { tempProduct = append(tempProduct, mergeVariables(param1, param2)) @@ -512,14 +512,14 @@ func genCartesianProduct(params [][]map[string]interface{}) []map[string]interfa return cartesianProduct } -func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) { +func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]paramsType, error) { if len(parameters) == 0 { return nil, nil } - var parsedParametersSlice [][]map[string]interface{} + var parsedParametersSlice []paramsType var err error for k, v := range parameters { - var parameterSlice []map[string]interface{} + var parameterSlice paramsType rawValue := reflect.ValueOf(v) switch rawValue.Kind() { case reflect.String: @@ -548,7 +548,7 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str } parsedParametersSlice = append(parsedParametersSlice, parameterSlice) } - return genCartesianProduct(parsedParametersSlice), nil + return parsedParametersSlice, nil } func parseSlice(parameterName string, parameterContent interface{}) ([]map[string]interface{}, error) { @@ -599,31 +599,54 @@ func parseSlice(parameterName string, parameterContent interface{}) ([]map[strin } func initParameterIterator(cfg *TConfig, mode string) (err error) { - var parameters paramsType + var parameters []paramsType parameters, err = parseParameters(cfg.Parameters, cfg.Variables) - // parse config parameters setting - if cfg.ParametersSetting == nil { - cfg.ParametersSetting = &TParamsConfig{Iterator: &Iterator{}} - } - cfg.ParametersSetting.Iterator = parameters.Iterator() if err != nil { return err } - if len(cfg.ParametersSetting.Strategy) == 0 { - cfg.ParametersSetting.Strategy = strategySequential - } else { - cfg.ParametersSetting.Strategy = strings.ToLower(cfg.ParametersSetting.Strategy) + // parse config parameters setting + if cfg.ParametersSetting == nil { + cfg.ParametersSetting = &TParamsConfig{Iterator: []*Iterator{}} } - cfg.ParametersSetting.Iterator.strategy = cfg.ParametersSetting.Strategy if mode == "boomer" { cfg.ParametersSetting.Iteration = -1 - cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration - } else { - if cfg.ParametersSetting.Iteration > 0 { - cfg.ParametersSetting.Iterator.iteration = cfg.ParametersSetting.Iteration - } else if cfg.ParametersSetting.Iterator.iteration == 0 { - cfg.ParametersSetting.Iterator.iteration = 1 + } + rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy) + switch rawValue.Kind() { + case reflect.String: + if len(rawValue.String()) == 0 { + cfg.ParametersSetting.Strategy = strategySequential + } else { + cfg.ParametersSetting.Strategy = strings.ToLower(rawValue.String()) + } + cfg.ParametersSetting.Iterator = append( + cfg.ParametersSetting.Iterator, + newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), + ) + case reflect.Slice: + if len(parameters) != rawValue.Len() { + return errors.New("parameters and strategy should have the same length") + } else { + for i := 0; i < rawValue.Len(); i++ { + cfg.ParametersSetting.Iterator = append( + cfg.ParametersSetting.Iterator, + newIterator(parameters[i], rawValue.Index(i).Interface().(string), cfg.ParametersSetting.Iteration), + ) + } } } return nil } + +func newIterator(parameters paramsType, strategy string, iteration int) *Iterator { + it := parameters.Iterator() + it.strategy = strategy + if iteration > 0 { + it.iteration = iteration + } else if it.iteration == 0 { + it.iteration = 1 + } else { + it.iteration = -1 + } + return it +} diff --git a/runner.go b/runner.go index df33b966..d8f7543d 100644 --- a/runner.go +++ b/runner.go @@ -143,8 +143,12 @@ func (r *caseRunner) run() error { } cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") - for it := cfg.ParametersSetting.Iterator; it.HasNext(); { - cfg.Variables = mergeVariables(it.Next(), cfg.Variables) + for it := cfg.ParametersSetting.Iterator[0]; it.HasNext(); { + for _, it = range cfg.ParametersSetting.Iterator { + if it.HasNext() { + cfg.Variables = mergeVariables(it.Next(), cfg.Variables) + } + } r.startTime = time.Now() for index := range r.TestCase.TestSteps { _, err := r.runStep(index, cfg) From e80fa6f0a4bc5868d42e247940f7e9b4c0d1d0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 21:01:16 +0800 Subject: [PATCH 30/42] feat: data-driven. --- examples/parameters_test.yaml | 2 +- parser.go | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 412acaab..0eff1384 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -4,7 +4,7 @@ config: user_agent: [ "iOS/10.1", "iOS/10.2" ] username-password: ${parameterize(examples/account.csv)} parameters_setting: - strategy: ["random", "sequential"] + strategy: "" iteration: 10 variables: app_version: v1 diff --git a/parser.go b/parser.go index 0a337f37..0d5c70e6 100644 --- a/parser.go +++ b/parser.go @@ -613,16 +613,6 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy) switch rawValue.Kind() { - case reflect.String: - if len(rawValue.String()) == 0 { - cfg.ParametersSetting.Strategy = strategySequential - } else { - cfg.ParametersSetting.Strategy = strings.ToLower(rawValue.String()) - } - cfg.ParametersSetting.Iterator = append( - cfg.ParametersSetting.Iterator, - newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), - ) case reflect.Slice: if len(parameters) != rawValue.Len() { return errors.New("parameters and strategy should have the same length") @@ -634,6 +624,22 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { ) } } + case reflect.String: + if len(rawValue.String()) == 0 { + cfg.ParametersSetting.Strategy = strategySequential + } else { + cfg.ParametersSetting.Strategy = strings.ToLower(rawValue.String()) + } + cfg.ParametersSetting.Iterator = append( + cfg.ParametersSetting.Iterator, + newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), + ) + default: + cfg.ParametersSetting.Strategy = strategySequential + cfg.ParametersSetting.Iterator = append( + cfg.ParametersSetting.Iterator, + newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), + ) } return nil } From b61b396acc49e38c230d93b533e99da4fd9ea674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 21:14:33 +0800 Subject: [PATCH 31/42] feat: data-driven. --- models.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models.go b/models.go index 839234e8..cc55d77a 100644 --- a/models.go +++ b/models.go @@ -69,6 +69,7 @@ func (iter *Iterator) Next() (value map[string]interface{}) { iter.Lock() defer iter.Unlock() if len(iter.data) == 0 { + iter.index++ return map[string]interface{}{} } if iter.strategy == strategyRandom { From c0300a6e3aba662b6b28a0dfea237727d7b1f561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 21:19:56 +0800 Subject: [PATCH 32/42] feat: data-driven. --- parser_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parser_test.go b/parser_test.go index b66c5f79..f64ef7fc 100644 --- a/parser_test.go +++ b/parser_test.go @@ -652,7 +652,8 @@ func TestParseParameters(t *testing.T) { }, } for _, data := range testData { - value, _ := parseParameters(data.rawVars, map[string]interface{}{}) + params, _ := parseParameters(data.rawVars, map[string]interface{}{}) + value := genCartesianProduct(params) if !assert.Len(t, value, data.expectLength) { t.Fail() } From 481e87f0c58a622edcca376a88956d40d497fa01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 21:38:58 +0800 Subject: [PATCH 33/42] feat: data-driven. --- examples/parameters_test.yaml | 3 +-- parser.go | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 0eff1384..0f3d8c9d 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -4,8 +4,7 @@ config: user_agent: [ "iOS/10.1", "iOS/10.2" ] username-password: ${parameterize(examples/account.csv)} parameters_setting: - strategy: "" - iteration: 10 + strategy: ["random", "sequential"] variables: app_version: v1 user_agent: iOS/10.3 diff --git a/parser.go b/parser.go index 0d5c70e6..7180b3f8 100644 --- a/parser.go +++ b/parser.go @@ -614,6 +614,7 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy) switch rawValue.Kind() { case reflect.Slice: + // strategy: ["random", "sequential"] if len(parameters) != rawValue.Len() { return errors.New("parameters and strategy should have the same length") } else { @@ -625,6 +626,7 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } } case reflect.String: + // strategy: "random" if len(rawValue.String()) == 0 { cfg.ParametersSetting.Strategy = strategySequential } else { @@ -635,6 +637,7 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), ) default: + // default strategy: sequential cfg.ParametersSetting.Strategy = strategySequential cfg.ParametersSetting.Iterator = append( cfg.ParametersSetting.Iterator, @@ -645,14 +648,14 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } func newIterator(parameters paramsType, strategy string, iteration int) *Iterator { - it := parameters.Iterator() - it.strategy = strategy + iter := parameters.Iterator() + iter.strategy = strategy if iteration > 0 { - it.iteration = iteration - } else if it.iteration == 0 { - it.iteration = 1 - } else { - it.iteration = -1 + iter.iteration = iteration + } else if iteration < 0 { + iter.iteration = -1 + } else if iter.iteration == 0 { + iter.iteration = 1 } - return it + return iter } From 185c891c3f104fc5d2d18c6dd3ffc92aee9d053f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 21:39:34 +0800 Subject: [PATCH 34/42] feat: data-driven. --- examples/parameters_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 0f3d8c9d..412acaab 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -5,6 +5,7 @@ config: username-password: ${parameterize(examples/account.csv)} parameters_setting: strategy: ["random", "sequential"] + iteration: 10 variables: app_version: v1 user_agent: iOS/10.3 From 659b6021223b1ad8e8b0af91b0bff3333bfa4778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Tue, 4 Jan 2022 22:00:47 +0800 Subject: [PATCH 35/42] feat: data-driven. --- boomer.go | 3 ++- models.go | 2 +- parser.go | 21 +++++++++++---------- runner.go | 5 +++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/boomer.go b/boomer.go index eae914ea..5163fce5 100644 --- a/boomer.go +++ b/boomer.go @@ -76,7 +76,8 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { if err := copier.Copy(caseConfig, cfg); err != nil { log.Error().Err(err).Msg("copy config data failed") } - for _, it := range cfg.ParametersSetting.Iterator { + // iterate through all parameter iterators and update case variables + for _, it := range cfg.ParametersSetting.Iterators { if it.HasNext() { caseConfig.Variables = mergeVariables(it.Next(), caseConfig.Variables) } diff --git a/models.go b/models.go index cc55d77a..b7c7b915 100644 --- a/models.go +++ b/models.go @@ -32,7 +32,7 @@ type TConfig struct { type TParamsConfig struct { Strategy interface{} `json:"strategy,omitempty" yaml:"strategy,omitempty"` Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"` - Iterator []*Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` + Iterators []*Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` //保存参数的迭代器 } const ( diff --git a/parser.go b/parser.go index 7180b3f8..f56bf973 100644 --- a/parser.go +++ b/parser.go @@ -606,41 +606,42 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } // parse config parameters setting if cfg.ParametersSetting == nil { - cfg.ParametersSetting = &TParamsConfig{Iterator: []*Iterator{}} + cfg.ParametersSetting = &TParamsConfig{Iterators: []*Iterator{}} } + // boomer模式下不限制迭代次数 if mode == "boomer" { cfg.ParametersSetting.Iteration = -1 } rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy) switch rawValue.Kind() { case reflect.Slice: - // strategy: ["random", "sequential"] + // strategy: ["random", "sequential"], 每个参数对应一个迭代器，每个迭代器随机、顺序选取元素互不影响 if len(parameters) != rawValue.Len() { return errors.New("parameters and strategy should have the same length") } else { for i := 0; i < rawValue.Len(); i++ { - cfg.ParametersSetting.Iterator = append( - cfg.ParametersSetting.Iterator, + cfg.ParametersSetting.Iterators = append( + cfg.ParametersSetting.Iterators, newIterator(parameters[i], rawValue.Index(i).Interface().(string), cfg.ParametersSetting.Iteration), ) } } case reflect.String: - // strategy: "random" + // strategy: random, 仅生成一个的迭代器，该迭代器在参数笛卡尔积slice中随机选取元素 if len(rawValue.String()) == 0 { cfg.ParametersSetting.Strategy = strategySequential } else { cfg.ParametersSetting.Strategy = strings.ToLower(rawValue.String()) } - cfg.ParametersSetting.Iterator = append( - cfg.ParametersSetting.Iterator, + cfg.ParametersSetting.Iterators = append( + cfg.ParametersSetting.Iterators, newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), ) default: - // default strategy: sequential + // default strategy: sequential, 仅生成一个的迭代器，该迭代器在参数笛卡尔积slice中顺序选取元素 cfg.ParametersSetting.Strategy = strategySequential - cfg.ParametersSetting.Iterator = append( - cfg.ParametersSetting.Iterator, + cfg.ParametersSetting.Iterators = append( + cfg.ParametersSetting.Iterators, newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration), ) } diff --git a/runner.go b/runner.go index d8f7543d..07c32789 100644 --- a/runner.go +++ b/runner.go @@ -143,8 +143,9 @@ func (r *caseRunner) run() error { } cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") - for it := cfg.ParametersSetting.Iterator[0]; it.HasNext(); { - for _, it = range cfg.ParametersSetting.Iterator { + for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); { + // iterate through all parameter iterators and update case variables + for _, it = range cfg.ParametersSetting.Iterators { if it.HasNext() { cfg.Variables = mergeVariables(it.Next(), cfg.Variables) } From 5a153f7ff9c360f1dd0134c9ed58e5600c55bee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 11:35:37 +0800 Subject: [PATCH 36/42] feat: data-driven. --- boomer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boomer.go b/boomer.go index 5163fce5..9b07d098 100644 --- a/boomer.go +++ b/boomer.go @@ -77,7 +77,7 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task { log.Error().Err(err).Msg("copy config data failed") } // iterate through all parameter iterators and update case variables - for _, it := range cfg.ParametersSetting.Iterators { + for _, it := range caseConfig.ParametersSetting.Iterators { if it.HasNext() { caseConfig.Variables = mergeVariables(it.Next(), caseConfig.Variables) } From c3477bdcc3d341e417bde76c0b0f56bd305c29f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 11:46:30 +0800 Subject: [PATCH 37/42] feat: data-driven. --- runner.go | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/runner.go b/runner.go index 07c32789..c321b855 100644 --- a/runner.go +++ b/runner.go @@ -98,9 +98,19 @@ func (r *hrpRunner) Run(testcases ...ITestCase) error { log.Error().Err(err).Msg("[Run] convert ITestCase interface to TestCase struct failed") return err } - if err := r.newCaseRunner(testcase).run(); err != nil { - log.Error().Err(err).Msg("[Run] run testcase failed") - return err + cfg := testcase.Config.ToStruct() + for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); { + // iterate through all parameter iterators and update case variables + // iterate through all parameter iterators and update case variables + for _, it := range cfg.ParametersSetting.Iterators { + if it.HasNext() { + cfg.Variables = mergeVariables(it.Next(), cfg.Variables) + } + } + if err := r.newCaseRunner(testcase).run(); err != nil { + log.Error().Err(err).Msg("[Run] run testcase failed") + return err + } } } return nil @@ -143,20 +153,13 @@ func (r *caseRunner) run() error { } cfg := config.ToStruct() log.Info().Str("testcase", config.Name()).Msg("run testcase start") - for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); { - // iterate through all parameter iterators and update case variables - for _, it = range cfg.ParametersSetting.Iterators { - if it.HasNext() { - cfg.Variables = mergeVariables(it.Next(), cfg.Variables) - } - } - r.startTime = time.Now() - for index := range r.TestCase.TestSteps { - _, err := r.runStep(index, cfg) - if err != nil { - if r.hrpRunner.failfast { - return errors.Wrap(err, "abort running due to failfast setting") - } + + r.startTime = time.Now() + for index := range r.TestCase.TestSteps { + _, err := r.runStep(index, cfg) + if err != nil { + if r.hrpRunner.failfast { + return errors.Wrap(err, "abort running due to failfast setting") } } } From ca43c74cadf4dec4bfe8845b188121cd4a8356df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 11:53:14 +0800 Subject: [PATCH 38/42] feat: data-driven. --- runner.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runner.go b/runner.go index c321b855..ba3dd953 100644 --- a/runner.go +++ b/runner.go @@ -99,6 +99,12 @@ func (r *hrpRunner) Run(testcases ...ITestCase) error { return err } cfg := testcase.Config.ToStruct() + // parse config parameters + err = initParameterIterator(cfg, "runner") + if err != nil { + log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed") + return err + } for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); { // iterate through all parameter iterators and update case variables // iterate through all parameter iterators and update case variables @@ -488,12 +494,6 @@ func (r *caseRunner) parseConfig(config IConfig) error { return err } cfg.Variables = parsedVariables - // parse config parameters - err = initParameterIterator(cfg, "runner") - if err != nil { - log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed") - return err - } // parse config name parsedName, err := parseString(cfg.Name, cfg.Variables) if err != nil { From 698aea30829dc1e51c28adf4b601d68878aac2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 14:54:07 +0800 Subject: [PATCH 39/42] add each parameter selection strategy. --- examples/parameters_test.json | 8 ++++---- examples/parameters_test.yaml | 4 +++- parser.go | 23 ++++++++++++++--------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/examples/parameters_test.json b/examples/parameters_test.json index 61bc5ead..a2cb957c 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -9,10 +9,10 @@ "username-password": "${parameterize(examples/account.csv)}" }, "parameters_setting": { - "strategy": [ - "random", - "sequential" - ], + "strategy": { + "user_agent": "sequential", + "username-password": "random" + }, "iteration": 10 }, "variables": { diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index 412acaab..d15d6f18 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -4,7 +4,9 @@ config: user_agent: [ "iOS/10.1", "iOS/10.2" ] username-password: ${parameterize(examples/account.csv)} parameters_setting: - strategy: ["random", "sequential"] + strategy: + user_agent: "sequential" + username-password: "random" iteration: 10 variables: app_version: v1 diff --git a/parser.go b/parser.go index f56bf973..cf138389 100644 --- a/parser.go +++ b/parser.go @@ -494,10 +494,14 @@ func findallVariables(raw string) variableSet { return varSet } -func genCartesianProduct(params []paramsType) paramsType { - if len(params) == 0 { +func genCartesianProduct(paramsMap map[string]paramsType) paramsType { + if len(paramsMap) == 0 { return nil } + var params []paramsType + for _, v := range paramsMap { + params = append(params, v) + } var cartesianProduct paramsType cartesianProduct = params[0] for i := 0; i < len(params)-1; i++ { @@ -512,11 +516,11 @@ func genCartesianProduct(params []paramsType) paramsType { return cartesianProduct } -func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]paramsType, error) { +func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) (map[string]paramsType, error) { if len(parameters) == 0 { return nil, nil } - var parsedParametersSlice []paramsType + parsedParametersSlice := make(map[string]paramsType) var err error for k, v := range parameters { var parameterSlice paramsType @@ -546,7 +550,7 @@ func parseParameters(parameters map[string]interface{}, variablesMapping map[str if err != nil { return nil, err } - parsedParametersSlice = append(parsedParametersSlice, parameterSlice) + parsedParametersSlice[k] = parameterSlice } return parsedParametersSlice, nil } @@ -599,7 +603,7 @@ func parseSlice(parameterName string, parameterContent interface{}) ([]map[strin } func initParameterIterator(cfg *TConfig, mode string) (err error) { - var parameters []paramsType + var parameters map[string]paramsType parameters, err = parseParameters(cfg.Parameters, cfg.Variables) if err != nil { return err @@ -614,15 +618,16 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { } rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy) switch rawValue.Kind() { - case reflect.Slice: + case reflect.Map: // strategy: ["random", "sequential"], 每个参数对应一个迭代器，每个迭代器随机、顺序选取元素互不影响 if len(parameters) != rawValue.Len() { return errors.New("parameters and strategy should have the same length") } else { - for i := 0; i < rawValue.Len(); i++ { + for _, k := range rawValue.MapKeys() { + key := k.Convert(rawValue.Type().Key()) cfg.ParametersSetting.Iterators = append( cfg.ParametersSetting.Iterators, - newIterator(parameters[i], rawValue.Index(i).Interface().(string), cfg.ParametersSetting.Iteration), + newIterator(parameters[k.Interface().(string)], rawValue.MapIndex(key).String(), cfg.ParametersSetting.Iteration), ) } } From 406aab1dd8dcb6c764c1924cf0d2b0c66f7ef6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 15:12:18 +0800 Subject: [PATCH 40/42] add each parameter selection strategy. --- parser.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/parser.go b/parser.go index cf138389..ef10fab9 100644 --- a/parser.go +++ b/parser.go @@ -619,15 +619,19 @@ func initParameterIterator(cfg *TConfig, mode string) (err error) { rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy) switch rawValue.Kind() { case reflect.Map: - // strategy: ["random", "sequential"], 每个参数对应一个迭代器，每个迭代器随机、顺序选取元素互不影响 - if len(parameters) != rawValue.Len() { - return errors.New("parameters and strategy should have the same length") - } else { - for _, k := range rawValue.MapKeys() { - key := k.Convert(rawValue.Type().Key()) + // strategy: {"user_agent": "sequential", "username-password": "random"}, 每个参数对应一个迭代器，每个迭代器随机、顺序选取元素互不影响 + for k, v := range parameters { + if _, ok := rawValue.Interface().(map[string]interface{})[k]; ok { + // use strategy if configured cfg.ParametersSetting.Iterators = append( cfg.ParametersSetting.Iterators, - newIterator(parameters[k.Interface().(string)], rawValue.MapIndex(key).String(), cfg.ParametersSetting.Iteration), + newIterator(v, rawValue.MapIndex(reflect.ValueOf(k)).Interface().(string), cfg.ParametersSetting.Iteration), + ) + } else { + // use sequential strategy by default + cfg.ParametersSetting.Iterators = append( + cfg.ParametersSetting.Iterators, + newIterator(v, strategySequential, cfg.ParametersSetting.Iteration), ) } } From a315884b628cdeb7e9e2d87cd539b3d35916f260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 15:49:49 +0800 Subject: [PATCH 41/42] add each parameter selection strategy. --- boomer.go | 1 - runner.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/boomer.go b/boomer.go index 9b07d098..0976d134 100644 --- a/boomer.go +++ b/boomer.go @@ -4,7 +4,6 @@ import ( "time" "github.com/jinzhu/copier" - "github.com/rs/zerolog/log" "github.com/httprunner/hrp/internal/boomer" diff --git a/runner.go b/runner.go index ba3dd953..8faf84ef 100644 --- a/runner.go +++ b/runner.go @@ -105,8 +105,8 @@ func (r *hrpRunner) Run(testcases ...ITestCase) error { log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed") return err } + // 在runner模式下，指定整体策略，cfg.ParametersSetting.Iterators仅包含一个CartesianProduct的迭代器 for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); { - // iterate through all parameter iterators and update case variables // iterate through all parameter iterators and update case variables for _, it := range cfg.ParametersSetting.Iterators { if it.HasNext() { From abfea42a8f03300584f2cadcd467a41f52de8e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 5 Jan 2022 16:20:25 +0800 Subject: [PATCH 42/42] add each parameter selection strategy. --- examples/parameters_test.json | 2 +- examples/parameters_test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/parameters_test.json b/examples/parameters_test.json index a2cb957c..1a555593 100644 --- a/examples/parameters_test.json +++ b/examples/parameters_test.json @@ -13,7 +13,7 @@ "user_agent": "sequential", "username-password": "random" }, - "iteration": 10 + "iteration": 6 }, "variables": { "app_version": "v1", diff --git a/examples/parameters_test.yaml b/examples/parameters_test.yaml index d15d6f18..e2cabc91 100644 --- a/examples/parameters_test.yaml +++ b/examples/parameters_test.yaml @@ -7,7 +7,7 @@ config: strategy: user_agent: "sequential" username-password: "random" - iteration: 10 + iteration: 6 variables: app_version: v1 user_agent: iOS/10.3