body:control: fixed with no "body" check

If no "body" was given for the response, "body:control" would not work..
programmfabrik · Nov 24, 2022 · bea85b4 · bea85b4
1 parent 7c088c0
commit bea85b4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/api_testcase.go b/api_testcase.go
@@ -489,8 +489,10 @@ func (testCase Case) responsesEqual(expected, got api.Response) (compare.Compare
 	if err != nil {
 		return compare.CompareResult{}, fmt.Errorf("error loading expected generic json: %s", err)
 	}
-	if len(expected.Body) < 1 {
+	if len(expected.Body) == 0 && len(expected.BodyControl) == 0 {
 		expected.Format.IgnoreBody = true
+	} else {
+		expected.Format.IgnoreBody = false
 	}
 	gotJSON, err := got.ServerResponseToGenericJSON(expected.Format, false)
 	if err != nil {

diff --git a/pkg/lib/api/response.go b/pkg/lib/api/response.go
@@ -25,7 +25,7 @@ type Response struct {
 	headerControl util.JsonObject
 	Cookies       []*http.Cookie
 	Body          []byte
-	bodyControl   util.JsonObject
+	BodyControl   util.JsonObject
 	Format        ResponseFormat
 
 	ReqDur      time.Duration
@@ -36,7 +36,7 @@ func (res Response) NeedsCheck() bool {
 	if res.StatusCode != http.StatusOK {
 		return true
 	}
-	if len(res.Headers) > 0 || len(res.Cookies) > 0 || len(res.Body) > 0 {
+	if len(res.Headers) > 0 || len(res.Cookies) > 0 || len(res.Body) > 0 || len(res.BodyControl) > 0 {
 		return true
 	}
 	return false
@@ -95,7 +95,7 @@ func NewResponse(statusCode int, headers map[string]any, headerControl util.Json
 		StatusCode:    statusCode,
 		Headers:       headers,
 		Cookies:       cookies,
-		bodyControl:   bodyControl,
+		BodyControl:   bodyControl,
 		headerControl: headerControl,
 		Format:        bodyFormat,
 	}
@@ -279,7 +279,7 @@ func (response Response) ToGenericJSON() (interface{}, error) {
 	}
 	responseJSON := ResponseSerialization{
 		StatusCode:    response.StatusCode,
-		BodyControl:   response.bodyControl,
+		BodyControl:   response.BodyControl,
 		Headers:       headers,
 		HeaderControl: response.headerControl,
 	}

diff --git a/pkg/lib/compare/comparison_functions.go b/pkg/lib/compare/comparison_functions.go
@@ -625,7 +625,7 @@ func getJsonType(value interface{}) string {
 	case util.JsonBool:
 		return "Bool"
 	default:
-		return "No JSON Type"
+		return "No JSON Type: " + fmt.Sprintf("%v", value)
 	}
 }
 

diff --git a/pkg/lib/csv/csv.go b/pkg/lib/csv/csv.go
@@ -12,7 +12,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-//Get information
+// Get information
 type info struct {
 	name   string
 	format string

diff --git a/pkg/lib/report/parsing_functions.go b/pkg/lib/report/parsing_functions.go
@@ -87,14 +87,14 @@ func (groups statsGroups) getLowestRuntimeGroup() (group int) {
 	return
 }
 
-//ParseJSONResult Print the result to the console
+// ParseJSONResult Print the result to the console
 func ParseJSONResult(baseResult *ReportElement) []byte {
 	jsonResult, _ := json.MarshalIndent(baseResult, "", "  ")
 
 	return jsonResult
 }
 
-//ParseJSONResult Print the result to the console
+// ParseJSONResult Print the result to the console
 func ParseJSONStatsResult(baseResult *ReportElement) []byte {
 
 	currUsername := "unknown"
@@ -149,7 +149,7 @@ func ParseJSONStatsResult(baseResult *ReportElement) []byte {
 	return jsonResult
 }
 
-//ParseJUnitResult Print the result to the console
+// ParseJUnitResult Print the result to the console
 func ParseJUnitResult(baseResult *ReportElement) []byte {
 
 	testName := time.Now().Format("2006-01-02 15:04")