feat: parse map data

examples/postman_echo/variables_test.go

@@ -0,0 +1,35 @@
+package postman_echo
+
+import (
+	"testing"
+
+	"github.com/httprunner/httpboomer"
+)
+
+func TestCaseVariables(t *testing.T) {
+	testcase := &httpboomer.TestCase{
+		Config: httpboomer.TConfig{
+			Name:    "run request with variables",
+			BaseURL: "https://postman-echo.com",
+			Verify:  false,
+		},
+		TestSteps: []httpboomer.IStep{
+			httpboomer.Step("get with params").
+				WithVariables(map[string]interface{}{"var1": "bar1", "expectedStatusCode": 200}).
+				GET("/get").
+				WithParams(map[string]interface{}{"foo1": "$var1", "foo2": "bar2"}).
+				WithHeaders(map[string]string{"User-Agent": "HttpBoomer"}).
+				Validate().
+				AssertEqual("status_code", "$expectedStatusCode", "check status code").
+				AssertEqual("headers.Connection", "keep-alive", "check header Connection").
+				AssertEqual("headers.\"Content-Type\"", "application/json; charset=utf-8", "check header Content-Type").
+				AssertEqual("body.args.foo1", "$var1", "check args foo1").
+				AssertEqual("body.args.foo2", "bar2", "check args foo2"),
+		},
+	}
+
+	err := httpboomer.Test(t, testcase)
+	if err != nil {
+		t.Fatalf("run testcase error: %v", err)
+	}
+}

parser.go

@@ -32,11 +32,18 @@ func buildURL(baseURL, stepURL string) string {
 }
 
 func parseData(raw interface{}, variablesMapping map[string]interface{}) interface{} {
-	switch v := raw.(type) {
+	switch value := raw.(type) {
 	case string:
-		v = strings.TrimSpace(v)
-		return parseString(v, variablesMapping)
+		value = strings.TrimSpace(value)
+		return parseString(value, variablesMapping)
+	case map[string]interface{}:
+		parsedMap := make(map[string]interface{})
+		for k, v := range value {
+			parsedMap[k] = parseData(v, variablesMapping)
+		}
+		return parsedMap
 	default:
+		// other types, e.g. nil, int, float, bool
 		return raw
 	}
 }

parser_test.go

@@ -129,3 +129,27 @@ func TestParseDataStringWithVariablesAbnormal(t *testing.T) {
 		}
 	}
 }
+
+func TestParseDataMapWithVariables(t *testing.T) {
+	variablesMapping := map[string]interface{}{
+		"var1": "foo1",
+		"val1": 200,
+		"var2": 123,
+	}
+
+	testData := []struct {
+		expr   map[string]interface{}
+		expect interface{}
+	}{
+		{map[string]interface{}{"key": "$var1"}, map[string]interface{}{"key": "foo1"}},
+		{map[string]interface{}{"foo1": "$val1", "foo2": "bar2"}, map[string]interface{}{"foo1": 200, "foo2": "bar2"}},
+		// {map[string]interface{}{"$var1": "$val1"}, map[string]interface{}{"foo1": 200}},
+		// {map[string]interface{}{"$var2": "$val1"}, map[string]interface{}{123: 200}},
+	}
+
+	for _, data := range testData {
+		if !assert.Equal(t, data.expect, parseData(data.expr, variablesMapping)) {
+			t.Fail()
+		}
+	}
+}

runner.go

@@ -78,13 +78,16 @@ func (r *Runner) runStepRequest(step *TStep) error {
 	// prepare request args
 	var v []interface{}
 	if len(step.Request.Headers) > 0 {
-		v = append(v, req.Header(step.Request.Headers))
+		headers := parseData(step.Request.Headers, step.Variables)
+		v = append(v, req.Header(headers.(map[string]string)))
 	}
 	if len(step.Request.Params) > 0 {
-		v = append(v, req.Param(step.Request.Params))
+		params := parseData(step.Request.Params, step.Variables)
+		v = append(v, req.Param(params.(map[string]interface{})))
 	}
 	if step.Request.Data != nil {
-		v = append(v, step.Request.Data)
+		data := parseData(step.Request.Data, step.Variables)
+		v = append(v, data)
 	}
 	if step.Request.JSON != nil {
 		v = append(v, req.BodyJSON(step.Request.JSON))