r21675 - gnucash/trunk/src/backend/xml/test - [Testing] Backend/XML: Provide checked error messages to replace noted warnings

[John Ralls]

Author: jralls
Date: 2011-12-04 19:07:48 -0500 (Sun, 04 Dec 2011)
New Revision: 21675
Trac: http://svn.gnucash.org/trac/changeset/21675

Modified:
   gnucash/trunk/src/backend/xml/test/test-load-xml2.c
   gnucash/trunk/src/backend/xml/test/test-real-data.sh
   gnucash/trunk/src/backend/xml/test/test-xml-account.c
   gnucash/trunk/src/backend/xml/test/test-xml-transaction.c
Log:
[Testing] Backend/XML: Provide checked error messages to replace noted warnings


Much better for expected warnings to be tested for than to have a lead-in message saying that they're really OK.

Modified: gnucash/trunk/src/backend/xml/test/test-load-xml2.c
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-load-xml2.c	2011-12-05 00:07:39 UTC (rev 21674)
+++ gnucash/trunk/src/backend/xml/test/test-load-xml2.c	2011-12-05 00:07:48 UTC (rev 21675)
@@ -79,6 +79,11 @@
     QofBook *book;
     Account *root;
     gboolean ignore_lock;
+    gchar *logdomain = "GConf";
+    guint loglevel = G_LOG_LEVEL_WARNING;
+    TestErrorStruct check = { loglevel, logdomain, NULL };
+    g_log_set_handler (logdomain, loglevel,
+		       (GLogFunc)test_checked_handler, &check);
 
     session = qof_session_new();
 

Modified: gnucash/trunk/src/backend/xml/test/test-real-data.sh
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-real-data.sh	2011-12-05 00:07:39 UTC (rev 21674)
+++ gnucash/trunk/src/backend/xml/test/test-real-data.sh	2011-12-05 00:07:48 UTC (rev 21675)
@@ -14,7 +14,9 @@
       mkdir $j
       FILES=`perl $SRCDIR/grab-types.pl "gnc:$j" $i "$j/dataXXX.xml"`
       if [ ! -z "$FILES" ] ; then
-        echo "Testing ./test-xml-$j $j/data*.xml # from `basename $i`:" 
+	  if [ "x$VERBOSE" = "xyes" ] ; then
+              echo "Testing ./test-xml-$j $j/data*.xml # from `basename $i`:"
+	  fi
         eval "./test-xml-$j $FILES 2>/dev/null"
         if [ $? != 0 ] ; then
           EXIT_VALUE=1

Modified: gnucash/trunk/src/backend/xml/test/test-xml-account.c
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-xml-account.c	2011-12-05 00:07:39 UTC (rev 21674)
+++ gnucash/trunk/src/backend/xml/test/test-xml-account.c	2011-12-05 00:07:48 UTC (rev 21675)
@@ -319,12 +319,18 @@
     {
         /* empty some things. */
         Account *act;
+	gchar *msg = "xaccAccountSetCommodity: assertion `GNC_IS_COMMODITY(com)' failed";
+	gchar *logdomain = "gnc.engine";
+	guint loglevel = G_LOG_LEVEL_CRITICAL;
+	TestErrorStruct check = { loglevel, logdomain, msg };
+	g_log_set_handler (logdomain, loglevel,
+			   (GLogFunc)test_checked_handler, &check);
 
         act = get_random_account(sixbook);
 
         xaccAccountSetCode(act, "");
         xaccAccountSetDescription(act, "");
-        g_print("Expect a critical assert here:\n");
+
         xaccAccountSetCommodity(act, NULL);
 
         test_account(-1, act);

Modified: gnucash/trunk/src/backend/xml/test/test-xml-transaction.c
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-xml-transaction.c	2011-12-05 00:07:39 UTC (rev 21674)
+++ gnucash/trunk/src/backend/xml/test/test-xml-transaction.c	2011-12-05 00:07:48 UTC (rev 21675)
@@ -467,11 +467,15 @@
             sixtp *parser;
             tran_data data;
 
-            data.trn = ran_trn;
+	    gchar *msg = "[xaccAccountScrubCommodity()] Account \"\" does not have a commodity!";
+	    gchar *logdomain = "gnc.engine.scrub";
+	    guint loglevel = G_LOG_LEVEL_CRITICAL;
+	    TestErrorStruct check = { loglevel, logdomain, msg };
+	    g_log_set_handler (logdomain, loglevel,
+			       (GLogFunc)test_checked_handler, &check);
+           data.trn = ran_trn;
             data.com = com;
             data.value = i;
-
-            g_print(" There will follow a bunch of CRIT scrub errors about the account not having a commodity. There isn't an account in the XML, so of course not. Ignore the errors\n");
             parser = gnc_transaction_sixtp_parser_create();
 
             if (!gnc_xml_parse_file(parser, filename1, test_add_transaction,