add a few tests for edge cases for contains, doesNotContain, startsWi…

…th, endsWith

assertion/contains.go

@@ -30,7 +30,7 @@ func contains(data interface{}, key, value string) (MatchResult, error) {
 	default:
 		searchResult, err := JSONStringify(data)
 		if err != nil {
-			return matches()
+			return matchError(err)
 		}
 		if strings.Contains(searchResult, value) {
 			return matches()

assertion/contains_test.go

@@ -0,0 +1,23 @@
+package assertion
+
+import (
+	"testing"
+)
+
+// The non error cases are covered in match_test
+
+func TestContainsWithNonJSONType(t *testing.T) {
+	var complexNumber complex128
+	_, err := contains(complexNumber, "foo", "1")
+	if err == nil {
+		t.Errorf("Expecting contains to return an error for non JSON encodable data")
+	}
+}
+
+func TestDoesNotContainWithNonJSONType(t *testing.T) {
+	var complexNumber complex128
+	_, err := doesNotContain(complexNumber, "foo", "1")
+	if err == nil {
+		t.Errorf("Expecting doesNotContain to return an error for non JSON encodable data")
+	}
+}

assertion/match_test.go

@@ -70,6 +70,8 @@ func TestIsMatch(t *testing.T) {
 		"containsFalseForSubstring":      {sliceOfTags, "contains", "oo", "", false},
 		"containsTrueForSliceOfStrings":  {stringSlice, "contains", "One", "", true},
 		"containsFalseForSliceOfStrings": {stringSlice, "contains", "Three", "", false},
+		"containsTrueForInt":             {1, "contains", "1", "", true},
+		"containsFalseForInt":            {1, "contains", "One", "", false},
 		"notContainsFalseForString":      {"Foo", "does-not-contain", "oo", "", false},
 		"notContainsTrueForString":       {"Foo", "does-not-contain", "aa", "", true},
 		"notContainsFalseForSlice":       {sliceOfTags, "does-not-contain", "Bar", "", false},
@@ -109,8 +111,10 @@ func TestIsMatch(t *testing.T) {
 		"isNotFalse":                     {"100", "is-false", "", "", false},
 		"startsWithTrue":                 {"FooBar", "starts-with", "Foo", "", true},
 		"startsWithFalse":                {"FooBar", "starts-with", "Bar", "", false},
+		"startsWithNonString":            {1, "starts-with", "Foo", "", false},
 		"endsWithTrue":                   {"FooBar", "ends-with", "Bar", "", true},
 		"endsWithFalse":                  {"FooBar", "ends-with", "Foo", "", false},
+		"endsartWithNonString":           {1, "ends-with", "Foo", "", false},
 		"isArrayTrue":                    {sliceOfTags, "is-array", "", "", true},
 		"isArrayFalse":                   {"Foo", "is-array", "", "", false},
 		"isNotArrayTrue":                 {sliceOfTags, "is-not-array", "", "", false},