jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-09 04:37:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: add testcases for CompareRequest&Response (#778)

Browse Source
This commit is contained in:
Uncle-Justice
2024-01-16 11:43:30 +08:00
committed by GitHub
parent a71ecf41d1
commit 665d9fa943
2 changed files with 1123 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/e2e/conformance/utils/http/http.go
View File

@@ -318,7 +318,7 @@ func WaitForConsistentResponse(t *testing.T, r roundtripper.RoundTripper, req ro
return false return false
} }
} else { } else {
t.Logf("invalid CompareTarget: %v please set it Request or Response", expected.Meta.CompareTarget, err, elapsed) t.Logf("invalid CompareTarget: %v please set it CompareTargetRequest or CompareTargetResponse", expected.Meta.CompareTarget)
return false return false
} }
@@ -390,13 +390,15 @@ func CompareRequest(req *roundtripper.Request, cReq *roundtripper.CapturedReques
cTyp := cReq.Headers["Content-Type"][0] cTyp := cReq.Headers["Content-Type"][0]
if eTyp != cTyp { if eTyp != cTyp {
return fmt.Errorf("expected %s Content-Type to be set, got %s", expected.Request.ExpectedRequest.ContentType, cReq.Headers["Content-Type"][0]) if !(eTyp == ContentTypeMultipartForm && strings.Contains(cTyp, eTyp)) {
return fmt.Errorf("expected %s Content-Type to be set, got %s", eTyp, cTyp)
}
} }
var ok bool var ok bool
switch cTyp { switch eTyp {
case ContentTypeTextPlain: case ContentTypeTextPlain:
if string(expected.Request.ExpectedRequest.Body) != cReq.Body.(string) { if string(expected.Request.ExpectedRequest.Body) != cReq.Body.(string) {
return fmt.Errorf("expected %s body to be %s, got %s##", cTyp, string(expected.Request.ExpectedRequest.Body), cReq.Body.(string)) return fmt.Errorf("expected %s body to be %s, got %s", eTyp, string(expected.Request.ExpectedRequest.Body), cReq.Body.(string))
} }
case ContentTypeApplicationJson: case ContentTypeApplicationJson:
var eReqBody map[string]interface{} var eReqBody map[string]interface{}
@@ -408,12 +410,13 @@ func CompareRequest(req *roundtripper.Request, cReq *roundtripper.CapturedReques
} }
if cReqBody, ok = cReq.Body.(map[string]interface{}); !ok { if cReqBody, ok = cReq.Body.(map[string]interface{}); !ok {
return fmt.Errorf("failed to parse CapturedRequest body %s, %s", string(cReq.Body.([]byte)), err.Error()) return fmt.Errorf("failed to parse CapturedRequest body")
} }
if !reflect.DeepEqual(eReqBody, cReqBody) { if !reflect.DeepEqual(eReqBody, cReqBody) {
b, _ := json.Marshal(cReqBody) eRBJson, _ := json.Marshal(eReqBody)
return fmt.Errorf("expected %s body to be %s, got %s", cTyp, string(expected.Request.ExpectedRequest.Body), string(b)) cRBJson, _ := json.Marshal(cReqBody)
return fmt.Errorf("expected %s body to be %s, got result: %s", eTyp, string(eRBJson), string(cRBJson))
} }
case ContentTypeFormUrlencoded: case ContentTypeFormUrlencoded:
var eReqBody map[string][]string var eReqBody map[string][]string
@@ -424,11 +427,13 @@ func CompareRequest(req *roundtripper.Request, cReq *roundtripper.CapturedReques
} }
if cReqBody, ok = cReq.Body.(map[string][]string); !ok { if cReqBody, ok = cReq.Body.(map[string][]string); !ok {
return fmt.Errorf("failed to parse CapturedRequest body %s, %s", string(cReq.Body.([]byte)), err.Error()) return fmt.Errorf("failed to parse CapturedRequest body")
} }
if !reflect.DeepEqual(eReqBody, cReqBody) { if !reflect.DeepEqual(eReqBody, cReqBody) {
return fmt.Errorf("expected %s body to be %s, got %s", cTyp, string(expected.Request.ExpectedRequest.Body), string(cReq.Body.([]byte))) eRBJson, _ := json.Marshal(eReqBody)
cRBJson, _ := json.Marshal(cReqBody)
return fmt.Errorf("expected %s body to be %s, got result: %s", eTyp, string(eRBJson), string(cRBJson))
} }
case ContentTypeMultipartForm: case ContentTypeMultipartForm:
var eReqBody map[string][]string var eReqBody map[string][]string
@@ -439,14 +444,16 @@ func CompareRequest(req *roundtripper.Request, cReq *roundtripper.CapturedReques
return fmt.Errorf("failed to parse ExpectedRequest body %s, %s", string(expected.Request.ExpectedRequest.Body), err.Error()) return fmt.Errorf("failed to parse ExpectedRequest body %s, %s", string(expected.Request.ExpectedRequest.Body), err.Error())
} }
if cReqBody, ok = cReq.Body.(map[string][]string); !ok { if cReqBody, ok = cReq.Body.(map[string][]string); !ok {
return fmt.Errorf("failed to parse CapturedRequest body %s, %s", string(cReq.Body.([]byte)), err.Error()) return fmt.Errorf("failed to parse CapturedRequest body")
} }
if !reflect.DeepEqual(eReqBody, cReqBody) { if !reflect.DeepEqual(eReqBody, cReqBody) {
return fmt.Errorf("expected %s body to be %s, got %s", cTyp, string(expected.Request.ExpectedRequest.Body), string(cReq.Body.([]byte))) eRBJson, _ := json.Marshal(eReqBody)
cRBJson, _ := json.Marshal(cReqBody)
return fmt.Errorf("expected %s body to be %s, got result: %s", eTyp, string(eRBJson), string(cRBJson))
} }
default: default:
return fmt.Errorf("Content-Type: %s invalid or not support.", cTyp) return fmt.Errorf("Content-Type: %s invalid or not support.", eTyp)
} }
} }
if expected.Response.ExpectedResponse.Headers != nil { if expected.Response.ExpectedResponse.Headers != nil {
@@ -590,7 +597,7 @@ func CompareResponse(cRes *roundtripper.CapturedResponse, expected Assertion) er
switch cTyp { switch cTyp {
case ContentTypeTextPlain: case ContentTypeTextPlain:
if !bytes.Equal(expected.Response.ExpectedResponse.Body, cRes.Body) { if !bytes.Equal(expected.Response.ExpectedResponse.Body, cRes.Body) {
return fmt.Errorf("expected %s body to be %s, got %s##", cTyp, string(expected.Response.ExpectedResponse.Body), string(cRes.Body)) return fmt.Errorf("expected %s body to be %s, got %s", cTyp, string(expected.Response.ExpectedResponse.Body), string(cRes.Body))
} }
case ContentTypeApplicationJson: case ContentTypeApplicationJson:
eResBody := make(map[string]interface{}) eResBody := make(map[string]interface{})

1103
test/e2e/conformance/utils/http/http_test.go Normal file
View File

File diff suppressed because it is too large Load Diff