Return a bool value from the assertjson and assertxml Has and FileHas functions (fixed)

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.13
+          go-version: ^1.16
         id: go
 
       - name: Checkout code

apitest/testing.go

@@ -6,4 +6,5 @@ type TestingT interface {
 	Error(args ...interface{})
 	Errorf(format string, args ...interface{})
 	Log(args ...interface{})
+	Failed() bool
 }

assertions/testing.go

@@ -6,4 +6,5 @@ type TestingT interface {
 	Error(args ...interface{})
 	Errorf(format string, args ...interface{})
 	Log(args ...interface{})
+	Failed() bool
 }

assertjson/assertjson.go

@@ -19,6 +19,7 @@ type TestingT interface {
 	Helper()
 	Errorf(format string, args ...interface{})
 	Log(args ...interface{})
+	Failed() bool
 }
 
 // AssertJSON - main structure that holds parsed JSON.
@@ -37,21 +38,26 @@ func NewAssertJSON(t TestingT, message string, data interface{}) *AssertJSON {
 type JSONAssertFunc func(json *AssertJSON)
 
 // FileHas loads JSON from file and runs user callback for testing its nodes.
-func FileHas(t TestingT, filename string, jsonAssert JSONAssertFunc) {
+func FileHas(t TestingT, filename string, jsonAssert JSONAssertFunc) bool {
 	t.Helper()
+
 	data, err := os.ReadFile(filename)
 	if err != nil {
 		assert.Fail(t, fmt.Sprintf(`failed to read file "%s": %s`, filename, err.Error()))
-	} else {
-		Has(t, data, jsonAssert)
+
+		return false
 	}
+
+	return Has(t, data, jsonAssert)
 }
 
 // Has - loads JSON from byte slice and runs user callback for testing its nodes.
-func Has(t TestingT, data []byte, jsonAssert JSONAssertFunc) {
+func Has(t TestingT, data []byte, jsonAssert JSONAssertFunc) bool {
 	t.Helper()
 	body := &AssertJSON{t: t}
 	body.assert(data, jsonAssert)
+
+	return !t.Failed()
 }
 
 // Node searches for JSON node by JSON Path Syntax. Returns struct for asserting the node values.

assertjson/assertjson_test.go

@@ -2732,17 +2732,6 @@ func TestHas(t *testing.T) {
 				`failed to find JSON node "a.b": [b] not found`,
 			},
 		},
-		// debug helpers
-		{
-			name: "print json node",
-			json: `{"a": {"b": {"c": ["value"]}}}`,
-			assert: func(json *assertjson.AssertJSON) {
-				json.Node("a", "b").Print()
-			},
-			wantMessages: []string{
-				`JSON node at "a.b"`,
-			},
-		},
 		// deprecated behaviour: seek by json pointer path
 		{
 			name: "deprecated: json pointer path",
@@ -2783,6 +2772,40 @@ func TestHas(t *testing.T) {
 			},
 		},
 	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			tester := &mock.Tester{}
+
+			res := assertjson.Has(tester, []byte(test.json), test.assert)
+			wantRes := len(test.wantMessages) == 0
+
+			tester.AssertContains(t, test.wantMessages)
+
+			assert.Equal(t, wantRes, res)
+		})
+	}
+}
+
+func TestPrint(t *testing.T) {
+	tests := []struct {
+		name         string
+		json         string
+		assert       assertjson.JSONAssertFunc
+		wantMessages []string
+	}{
+		// debug helpers
+		{
+			name: "print json node",
+			json: `{"a": {"b": {"c": ["value"]}}}`,
+			assert: func(json *assertjson.AssertJSON) {
+				json.Node("a", "b").Print()
+			},
+			wantMessages: []string{
+				`JSON node at "a.b"`,
+			},
+		},
+	}
+
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			tester := &mock.Tester{}
@@ -2807,11 +2830,12 @@ func TestAssertNode_Exists(t *testing.T) {
 			tester := &mock.Tester{}
 
 			var got bool
-			assertjson.Has(tester, []byte(test.json), func(json *assertjson.AssertJSON) {
+			res := assertjson.Has(tester, []byte(test.json), func(json *assertjson.AssertJSON) {
 				got = json.Node("key").Exists()
 			})
 
 			assert.Equal(t, test.want, got)
+			assert.Equal(t, test.want, res)
 		})
 	}
 }

assertxml/testing.go

@@ -6,4 +6,5 @@ type TestingT interface {
 	Error(args ...interface{})
 	Errorf(format string, args ...interface{})
 	Log(args ...interface{})
+	Failed() bool
 }

internal/mock/tester.go

@@ -7,27 +7,35 @@ import (
 )
 
 type Tester struct {
+	failed   bool
 	messages []string
 }
 
 func (tester *Tester) Helper() {}
 
 func (tester *Tester) Error(args ...interface{}) {
+	tester.failed = true
 	tester.messages = append(tester.messages, fmt.Sprint(args...))
 }
 
 func (tester *Tester) Errorf(format string, args ...interface{}) {
+	tester.failed = true
 	tester.messages = append(tester.messages, fmt.Sprintf(format, args...))
 }
 
 func (tester *Tester) Fatal(args ...interface{}) {
+	tester.failed = true
 	tester.messages = append(tester.messages, fmt.Sprint(args...))
 }
 
 func (tester *Tester) Log(args ...interface{}) {
 	tester.messages = append(tester.messages, fmt.Sprint(args...))
 }
 
+func (tester *Tester) Failed() bool {
+	return tester.failed
+}
+
 func (tester *Tester) AssertContains(t *testing.T, messages []string) {
 	t.Helper()
 	if len(tester.messages) != len(messages) {