github.com/stretchr/testify
Advanced tools
+17
-55
@@ -955,4 +955,2 @@ package mock | ||
| type outputRenderer func() string | ||
| // Diff gets a string describing the differences between the arguments | ||
@@ -965,3 +963,3 @@ // and the specified objects. | ||
| var outputBuilder strings.Builder | ||
| output := "\n" | ||
| var differences int | ||
@@ -974,19 +972,12 @@ | ||
| outputRenderers := []outputRenderer{} | ||
| for i := 0; i < maxArgCount; i++ { | ||
| i := i | ||
| var actual, expected interface{} | ||
| var actualFmt, expectedFmt func() string | ||
| var actualFmt, expectedFmt string | ||
| if len(objects) <= i { | ||
| actual = "(Missing)" | ||
| actualFmt = func() string { | ||
| return "(Missing)" | ||
| } | ||
| actualFmt = "(Missing)" | ||
| } else { | ||
| actual = objects[i] | ||
| actualFmt = func() string { | ||
| return fmt.Sprintf("(%[1]T=%[1]v)", actual) | ||
| } | ||
| actualFmt = fmt.Sprintf("(%[1]T=%[1]v)", actual) | ||
| } | ||
@@ -996,10 +987,6 @@ | ||
| expected = "(Missing)" | ||
| expectedFmt = func() string { | ||
| return "(Missing)" | ||
| } | ||
| expectedFmt = "(Missing)" | ||
| } else { | ||
| expected = args[i] | ||
| expectedFmt = func() string { | ||
| return fmt.Sprintf("(%[1]T=%[1]v)", expected) | ||
| } | ||
| expectedFmt = fmt.Sprintf("(%[1]T=%[1]v)", expected) | ||
| } | ||
@@ -1012,5 +999,3 @@ | ||
| if r := recover(); r != nil { | ||
| actualFmt = func() string { | ||
| return fmt.Sprintf("panic in argument matcher: %v", r) | ||
| } | ||
| actualFmt = fmt.Sprintf("panic in argument matcher: %v", r) | ||
| } | ||
@@ -1021,10 +1006,6 @@ }() | ||
| if matches { | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: PASS: %s matched by %s\n", i, actualFmt(), matcher) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: PASS: %s matched by %s\n", output, i, actualFmt, matcher) | ||
| } else { | ||
| differences++ | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: FAIL: %s not matched by %s\n", i, actualFmt(), matcher) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: FAIL: %s not matched by %s\n", output, i, actualFmt, matcher) | ||
| } | ||
@@ -1038,5 +1019,3 @@ } else { | ||
| differences++ | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: FAIL: type %s != type %s - %s\n", i, expected, reflect.TypeOf(actual).Name(), actualFmt()) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: FAIL: type %s != type %s - %s\n", output, i, expected, reflect.TypeOf(actual).Name(), actualFmt) | ||
| } | ||
@@ -1047,5 +1026,3 @@ case *IsTypeArgument: | ||
| differences++ | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: FAIL: type %s != type %s - %s\n", i, safeTypeName(expected.t), actualT, actualFmt()) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: FAIL: type %s != type %s - %s\n", output, i, safeTypeName(expected.t), safeTypeName(actualT), actualFmt) | ||
| } | ||
@@ -1061,17 +1038,11 @@ case *FunctionalOptionsArgument: | ||
| differences++ | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: FAIL: type %s != type %s - %s\n", i, tName, reflect.TypeOf(actual).Name(), actualFmt()) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: FAIL: type %s != type %s - %s\n", output, i, tName, reflect.TypeOf(actual).Name(), actualFmt) | ||
| } else { | ||
| if ef, af := assertOpts(expected.values, actual); ef == "" && af == "" { | ||
| // match | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: PASS: %s == %s\n", i, tName, tName) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: PASS: %s == %s\n", output, i, tName, tName) | ||
| } else { | ||
| // not match | ||
| differences++ | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: FAIL: %s != %s\n", i, af, ef) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: FAIL: %s != %s\n", output, i, af, ef) | ||
| } | ||
@@ -1083,11 +1054,7 @@ } | ||
| // match | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: PASS: %s == %s\n", i, actualFmt(), expectedFmt()) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: PASS: %s == %s\n", output, i, actualFmt, expectedFmt) | ||
| } else { | ||
| // not match | ||
| differences++ | ||
| outputRenderers = append(outputRenderers, func() string { | ||
| return fmt.Sprintf("\t%d: FAIL: %s != %s\n", i, actualFmt(), expectedFmt()) | ||
| }) | ||
| output = fmt.Sprintf("%s\t%d: FAIL: %s != %s\n", output, i, actualFmt, expectedFmt) | ||
| } | ||
@@ -1103,8 +1070,3 @@ } | ||
| outputBuilder.WriteString("\n") | ||
| for _, r := range outputRenderers { | ||
| outputBuilder.WriteString(r()) | ||
| } | ||
| return outputBuilder.String(), differences | ||
| return output, differences | ||
| } | ||
@@ -1111,0 +1073,0 @@ |
Sorry, the diff of this file is too big to display