From 50ade52118f3f38ae4e3d36db45654511f17286e Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Thu, 24 Feb 2011 13:49:06 +1100 Subject: Sort entities to make test deterministic --- tests/dbus/test-tpl-log-store-pidgin.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c index 7076e74..f8563da 100644 --- a/tests/dbus/test-tpl-log-store-pidgin.c +++ b/tests/dbus/test-tpl-log-store-pidgin.c @@ -395,6 +395,15 @@ test_get_events_for_date_jabber (PidginTestCaseFixture *fixture, g_date_free (date); } +static int +cmp_entities (gconstpointer a, + gconstpointer b) +{ + return -1 * g_strcmp0 ( + tpl_entity_get_identifier (TPL_ENTITY (a)), + tpl_entity_get_identifier (TPL_ENTITY (b))); +} + static void test_get_entities_jabber (PidginTestCaseFixture *fixture, gconstpointer user_data) @@ -407,6 +416,9 @@ test_get_entities_jabber (PidginTestCaseFixture *fixture, g_assert_cmpint (g_list_length (l), ==, 2); + /* sort the entities, since their ordering depends on the file order */ + l = g_list_sort (l, cmp_entities); + entity = g_list_nth_data (l, 0); g_assert_cmpstr (tpl_entity_get_identifier (entity), ==, "user2@collabora.co.uk"); -- cgit v1.2.3