r23140 - gnucash/trunk/src/engine/test - Testing: Split.c: Filter out expected error message.

John Ralls jralls at code.gnucash.org
Fri Aug 16 12:44:45 EDT 2013


Author: jralls
Date: 2013-08-16 12:44:45 -0400 (Fri, 16 Aug 2013)
New Revision: 23140
Trac: http://svn.gnucash.org/trac/changeset/23140

Modified:
   gnucash/trunk/src/engine/test/utest-Split.c
Log:
Testing: Split.c: Filter out expected error message.

Includes putting the message-handler cleanup in teardown.

Modified: gnucash/trunk/src/engine/test/utest-Split.c
===================================================================
--- gnucash/trunk/src/engine/test/utest-Split.c	2013-08-16 16:44:28 UTC (rev 23139)
+++ gnucash/trunk/src/engine/test/utest-Split.c	2013-08-16 16:44:45 UTC (rev 23140)
@@ -87,6 +87,7 @@
     qof_instance_mark_clean (QOF_INSTANCE (fixture->split));
     qof_instance_mark_clean (QOF_INSTANCE (acc));
     qof_instance_mark_clean (QOF_INSTANCE (txn));
+    fixture->hdlrs = NULL;
 }
 
 static void
@@ -105,7 +106,8 @@
     test_destroy (fixture->comm);
     test_destroy (book);
     g_free (fixture->func);
-
+    g_slist_free_full (fixture->hdlrs, test_free_log_handler);
+    test_clear_error_list();
 }
 
 /* gnc_split_init
@@ -1260,14 +1262,12 @@
     Account *acc1 = xaccMallocAccount (book);
     Account *acc2 = xaccMallocAccount (book);
     Account *acc3 = xaccMallocAccount (book);
-    gchar *msg1 = "get_corr_account_split: assertion `sa' failed";
-    gchar *logdomain = "gnc.engine";
+    gchar *msg = "get_corr_account_split: assertion `sa' failed";
     guint loglevel = G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL;
     TestErrorStruct *check = test_error_struct_new ("gnc.engine",
 						    loglevel, msg);
-    fixture->hdlrs = test_log_set_handler (fixture->hdlrs, check,
-					   (GLogFunc)test_checked_handler);
-    g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_null_handler, NULL);
+    fixture->hdlrs = test_log_set_fatal_handler (fixture->hdlrs, check,
+						 (GLogFunc)test_checked_handler);
 
     xaccAccountSetCommodity (acc1, fixture->curr);
     xaccAccountSetCommodity (acc2, fixture->curr);



More information about the gnucash-changes mailing list