r23133 - gnucash/trunk/src/engine/test - Split: Ignore fatal message

John Ralls jralls at code.gnucash.org
Fri Aug 16 12:43:02 EDT 2013


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

Modified:
   gnucash/trunk/src/engine/test/utest-Split.c
Log:
Split: Ignore fatal message

It's checked already as a normal message.

Modified: gnucash/trunk/src/engine/test/utest-Split.c
===================================================================
--- gnucash/trunk/src/engine/test/utest-Split.c	2013-08-15 19:44:32 UTC (rev 23132)
+++ gnucash/trunk/src/engine/test/utest-Split.c	2013-08-16 16:43:01 UTC (rev 23133)
@@ -44,6 +44,7 @@
     SplitTestFunctions *func;
     gnc_commodity *curr;
     gnc_commodity *comm;
+    GSList *hdlrs;
 } Fixture;
 
 static void
@@ -1262,16 +1263,12 @@
     gchar *msg1 = "get_corr_account_split: assertion `sa' failed";
     gchar *logdomain = "gnc.engine";
     guint loglevel = G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL;
-    TestErrorStruct check = { loglevel, logdomain, msg1, 0 };
-    gnc_numeric value = { 360, 240 };
-    gnc_numeric old_val = fixture->split->value;
-    gnc_numeric old_amt = fixture->split->amount;
+    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);
 
-    GLogFunc oldlogger = g_log_set_default_handler ((GLogFunc)test_null_handler, &check);
-    g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_checked_handler,
-				  &check);
-
-
     xaccAccountSetCommodity (acc1, fixture->curr);
     xaccAccountSetCommodity (acc2, fixture->curr);
     xaccAccountSetCommodity (acc3, fixture->curr);
@@ -1301,13 +1298,12 @@
 
     g_assert (!fixture->func->get_corr_account_split(fixture->split, &result));
     g_assert (result == NULL);
-    g_assert_cmpint (check.hits, ==, 0);
+    g_assert_cmpint (check->hits, ==, 0);
 
     g_assert (!fixture->func->get_corr_account_split(NULL, &result));
     g_assert (result == NULL);
-    g_assert_cmpint (check.hits, ==, 1);
+    g_assert_cmpint (check->hits, ==, 1);
 
-    g_log_set_default_handler (oldlogger, NULL);
     test_destroy (split1);
     test_destroy (split2);
     test_destroy (split3);



More information about the gnucash-changes mailing list