[tracker] libtracker-data: Bugfix restoring after journal-replay, added unit test for it

[Philip Van Hoof <pvanhoof src gnome org>]

commit 0cf323abdaacff2e9dd605f0ffa0eda34733dd32
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Mar 30 16:09:34 2010 +0200

    libtracker-data: Bugfix restoring after journal-replay, added unit test for it

 src/libtracker-data/tracker-data-update.c   |    7 ++-----
 tests/libtracker-data/tracker-backup-test.c |   14 +++++---------
 2 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 114ef69..37bb4b4 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2476,16 +2476,14 @@ tracker_data_replay_journal (GHashTable          *classes,
                              const gchar         *busy_status)
 {
 	GError *journal_error = NULL;
-	static TrackerProperty *rdf_type = NULL;
+	TrackerProperty *rdf_type = NULL;
 	gint last_operation_type = 0;
 	gboolean in_ontology = FALSE;
 	GList *ontology_queue = NULL;
 
 	tracker_data_begin_db_transaction_for_replay (0);
 
-	if (!rdf_type) {
-		rdf_type = tracker_ontologies_get_property_by_uri (RDF_PREFIX "type");
-	}
+	rdf_type = tracker_ontologies_get_property_by_uri (RDF_PREFIX "type");
 
 	tracker_db_journal_reader_init (NULL);
 
@@ -2779,5 +2777,4 @@ tracker_data_replay_journal (GHashTable          *classes,
 	}
 
 	tracker_data_commit_db_transaction ();
-
 }
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index af06565..e247e8d 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -175,16 +175,15 @@ static void
 test_backup_and_restore (void)
 {
 	test_backup_and_restore_helper (FALSE);
+	backup_calls = 0;
 }
 
-#ifdef FAILING_UNIT_TEST
 static void
 test_journal_then_backup_and_restore (void)
 {
 	test_backup_and_restore_helper (TRUE);
+	backup_calls = 0;
 }
-#endif
-
 
 int
 main (int argc, char **argv)
@@ -209,14 +208,11 @@ main (int argc, char **argv)
 
 	g_free (current_dir);
 
-	g_test_add_func ("/tracker/libtracker-data/backup/save_and_restore",
-	                 test_backup_and_restore);
-
-#ifdef FAILING_UNIT_TEST
-	/* This test fails atm, disabled it while I'm fixing this in master */
 	g_test_add_func ("/tracker/libtracker-data/backup/journal_then_save_and_restore",
 	                 test_journal_then_backup_and_restore);
-#endif
+
+	g_test_add_func ("/tracker/libtracker-data/backup/save_and_restore",
+	                 test_backup_and_restore);
 
 	/* run tests */
 	result = g_test_run ();