Reversed order of equality checks in equality test, fixed err output.

Author: bennovw

internal/testutil/cmp.go

@@ -78,15 +78,16 @@ func IsDeepEqualTest(t *testing.T, source interface{}, comparison interface{}, c
 
 // IsDeepEqual performs both IsMapVersionDeepEqual and IsStringVersionDeepEqual checks
 func IsDeepEqual(source interface{}, comparison interface{}, category string, description string) (bool, error) {
-	equal := IsMapVersionDeepEqual(source, comparison, category, description)
+	equal, err := IsStringVersionDeepEqual(source, comparison, category, description)
+	if err != nil || !equal {
+		return false, err
+	}
+
+	equal = IsMapVersionDeepEqual(source, comparison, category, description)
 	if !equal {
 		return false, nil
 	}
 
-	equal, err := IsStringVersionDeepEqual(source, comparison, category, description)
-	if err != nil {
-		return false, err
-	}
 	return equal, nil
 }
 

internal/testutil/string.go

@@ -14,11 +14,9 @@ func IsStringVersionDeepEqual(source interface{}, comparison interface{}, catego
 		if start == -1 {
 			return true, nil // Strings are equal
 		}
-		return false, fmt.Errorf("Object values are not equal"+
-			"String representations deviate starting at index position %d and ending at index position %d of the source string\n"+
+		return false, fmt.Errorf("object values deviate starting at index position %d and ending at index position %d of the source string\n"+
 			"Source string: %q\n"+
 			"Comparison string: %q",
-			category, description, rStr, eStr,
 			start, end,
 			rDiff, eDiff)
 	}