GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-21 04:22:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: change Validators type, check json body format

Browse Source
This commit is contained in:
buyuxiang
2022-03-01 18:05:13 +08:00
parent c144d14a4e
commit b04a57eb09
7 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
convert.go
View File

@@ -67,9 +67,10 @@ func convertCompatTestCase(tc *TCase) (err error) {
} }
}() }()
for _, step := range tc.TestSteps { for _, step := range tc.TestSteps {
// 1. deal with body compatible with HttpRunner // 1. deal with request body compatible with HttpRunner
if step.Request != nil && step.Request.Body == nil { if step.Request != nil && step.Request.Body == nil {
if step.Request.Json != nil { if step.Request.Json != nil {
step.Request.Headers["Content-Type"] = "application/json; charset=utf-8"
step.Request.Body = step.Request.Json step.Request.Body = step.Request.Json
} else if step.Request.Data != nil { } else if step.Request.Data != nil {
step.Request.Body = step.Request.Data step.Request.Body = step.Request.Data
@@ -77,9 +78,9 @@ func convertCompatTestCase(tc *TCase) (err error) {
} }
// 2. deal with validators compatible with HttpRunner // 2. deal with validators compatible with HttpRunner
for _, iValidator := range step.ValidatorsCompat { for i, iValidator := range step.Validators {
validatorMap, ok := iValidator.(map[string]interface{}) validatorMap := iValidator.(map[string]interface{})
if !ok || len(validatorMap) == 0 { if len(validatorMap) == 0 {
// pass invalid or empty validator // pass invalid or empty validator
continue continue
} }
@@ -94,7 +95,7 @@ func convertCompatTestCase(tc *TCase) (err error) {
validator.Message = msg.(string) validator.Message = msg.(string)
} }
convertCompatHeader(&validator) convertCompatHeader(&validator)
step.Validators = append(step.Validators, validator) step.Validators[i] = validator
} else if len(validatorMap) == 1 { } else if len(validatorMap) == 1 {
// HttpRunner validator format // HttpRunner validator format
for assertMethod, iValidatorContent := range validatorMap { for assertMethod, iValidatorContent := range validatorMap {
@@ -104,7 +105,7 @@ func convertCompatTestCase(tc *TCase) (err error) {
validator.Expect = checkAndExpect[1] validator.Expect = checkAndExpect[1]
} }
convertCompatHeader(&validator) convertCompatHeader(&validator)
step.Validators = append(step.Validators, validator) step.Validators[i] = validator
} else { } else {
log.Error().Msgf("[convert compat testcase] unexpected validator format: %v", validatorMap) log.Error().Msgf("[convert compat testcase] unexpected validator format: %v", validatorMap)
} }

2
internal/har2case/core.go
View File

@@ -145,7 +145,7 @@ func (h *har) prepareTestStep(entry *Entry) (*hrp.TStep, error) {
step := &tStep{ step := &tStep{
TStep: hrp.TStep{ TStep: hrp.TStep{
Request: &hrp.Request{}, Request: &hrp.Request{},
Validators: make([]hrp.Validator, 0), Validators: make([]interface{}, 0),
}, },
} }
if err := step.makeRequestMethod(entry); err != nil { if err := step.makeRequestMethod(entry); err != nil {

7
internal/har2case/core_test.go
View File

@@ -1,6 +1,7 @@
package har2case package har2case
import ( import (
"github.com/httprunner/hrp"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -98,13 +99,13 @@ func TestMakeTestCase(t *testing.T) {
} }
// make validators // make validators
if !assert.Equal(t, "status_code", tCase.TestSteps[0].Validators[0].Check) { if validator, ok := tCase.TestSteps[0].Validators[0].(hrp.Validator); !ok || !assert.Equal(t, "status_code", validator.Check) {
t.Fail() t.Fail()
} }
if !assert.Equal(t, "headers.\"Content-Type\"", tCase.TestSteps[0].Validators[1].Check) { if validator, ok := tCase.TestSteps[0].Validators[1].(hrp.Validator); !ok || !assert.Equal(t, "headers.\"Content-Type\"", validator.Check) {
t.Fail() t.Fail()
} }
if !assert.Equal(t, "body.url", tCase.TestSteps[0].Validators[2].Check) { if validator, ok := tCase.TestSteps[0].Validators[2].(hrp.Validator); !ok || !assert.Equal(t, "body.url", validator.Check) {
t.Fail() t.Fail()
} }
} }

23
models.go
View File

@@ -115,18 +115,17 @@ type Validator struct {
// TStep represents teststep data structure. // TStep represents teststep data structure.
// Each step maybe two different type: make one HTTP request or reference another testcase. // Each step maybe two different type: make one HTTP request or reference another testcase.
type TStep struct { type TStep struct {
Name string `json:"name" yaml:"name"` // required Name string `json:"name" yaml:"name"` // required
Request *Request `json:"request,omitempty" yaml:"request,omitempty"` Request *Request `json:"request,omitempty" yaml:"request,omitempty"`
TestCase *TestCase `json:"testcase,omitempty" yaml:"testcase,omitempty"` TestCase *TestCase `json:"testcase,omitempty" yaml:"testcase,omitempty"`
Transaction *Transaction `json:"transaction,omitempty" yaml:"transaction,omitempty"` Transaction *Transaction `json:"transaction,omitempty" yaml:"transaction,omitempty"`
Rendezvous *Rendezvous `json:"rendezvous,omitempty" yaml:"rendezvous,omitempty"` Rendezvous *Rendezvous `json:"rendezvous,omitempty" yaml:"rendezvous,omitempty"`
Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"` Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"`
SetupHooks []string `json:"setup_hooks,omitempty" yaml:"setup_hooks,omitempty"` SetupHooks []string `json:"setup_hooks,omitempty" yaml:"setup_hooks,omitempty"`
TeardownHooks []string `json:"teardown_hooks,omitempty" yaml:"teardown_hooks,omitempty"` TeardownHooks []string `json:"teardown_hooks,omitempty" yaml:"teardown_hooks,omitempty"`
Extract map[string]string `json:"extract,omitempty" yaml:"extract,omitempty"` Extract map[string]string `json:"extract,omitempty" yaml:"extract,omitempty"`
ValidatorsCompat []interface{} `json:"validate,omitempty" yaml:"validate,omitempty"` Validators []interface{} `json:"validate,omitempty" yaml:"validate,omitempty"`
Export []string `json:"export,omitempty" yaml:"export,omitempty"` Export []string `json:"export,omitempty" yaml:"export,omitempty"`
Validators []Validator
} }
type stepType string type stepType string

8
response.go
View File

@@ -114,8 +114,12 @@ func (v *responseObject) Extract(extractors map[string]string) map[string]interf
return extractMapping return extractMapping
} }
func (v *responseObject) Validate(validators []Validator, variablesMapping map[string]interface{}) (err error) { func (v *responseObject) Validate(iValidators []interface{}, variablesMapping map[string]interface{}) (err error) {
for _, validator := range validators { for _, iValidator := range iValidators {
validator, ok := iValidator.(Validator)
if !ok {
return errors.New("validator type error")
}
// parse check value // parse check value
checkItem := validator.Check checkItem := validator.Check
var checkValue interface{} var checkValue interface{}

9
runner.go
View File

@@ -703,6 +703,15 @@ func (r *caseRunner) runStepRequest(step *TStep) (stepResult *stepData, err erro
if err != nil { if err != nil {
return stepResult, err return stepResult, err
} }
// check request body format if Content-Type specified as application/json
if strings.HasPrefix(req.Header.Get("Content-Type"), "application/json") {
switch data.(type) {
case bool, float64, string, map[string]interface{}, []interface{}, nil:
break
default:
return stepResult, errors.Errorf("request body type inconsistent with Content-Type: %v", req.Header.Get("Content-Type"))
}
}
requestMap["body"] = data requestMap["body"] = data
var dataBytes []byte var dataBytes []byte
switch vv := data.(type) { switch vv := data.(type) {

4
step_test.go
View File

@@ -42,7 +42,7 @@ func TestRunRequestGetToStruct(t *testing.T) {
if tStep.Request.Cookies["user"] != "debugtalk" { if tStep.Request.Cookies["user"] != "debugtalk" {
t.Fatalf("tStep.Request.Cookies mismatch") t.Fatalf("tStep.Request.Cookies mismatch")
} }
if tStep.Validators[0].Check != "status_code" || tStep.Validators[0].Expect != 200 { if validator, ok := tStep.Validators[0].(Validator); !ok || validator.Check != "status_code" || validator.Expect != 200 {
t.Fatalf("tStep.Validators mismatch") t.Fatalf("tStep.Validators mismatch")
} }
} }
@@ -67,7 +67,7 @@ func TestRunRequestPostDataToStruct(t *testing.T) {
if tStep.Request.Body != "a=1&b=2" { if tStep.Request.Body != "a=1&b=2" {
t.Fatalf("tStep.Request.Data mismatch") t.Fatalf("tStep.Request.Data mismatch")
} }
if tStep.Validators[0].Check != "status_code" || tStep.Validators[0].Expect != 200 { if validator, ok := tStep.Validators[0].(Validator); !ok || validator.Check != "status_code" || validator.Expect != 200 {
t.Fatalf("tStep.Validators mismatch") t.Fatalf("tStep.Validators mismatch")
} }
} }