Add XML and JSON matcher tests

Author: SimonBaeumer

pkg/matcher/matcher.go

@@ -173,7 +173,13 @@ func (m JSONMatcher) Match(got interface{}, expected interface{}) MatcherResult
 	json := expected.(map[string]string)
 	for q, e := range json {
 		r := gjson.Get(got.(string), q)
-		if r.Value() != e {
+		if r.Value() == nil {
+			result.Success = false
+			result.Diff = fmt.Sprintf(`Query "%s" did not match a path`, q)
+			break
+		}
+
+		if fmt.Sprintf("%v", r.Value()) != e {
 			result.Success = false
 			result.Diff = fmt.Sprintf(`Expected json path "%s" with result
 
@@ -182,6 +188,7 @@ func (m JSONMatcher) Match(got interface{}, expected interface{}) MatcherResult
 to be equal to
 
 %s`, q, e, r.Value())
+			break
 		}
 	}
 
@@ -204,25 +211,32 @@ func (m XMLMatcher) Match(got interface{}, expected interface{}) MatcherResult {
 			log.Fatal(err)
 		}
 
-		if r := xmlquery.FindOne(doc, q); r != nil {
-			if r.InnerText() != e {
-				result.Success = false
-				result.Diff = fmt.Sprintf(`Expected xml path "%s" with result
+		node, err := xmlquery.Query(doc, q)
+		if err != nil {
+		    return MatcherResult{
+		        Success: false,
+		        Diff: fmt.Sprintf("Error occured: %s", err),
+            }
+		}
+
+		if node == nil {
+            return MatcherResult{
+                Success: false,
+                Diff:    fmt.Sprintf(`Query "%s" did not match a path`, q),
+            }
+        }
+
+        if node.InnerText() != e {
+            result.Success = false
+            result.Diff = fmt.Sprintf(`Expected xml path "%s" with result
 
 %s
 
 to be equal to
 
-%s`, q, e, r.InnerText())
-			}
-		} else {
-			result = MatcherResult{
-				Success: false,
-				Diff:    fmt.Sprintf(`Query "%s" did not match a path`, q),
-			}
-		}
-
-	}
+%s`, q, e, node.InnerText())
+        }
+    }
 
 	return result
 }

pkg/matcher/matcher_test.go

@@ -92,3 +92,95 @@ func TestNotContainsMatcher_Fails(t *testing.T) {
 	diffText := "\nExpected\n\nlore ipsum donor\n\nto not contain\n\ndonor\n"
 	assert.Equal(t, diffText, r.Diff)
 }
+
+func TestXMLMatcher_Match(t *testing.T) {
+	m := XMLMatcher{}
+	r := m.Match("<book>test</book>", map[string]string{"/book": "test"})
+
+	assert.True(t, r.Success)
+	assert.Equal(t, "", r.Diff)
+}
+
+func TestXMLMatcher_DoesNotMatch(t *testing.T) {
+	m := XMLMatcher{}
+	r := m.Match("<book>another</book>", map[string]string{"/book": "test"})
+
+	diff := `Expected xml path "/book" with result
+
+test
+
+to be equal to
+
+another`
+	assert.False(t, r.Success)
+	assert.Equal(t, diff, r.Diff)
+}
+
+func TestXMLMatcher_DoesNotFindPath(t *testing.T) {
+	m := XMLMatcher{}
+	r := m.Match("<comic>test</comic>", map[string]string{"/book": "test"})
+
+	assert.False(t, r.Success)
+	assert.Equal(t, `Query "/book" did not match a path`, r.Diff)
+}
+
+func TestXMLMatcher_MatchArray(t *testing.T) {
+	m := NewMatcher(XML)
+	html := "<books><book>test1</book><book>test2</book></books>"
+
+	r := m.Match(html, map[string]string{"/books": "test1test2"})
+
+	assert.True(t, r.Success)
+	assert.Equal(t, "", r.Diff)
+}
+
+func TestXMLMatcher_WithXPATHError(t *testing.T) {
+	m := XMLMatcher{}
+	r := m.Match("<book>test</book>", map[string]string{"<!/book": "test"})
+
+	assert.False(t, r.Success)
+	assert.Equal(t, `Error occured: expression must evaluate to a node-set`, r.Diff)
+}
+
+func TestJSONMatcher_Match(t *testing.T) {
+	m := JSONMatcher{}
+	r := m.Match(`{"book": "test"}`, map[string]string{"book": "test"})
+
+	assert.True(t, r.Success)
+	assert.Equal(t, "", r.Diff)
+}
+
+func TestJSONMatcher_DoesNotFindPath(t *testing.T) {
+	m := JSONMatcher{}
+	r := m.Match(`{"comic": "test"}`, map[string]string{"book": "test"})
+
+	assert.False(t, r.Success)
+	assert.Equal(t, `Query "book" did not match a path`, r.Diff)
+}
+
+func TestJSONMatcher_MatchArray(t *testing.T) {
+	m := JSONMatcher{}
+	json := `{"books": [ "test1", "test2" ]}`
+
+	r := m.Match(json, map[string]string{"books": "[test1 test2]"})
+
+	assert.True(t, r.Success)
+	assert.Equal(t, "", r.Diff)
+}
+
+
+func TestJSONMatcher_DoesNotMatch(t *testing.T) {
+	m := NewMatcher(JSON)
+	r := m.Match(`{"book": "another"}`, map[string]string{"book": "test"})
+
+	diff := `Expected json path "book" with result
+
+test
+
+to be equal to
+
+another`
+
+	assert.False(t, r.Success)
+	assert.Equal(t, diff, r.Diff)
+}