Fix test cases

Added Christians patch to timestamp to become timestam_from_now
actually fix is_a and get_all_parents

2 files changed, 5 insertions, 5 deletions

diff --git a/extensions/ds-registry.vala b/extensions/ds-registry.vala
index 6555762f..8da36310 100644
--- a/extensions/ds-registry.vala
+++ b/extensions/ds-registry.vala
@@ -193,7 +193,7 @@ namespace Zeitgeist
                 ds.name = name;
                 ds.description = description;
                 ds.event_templates = templates;
-                ds.timestamp = Timestamp.now ();
+                ds.timestamp = Timestamp.from_now ();
                 ds.running = true;
                 dirty = true;
 
@@ -208,7 +208,7 @@ namespace Zeitgeist
                     description, templates);
                 new_ds.enabled = true;
                 new_ds.running = true;
-                new_ds.timestamp = Timestamp.now ();
+                new_ds.timestamp = Timestamp.from_now ();
                 sources.insert (unique_id, new_ds);
                 dirty = true;
 
@@ -262,7 +262,7 @@ namespace Zeitgeist
                 {
                     var data_source = sources.lookup (unique_id);
 
-                    data_source.timestamp = Timestamp.now ();
+                    data_source.timestamp = Timestamp.from_now ();
                     dirty = true;
 
                     // if one sender registers multiple unique data sources,
@@ -320,7 +320,7 @@ namespace Zeitgeist
                 debug ("Client disconnected: %s [%s]", ds.name, uid);
 
                 // FIXME: Update here or change semantics to "last insert"?
-                ds.timestamp = Timestamp.now ();
+                ds.timestamp = Timestamp.from_now ();
                 dirty = true;
 
                 if (running_ds.lookup (uid).length == 0)
diff --git a/extensions/fts++/test/test-indexer.cpp b/extensions/fts++/test/test-indexer.cpp
index 8330a5ea..d475f5de 100644
--- a/extensions/fts++/test/test-indexer.cpp
+++ b/extensions/fts++/test/test-indexer.cpp
@@ -303,7 +303,7 @@ index_event (Fixture *fix, ZeitgeistEvent *event)
   guint *event_ids;
   int num_events_inserted;
 
-  zeitgeist_event_set_timestamp (event, zeitgeist_timestamp_now ());
+  zeitgeist_event_set_timestamp (event, zeitgeist_timestamp_from_now ());
   // add event to DBs
   events = g_ptr_array_new ();
   g_ptr_array_add (events, event);