r22462 - gnucash/trunk/src/backend/dbi/test - Remove local log handler and use checked handler from utest-support.

[John Ralls]

Author: jralls
Date: 2012-10-27 19:30:22 -0400 (Sat, 27 Oct 2012)
New Revision: 22462
Trac: http://svn.gnucash.org/trac/changeset/22462

Modified:
   gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c
   gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c
   gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c
Log:
Remove local log handler and use checked handler from utest-support.

Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c	2012-10-27 23:30:12 UTC (rev 22461)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-business-stuff.c	2012-10-27 23:30:22 UTC (rev 22462)
@@ -197,8 +197,12 @@
 
     gchar *msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
     gchar *log_domain = "gnc.backend.dbi";
-    guint loglevel = G_LOG_LEVEL_WARNING, hdlr;
-    TestErrorStruct check = { loglevel, log_domain, msg };
+    guint loglevel = G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL, hdlr;
+    TestErrorStruct check = { loglevel, log_domain, msg, 0 };
+    GLogFunc dhdlr = g_log_set_default_handler ((GLogFunc)test_null_handler,
+						&check);
+    g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_checked_handler,
+				  &check);
 
     g_test_message ( "Testing %s\n", driver );
 
@@ -224,5 +228,6 @@
                               (GLogFunc)test_checked_handler, &check);
     qof_session_end( session_3 );
     g_log_remove_handler (log_domain, hdlr);
+    g_log_set_default_handler (dhdlr, NULL);
     qof_session_destroy( session_3 );
 }

Modified: gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c	2012-10-27 23:30:12 UTC (rev 22461)
+++ gnucash/trunk/src/backend/dbi/test/test-dbi-stuff.c	2012-10-27 23:30:22 UTC (rev 22462)
@@ -186,9 +186,14 @@
 
     gchar *msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
     gchar *log_domain = "gnc.backend.dbi";
-    guint loglevel = G_LOG_LEVEL_WARNING, hdlr;
-    TestErrorStruct check = { loglevel, log_domain, msg };
+    guint loglevel = G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL, hdlr;
+    TestErrorStruct check = { loglevel, log_domain, msg, 0 };
+    GLogFunc dhdlr = g_log_set_default_handler ((GLogFunc)test_null_handler,
+						&check);
+    g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_checked_handler,
+				  &check);
 
+
     g_test_message ( "Testing %s\n", driver );
 
     // Save the session data
@@ -238,6 +243,7 @@
     qof_session_end( session_3 );
     qof_session_destroy( session_3 );
     g_log_remove_handler (log_domain, hdlr);
+    g_log_set_default_handler (dhdlr, NULL);
 }
 
 /* Given an already-created url (yeah, bad testing practice: Should

Modified: gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c	2012-10-27 23:30:12 UTC (rev 22461)
+++ gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c	2012-10-27 23:30:22 UTC (rev 22462)
@@ -23,11 +23,9 @@
 #define DBI_TEST_XML_FILENAME "test-dbi.xml"
 #define FILE_NAME "sqlite3:///tmp/test-sqlite3-file"
 
-static gboolean handler(const gchar* log_domain, GLogLevelFlags log_level, const gchar* message, gpointer user_data)
+typedef struct
 {
-    printf("domain=%s level=%d message=%s\n", log_domain, log_level, message);
-    return FALSE;
-}
+     QofSession *session;
 
 void
 do_test_sqlite(void)
@@ -53,7 +51,6 @@
     gchar* filename;
     QofSession* session_1;
 
-    g_test_log_set_fatal_handler(handler, 0);
 
     // Create a session with data
     session_1 = qof_session_new();
@@ -70,8 +67,6 @@
     gchar* filename;
     QofSession* session_1;
 
-    g_test_log_set_fatal_handler(handler, 0);
-
     // Create a session with data
     session_1 = qof_session_new();
     qof_session_begin( session_1, DBI_TEST_XML_FILENAME, FALSE, FALSE, FALSE );