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

fix: variable name should start with a letter or underscore

Browse Source
This commit is contained in:
debugtalk
2021-09-29 12:00:11 +08:00
parent e54ddfebec
commit e007d0dc24
2 changed files with 90 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parser.go
View File

@@ -42,7 +42,8 @@ func parseData(raw interface{}, variablesMapping map[string]interface{}) interfa
}
var (
regexCompileVariable = regexp.MustCompile(`\$\{(\w+)\}|\$(\w+)`) // parse ${var} or $var
regexVariable = `[a-zA-Z_]\w*` // variable name should start with a letter or underscore
regexCompileVariable = regexp.MustCompile(fmt.Sprintf(`\$\{(%s)\}|\$(%s)`, regexVariable, regexVariable)) // parse ${var} or $var
)
// parseString parse string with variables
@@ -87,6 +88,9 @@ func parseString(raw string, variablesMapping map[string]interface{}) interface{
log.Printf("[parseString] parsedString: %v, matchStartPosition: %v", parsedString, matchStartPosition)
continue
}
parsedString += remainedString
break
}
return parsedString

99
parser_test.go
View File

@@ -38,47 +38,118 @@ func TestParseDataStringWithVariables(t *testing.T) {
"var_4": map[string]interface{}{"a": 1},
"var_5": true,
"var_6": nil,
"v": 4.5, // variable name with one character
"_v": 6.9, // variable name starts with underscore
}
// no variable
if !assert.Equal(t, "var_1", parseData("var_1", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "$", parseData("$", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "var_1$", parseData("var_1$", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "var_1$123", parseData("var_1$123", variablesMapping)) { // variable should starts with a letter
t.Fail()
}
// single variable
if !assert.Equal(t, "abc", parseData("$var_1", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "abc", parseData("${var_1}", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "var_1", parseData("var_1", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "abc#XYZ", parseData("$var_1#XYZ", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "abc#XYZ", parseData("${var_1}#XYZ", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "/abc/def/var3", parseData("/$var_1/$var_2/var3", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, 123, parseData("$var_3", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, map[string]interface{}{"a": 1}, parseData("$var_4", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, map[string]interface{}{"a": 1}, parseData("${var_4}", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, true, parseData("$var_5", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, nil, parseData("$var_6", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, 4.5, parseData("$v", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "var_16.9", parseData("var_1$_v", variablesMapping)) {
t.Fail()
}
// single variable with prefix or suffix
if !assert.Equal(t, "abc#XYZ", parseData("$var_1#XYZ", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "abc#XYZ", parseData("${var_1}#XYZ", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc", parseData("ABC$var_1", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc", parseData("ABC${var_1}", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/", parseData("ABC$var_1/", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABC4.5/", parseData("ABC${v}/", variablesMapping)) {
t.Fail()
}
// multiple variables
if !assert.Equal(t, "/abc/def/var3", parseData("/$var_1/$var_2/var3", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "/abc/def/var3", parseData("/${var_1}/$var_2/var3", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc123", parseData("ABC$var_1$var_3", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc123", parseData("ABC$var_1${var_3}", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/123", parseData("ABC$var_1/$var_3", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/123", parseData("ABC${var_1}/${var_3}", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/123abc/456", parseData("ABC$var_1/123$var_1/456", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/123abc/456", parseData("ABC$var_1/123${var_1}/456", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/def/abc", parseData("ABC$var_1/$var_2/$var_1", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "ABCabc/def/abc", parseData("ABC$var_1/$var_2/${var_1}", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "func1(abc, 123)", parseData("func1($var_1, $var_3)", variablesMapping)) {
t.Fail()
}
if !assert.Equal(t, "func1(abc, 123)", parseData("func1($var_1, ${var_3})", variablesMapping)) {
t.Fail()
}
// TODO: fix compatibility with python version, "abc{'a': 1}"
if !assert.Equal(t, "abcmap[a:1]", parseData("abc$var_4", variablesMapping)) {
t.Fail()
}
// TODO: fix compatibility with python version, "abcTrue"
if !assert.Equal(t, "abctrue", parseData("abc$var_5", variablesMapping)) {
t.Fail()
}
// TODO: fix compatibility with python version, raise exception
if !assert.Equal(t, "/api/<nil>", parseData("/api/$SECRET_KEY", variablesMapping)) {
t.Fail()
}