From c5af00805e6d67d5df7ae9bf69488ea9dd06047d Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Thu, 20 Dec 2001 11:02:40 +0000
Subject: [PATCH] * src/backend/postgres/test/test-db.c: work on tests

* src/backend/postgres/test/.cvsignore: ignore database dirs


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6400 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/backend/postgres/test/.cvsignore |  2 +-
 src/backend/postgres/test/test-db.c  | 44 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/backend/postgres/test/.cvsignore b/src/backend/postgres/test/.cvsignore
index 36ff023814..3dc7e373f5 100644
--- a/src/backend/postgres/test/.cvsignore
+++ b/src/backend/postgres/test/.cvsignore
@@ -1,7 +1,7 @@
 .deps
 Makefile
 Makefile.in
-gnc_test
+gnc_test*
 test-db
 test-escape
 test_file_*
diff --git a/src/backend/postgres/test/test-db.c b/src/backend/postgres/test/test-db.c
index 7a32796eec..0779b23705 100644
--- a/src/backend/postgres/test/test-db.c
+++ b/src/backend/postgres/test/test-db.c
@@ -600,12 +600,12 @@ compare_balances (GNCSession *session_1, GNCSession *session_2)
   GNCBook * book_2 = gnc_session_get_book (session_2);
   GList * list;
   GList * node;
+  gboolean ok;
 
   g_return_val_if_fail (session_1, FALSE);
   g_return_val_if_fail (session_2, FALSE);
 
-  /* FIXME: remove */
-  return TRUE;
+  ok = TRUE;
 
   list = xaccGroupGetSubAccounts (gnc_book_get_group (book_1));
   for (node = list; node; node = node->next)
@@ -616,38 +616,42 @@ compare_balances (GNCSession *session_1, GNCSession *session_2)
     account_2 = xaccAccountLookup (xaccAccountGetGUID (account_1), book_2);
     if (!account_2)
     {
-      g_warning ("session_1 has account %s but not session_2",
-                 guid_to_string (xaccAccountGetGUID (account_1)));
+      failure_args ("", __FILE__, __LINE__,
+                    "session_1 has account %s but not session_2",
+                    guid_to_string (xaccAccountGetGUID (account_1)));
       return FALSE;
     }
 
-    if (!gnc_numeric_eq (xaccAccountGetBalance (account_1),
-                         xaccAccountGetBalance (account_2)))
+    if (!gnc_numeric_equal (xaccAccountGetBalance (account_1),
+                            xaccAccountGetBalance (account_2)))
     {
-      g_warning ("balances not equal for account %s",
-                 guid_to_string (xaccAccountGetGUID (account_1)));
-      return FALSE;
+      failure_args ("", __FILE__, __LINE__,
+                    "balances not equal for account %s",
+                    guid_to_string (xaccAccountGetGUID (account_1)));
+      ok = FALSE;
     }
 
-    if (!gnc_numeric_eq (xaccAccountGetClearedBalance (account_1),
-                         xaccAccountGetClearedBalance (account_2)))
+    if (!gnc_numeric_equal (xaccAccountGetClearedBalance (account_1),
+                            xaccAccountGetClearedBalance (account_2)))
     {
-      g_warning ("cleared balances not equal for account %s",
-                 guid_to_string (xaccAccountGetGUID (account_1)));
-      return FALSE;
+      failure_args ("", __FILE__, __LINE__,
+                    "cleared balances not equal for account %s",
+                    guid_to_string (xaccAccountGetGUID (account_1)));
+      ok = FALSE;
     }
 
-    if (!gnc_numeric_eq (xaccAccountGetReconciledBalance (account_1),
-                         xaccAccountGetReconciledBalance (account_2)))
+    if (!gnc_numeric_equal (xaccAccountGetReconciledBalance (account_1),
+                            xaccAccountGetReconciledBalance (account_2)))
     {
-      g_warning ("reconciled balances not equal for account %s",
-                 guid_to_string (xaccAccountGetGUID (account_1)));
-      return FALSE;
+      failure_args ("", __FILE__, __LINE__,
+                    "reconciled balances not equal for account %s",
+                    guid_to_string (xaccAccountGetGUID (account_1)));
+      ok = FALSE;
     }
   }
   g_list_free (list);
 
-  return TRUE;
+  return ok;
 }
 
 static gboolean