Fix unit test

7 files changed, 16 insertions, 10 deletions

diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c
index 14bac27e..a60d48bf 100644
--- a/test/c/test-datasource.c
+++ b/test/c/test-datasource.c
@@ -143,6 +143,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_type_init();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/DataSource/CreateEmpty", Fixture, NULL,
diff --git a/test/c/test-event.c b/test/c/test-event.c
index b6a03335..30cf435d 100644
--- a/test/c/test-event.c
+++ b/test/c/test-event.c
@@ -425,6 +425,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_type_init();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Event/CreateEmpty", Fixture, NULL,
diff --git a/test/c/test-log.c b/test/c/test-log.c
index b392ea90..ff1c6021 100644
--- a/test/c/test-log.c
+++ b/test/c/test-log.c
@@ -74,7 +74,7 @@ _on_events_received (ZeitgeistLog *log,
                      GAsyncResult *res,
                      GPtrArray    *expected_events)
 {
-  GPtrArray          *events;
+  ZeitgeistResultSet *events;
   GArray             *event_ids;
   GError             *error;
   ZeitgeistEvent     *ev, *_ev;
@@ -92,11 +92,12 @@ _on_events_received (ZeitgeistLog *log,
 
   /* Assert that we got what we expected, and collect the event ids,
    * so we can delete the events */
-  g_assert_cmpint (expected_events->len, ==, events->len);
-  event_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint32), events->len);
-  for (i = 0; i < events->len; ++i)
+  g_assert_cmpint (expected_events->len, ==, zeitgeist_result_set_size(events));
+  event_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint32),
+                                    zeitgeist_result_set_size(events));
+  for (i = 0; i < zeitgeist_result_set_size(events); ++i)
     {
-      ev = ZEITGEIST_EVENT (g_ptr_array_index (events, i));
+      ev = zeitgeist_result_set_next_value(events);
       _ev = ZEITGEIST_EVENT (g_ptr_array_index (expected_events, i));
       g_assert_cmpstr (zeitgeist_event_get_interpretation (ev), ==,
                        zeitgeist_event_get_interpretation (_ev));
@@ -202,6 +203,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_type_init();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Log/InsertGetDelete", Fixture, NULL,
diff --git a/test/c/test-monitor.c b/test/c/test-monitor.c
index 5ee76402..ddbbd9b2 100644
--- a/test/c/test-monitor.c
+++ b/test/c/test-monitor.c
@@ -67,6 +67,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_type_init();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Monitor/Create", Fixture, NULL,
diff --git a/test/c/test-symbols.c b/test/c/test-symbols.c
index 636db6fd..0b71a6e6 100644
--- a/test/c/test-symbols.c
+++ b/test/c/test-symbols.c
@@ -181,6 +181,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_type_init();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/Symbols/NullNull", Fixture, NULL,
diff --git a/test/c/test-timerange.c b/test/c/test-timerange.c
index e52c0b00..cdd2d018 100644
--- a/test/c/test-timerange.c
+++ b/test/c/test-timerange.c
@@ -41,7 +41,6 @@ static void
 test_create (Fixture *fix, gconstpointer data)
 {
   ZeitgeistTimeRange *tr;
-
   tr = zeitgeist_time_range_new (0, 1);
 
   g_assert_cmpint (0, ==, zeitgeist_time_range_get_start (tr));
@@ -138,6 +137,7 @@ int
 main (int   argc,
       char *argv[])
 {
+  g_type_init();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/Zeitgeist/TimeRange/Create", Fixture, NULL,
diff --git a/test/direct/log-test.vala b/test/direct/log-test.vala
index fcc003fc..705a6d02 100644
--- a/test/direct/log-test.vala
+++ b/test/direct/log-test.vala
@@ -39,7 +39,7 @@ void events_received (Zeitgeist.Log log,
                       GenericArray<Event> expected_events,
                       Array<uint32> event_ids, MainLoop mainloop)
 {
-    GenericArray<Zeitgeist.Event?> events;
+    ResultSet events;
     try {
         events = log.get_events.end (res);
     }
@@ -49,11 +49,11 @@ void events_received (Zeitgeist.Log log,
     }
     /* Assert that we got what we expected, and collect the event ids,
      * so we can delete the events */
-    assert (expected_events.length == events.length);
-    for (int i = 0; i < events.length; ++i)
+    assert (expected_events.length == events.size());
+    for (int i = 0; i < events.size(); ++i)
     {
         Event exp_event = expected_events[i];
-        Event? event = events[i];
+        Event? event = events.next_value();
         assert (event.interpretation == exp_event.interpretation);
         assert (event.manifestation == exp_event.manifestation);
         assert (event.actor == exp_event.actor);