nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make TestCase.assert_string robust in the face of null actuals

Browse source
This commit is contained in:
Michael Gratton 2019-03-09 19:57:16 +11:00 • committed by Michael James Gratton
parent 4d1e86e5d1
commit 4e484e237d
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/test-case.vala
View file

@ -53,11 +53,17 @@ public void assert_string(string expected, string? actual, string? context = nul
if (a.length > 32) {
a = a[0:32] + "…";
}
string b = actual;
if (b.length > 32) {
b = b[0:32] + "…";
string? b = actual;
if (b != null) {
if (b.length > 32) {
b = b[0:32] + "…";
}
}
if (b != null) {
print_assert("Expected: \"%s\", was: \"%s\"".printf(a, b), context);
} else {
print_assert("Expected: \"%s\", was null".printf(a), context);
}
print_assert("Expected: \"%s\", was: \"%s\"".printf(a, b), context);
assert_not_reached();
}
}