diff options
author | Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> | 2012-10-07 19:46:42 +0200 |
---|---|---|
committer | Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> | 2012-10-07 19:46:42 +0200 |
commit | aa47cdeb098d805aa8cb7ab41af187fff5ae169e (patch) | |
tree | 684e4d5e664d9a8f24b4b158d7f5e516c43a0ccb /test | |
parent | eb31d78db0ba5cce186a766e467922a2bab78da2 (diff) | |
download | zeitgeist-aa47cdeb098d805aa8cb7ab41af187fff5ae169e.tar.gz |
Introduce subject_new_move_event. Test fixes.current_origin
Diffstat (limited to 'test')
-rw-r--r-- | test/c/test-event.c | 17 | ||||
-rw-r--r-- | test/c/test-log.c | 24 |
2 files changed, 13 insertions, 28 deletions
diff --git a/test/c/test-event.c b/test/c/test-event.c index 74bc1c74..00c7980d 100644 --- a/test/c/test-event.c +++ b/test/c/test-event.c @@ -83,8 +83,7 @@ test_create_full (Fixture *fix, gconstpointer data) "text/html", "http://example.com", "example.com", - "net", - "", ""), + "net"), zeitgeist_subject_new (), NULL); @@ -147,7 +146,7 @@ test_from_variant (Fixture *fix, gconstpointer data) GByteArray *payload; GError *error; - g_variant_builder_init (&b, "(" ZEITGEIST_EVENT_SIGNATURE ")"); + g_variant_builder_init (&b, G_VARIANT_TYPE ("(" ZEITGEIST_EVENT_SIGNATURE ")")); /* Build event data */ g_variant_builder_open (&b, G_VARIANT_TYPE ("as")); @@ -222,7 +221,7 @@ test_from_variant_with_new_fields (Fixture *fix, gconstpointer data) GByteArray *payload; GError *error; - g_variant_builder_init (&b, "(" ZEITGEIST_EVENT_SIGNATURE ")"); + g_variant_builder_init (&b, G_VARIANT_TYPE ("(" ZEITGEIST_EVENT_SIGNATURE ")")); /* Build event data */ g_variant_builder_open (&b, G_VARIANT_TYPE ("as")); @@ -325,21 +324,19 @@ test_with_one_subject_to_from_variant (Fixture *fix, gconstpointer data) ZEITGEIST_ZG_ACCESS_EVENT, ZEITGEIST_ZG_USER_ACTIVITY, "application://firefox.desktop", - NULL, + "origin", zeitgeist_subject_new_full ("http://example.com", ZEITGEIST_NFO_WEBSITE, ZEITGEIST_NFO_REMOTE_DATA_OBJECT, "text/html", "http://example.com", "example.com", - "net", - "", ""), + "net"), NULL); - //FIXME: this line should be removed. We need to fix the setting the timestamp + // FIXME: this line should be removed. We need to fix the setting the timestamp zeitgeist_event_set_timestamp(orig, 123); - // Set event origin and current_uri - zeitgeist_event_set_origin (orig, "origin"); + // Set current_uri zeitgeist_subject_set_current_uri ( zeitgeist_event_get_subject (orig, 0), "http://current-example.com"); diff --git a/test/c/test-log.c b/test/c/test-log.c index 34c7d7b7..c1a82b9d 100644 --- a/test/c/test-log.c +++ b/test/c/test-log.c @@ -74,8 +74,7 @@ _on_events_received (ZeitgeistLog *log, GAsyncResult *res, GPtrArray *expected_events) { - GArray *events_array; - ZeitgeistResultSet *events; + GPtrArray *events; GArray *event_ids; GError *error; ZeitgeistEvent *ev, *_ev; @@ -83,8 +82,7 @@ _on_events_received (ZeitgeistLog *log, guint32 event_id; error = NULL; - events_array = zeitgeist_log_get_events_finish (log, res, &error); - events = zeitgeist_simple_result_set_new (events_array); + events = zeitgeist_log_get_events_finish (log, res, &error); if (error) { g_critical ("Failed to get events: %s", error->message); @@ -94,14 +92,11 @@ _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, ==, zeitgeist_result_set_size (events)); - g_assert_cmpint (expected_events->len, ==, zeitgeist_result_set_estimated_matches (events)); - event_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint32), - zeitgeist_result_set_size(events)); - i = 0; - while (ev = zeitgeist_result_set_next_value (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 (i+1, ==, zeitgeist_result_set_tell (events)); + ev = ZEITGEIST_EVENT (g_ptr_array_index (events, i)); _ev = ZEITGEIST_EVENT (g_ptr_array_index (expected_events, i)); g_assert_cmpstr (zeitgeist_event_get_interpretation (ev), ==, zeitgeist_event_get_interpretation (_ev)); @@ -115,15 +110,8 @@ _on_events_received (ZeitgeistLog *log, event_id = zeitgeist_event_get_id (ev); g_array_append_val (event_ids, event_id); - i++; } - /* Assert that the end is still what we expect */ - g_assert_cmpint (expected_events->len, ==, zeitgeist_result_set_size (events)); - g_assert_cmpint (expected_events->len, ==, zeitgeist_result_set_estimated_matches (events)); - g_assert_cmpint (i, ==, zeitgeist_result_set_tell (events)); - g_assert_cmpint (i, ==, zeitgeist_result_set_size (events)); - /* This method call now owns event_ids */ zeitgeist_log_delete_events (log, event_ids, NULL, (GAsyncReadyCallback) _on_events_deleted, |