GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-12 16:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify jmespath compatibility conversion

Browse Source
This commit is contained in:
buyuxiang
2022-06-27 18:08:23 +08:00
parent f986a2298a
commit 9324b0fbba
5 changed files with 39 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/scaffold/templates/testcases/demo_ref_api.json
View File

@@ -52,7 +52,7 @@
"msg": "check status_code"
},
{
"check": "body.headers.postman-token",
"check": "body.headers.\"postman-token\"",
"assert": "equal",
"expect": "ea19464c-ddd4-4724-abe9-5e2b254c2723",
"msg": "check body.headers.postman-token"

17
hrp/testcase.go
View File

@@ -199,6 +199,9 @@ func (tc *TCase) MakeCompat() (err error) {
func convertCompatRequestBody(request *Request) {
if request != nil && request.Body == nil {
if request.Json != nil {
if request.Headers == nil {
request.Headers = make(map[string]string)
}
request.Headers["Content-Type"] = "application/json; charset=utf-8"
request.Body = request.Json
request.Json = nil
@@ -228,7 +231,7 @@ func convertCompatValidator(Validators []interface{}) (err error) {
if iMsg, msgExisted := validatorMap["msg"]; msgExisted {
validator.Message = iMsg.(string)
}
validator.Check = convertCheckExpr(validator.Check)
validator.Check = convertJmespathExpr(validator.Check)
Validators[i] = validator
continue
}
@@ -246,7 +249,7 @@ func convertCompatValidator(Validators []interface{}) (err error) {
validator.Message = validatorContent[2].(string)
}
}
validator.Check = convertCheckExpr(validator.Check)
validator.Check = convertJmespathExpr(validator.Check)
Validators[i] = validator
continue
}
@@ -258,18 +261,20 @@ func convertCompatValidator(Validators []interface{}) (err error) {
// convertExtract deals with extract expr including hyphen
func convertExtract(extract map[string]string) {
for key, value := range extract {
extract[key] = convertCheckExpr(value)
extract[key] = convertJmespathExpr(value)
}
}
// convertCheckExpr deals with check expression including hyphen
func convertCheckExpr(checkExpr string) string {
// convertJmespathExpr deals with limited jmespath expression conversion
func convertJmespathExpr(checkExpr string) string {
if strings.Contains(checkExpr, textExtractorSubRegexp) {
return checkExpr
}
checkItems := strings.Split(checkExpr, ".")
for i, checkItem := range checkItems {
if strings.Contains(checkItem, "-") && !strings.Contains(checkItem, "\"") {
checkItem = strings.Trim(checkItem, "\"")
lowerItem := strings.ToLower(checkItem)
if strings.HasPrefix(lowerItem, "content-") || lowerItem == "user-agent" {
checkItems[i] = fmt.Sprintf("\"%s\"", checkItem)
}
}

15
hrp/testcase_test.go
View File

@@ -210,21 +210,20 @@ func TestConvertCheckExpr(t *testing.T) {
}{
// normal check expression
{"a.b.c", "a.b.c"},
{"headers.\"Content-Type\"", "headers.\"Content-Type\""},
{"a.\"b-c\".d", "a.\"b-c\".d"},
{"a.b-c.d", "a.b-c.d"},
{"body.args.a[-1]", "body.args.a[-1]"},
// check expression using regex
{"covering (.*) testing,", "covering (.*) testing,"},
{" (.*) a-b-c", " (.*) a-b-c"},
// abnormal check expression
{"-", "\"-\""},
{"b-c", "\"b-c\""},
{"a.b-c.d", "a.\"b-c\".d"},
{"a-b.c-d", "\"a-b\".\"c-d\""},
{"\"a-b\".c-d", "\"a-b\".\"c-d\""},
{"headers.Content-Type", "headers.\"Content-Type\""},
{"body.I-am-a-Key.name", "body.\"I-am-a-Key\".name"},
{"headers.\"Content-Type", "headers.\"Content-Type\""},
{"headers.Content-Type\"", "headers.\"Content-Type\""},
{"headers.User-Agent", "headers.\"User-Agent\""},
}
for _, expr := range exprs {
if !assert.Equal(t, convertCheckExpr(expr.before), expr.after) {
if !assert.Equal(t, expr.after, convertJmespathExpr(expr.before)) {
t.Fatal()
}
}