luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-02 17:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify fileattributematcher tests a bit

Browse Source 
Just use assertions instead of pretty-printed error messages.
This commit is contained in:
Matthias Clasen 2013-12-23 12:09:46 -05:00
parent 3bbfd90880
commit 159459bc2d
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/tests/fileattributematcher.c
View File

@ -19,11 +19,7 @@ test_exact (void)
{ {
matcher = g_file_attribute_matcher_new (exact_matches[i]); matcher = g_file_attribute_matcher_new (exact_matches[i]);
s = g_file_attribute_matcher_to_string (matcher); s = g_file_attribute_matcher_to_string (matcher);
if (! g_str_equal (exact_matches[i], s)) g_assert_cmpstr (exact_matches[i], ==, s);
{
g_test_fail ();
g_test_message ("matcher should be %s, but is %s", exact_matches[i], s);
}
g_free (s); g_free (s);
g_file_attribute_matcher_unref (matcher); g_file_attribute_matcher_unref (matcher);
} }
@ -64,11 +60,7 @@ test_equality (void)
{ {
matcher = g_file_attribute_matcher_new (equals[i].actual); matcher = g_file_attribute_matcher_new (equals[i].actual);
s = g_file_attribute_matcher_to_string (matcher); s = g_file_attribute_matcher_to_string (matcher);
if (! g_str_equal (equals[i].expected, s)) g_assert_cmpstr (equals[i].expected, ==, s);
{
g_test_fail ();
g_test_message ("matcher for %s should be %s, but is %s", equals[i].actual, equals[i].expected, s);
}
g_free (s); g_free (s);
g_file_attribute_matcher_unref (matcher); g_file_attribute_matcher_unref (matcher);
} }
@ -149,13 +141,7 @@ test_subtract (void)
subtract = g_file_attribute_matcher_new (subtractions[i].subtract); subtract = g_file_attribute_matcher_new (subtractions[i].subtract);
result = g_file_attribute_matcher_subtract (matcher, subtract); result = g_file_attribute_matcher_subtract (matcher, subtract);
s = g_file_attribute_matcher_to_string (result); s = g_file_attribute_matcher_to_string (result);
if (g_strcmp0 (subtractions[i].result, s)) g_assert_cmpstr (subtractions[i].result, ==, s);
{
g_test_fail ();
g_test_message ("matcher for %s - %s should be %s, but is %s",
subtractions[i].attributes, subtractions[i].subtract,
subtractions[i].result, s);
}
g_free (s); g_free (s);
g_file_attribute_matcher_unref (matcher); g_file_attribute_matcher_unref (matcher);
g_file_attribute_matcher_unref (subtract); g_file_attribute_matcher_unref (subtract);