From d1ab2bdd57ddc8b8af65a54062c93ea2e6cb753a Mon Sep 17 00:00:00 2001 From: David Hampton Date: Sun, 18 Feb 2007 06:34:24 +0000 Subject: [PATCH] Get 'make check' working again. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/remove-group2@15598 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/backend/file/test/test-load-example-account.c | 2 +- src/backend/file/test/test-xml-transaction.c | 4 ++++ src/engine/Account.c | 1 + src/engine/test-core/test-engine-stuff.c | 6 +++--- src/engine/test-core/test-engine-stuff.h | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/backend/file/test/test-load-example-account.c b/src/backend/file/test/test-load-example-account.c index 46815faa59..4d079bf5bb 100644 --- a/src/backend/file/test/test-load-example-account.c +++ b/src/backend/file/test/test-load-example-account.c @@ -93,7 +93,7 @@ guile_main (void *closure, int argc, char **argv) gchar *to_open = g_build_filename(location, entry, (gchar*)NULL); if (!g_file_test(to_open, G_FILE_TEST_IS_DIR)) { - test_load_file(book, to_open); + test_load_file(to_open); } g_free(to_open); } diff --git a/src/backend/file/test/test-xml-transaction.c b/src/backend/file/test/test-xml-transaction.c index 2f8fa566ab..26aaba0af5 100644 --- a/src/backend/file/test/test-xml-transaction.c +++ b/src/backend/file/test/test-xml-transaction.c @@ -365,12 +365,16 @@ test_transaction(void) for(i = 0; i < 50; i++) { Transaction *ran_trn; + Account *root; xmlNodePtr test_node; gnc_commodity *com; gchar *compare_msg; gchar *filename1; int fd; + /* The next line exists for its side effect of creating the + * account tree. */ + root = get_random_account_tree(book); ran_trn = get_random_transaction(book); if(!ran_trn) { diff --git a/src/engine/Account.c b/src/engine/Account.c index 153b2e7398..b2ee929d7f 100644 --- a/src/engine/Account.c +++ b/src/engine/Account.c @@ -246,6 +246,7 @@ gnc_account_create_root (QofBook *book) root = xaccMallocAccount(book); xaccAccountBeginEdit(root); root->type = ACCT_TYPE_ROOT; + CACHE_REPLACE(root->accountName, _("Root Account")); xaccAccountCommitEdit(root); gnc_book_set_root_account(book, root); return root; diff --git a/src/engine/test-core/test-engine-stuff.c b/src/engine/test-core/test-engine-stuff.c index 66d6891733..d2b5cc7c7a 100644 --- a/src/engine/test-core/test-engine-stuff.c +++ b/src/engine/test-core/test-engine-stuff.c @@ -868,7 +868,7 @@ make_random_account_tree (QofBook *book, Account *root) } Account * -get_random_accounts (QofBook *book) +get_random_account_tree (QofBook *book) { Account * root; @@ -1855,7 +1855,7 @@ get_random_book (void) book = qof_book_new (); - get_random_accounts (book); + get_random_account_tree (book); get_random_pricedb (book); return book; @@ -1871,7 +1871,7 @@ get_random_session (void) book = qof_session_get_book (session); - get_random_accounts (book); + get_random_account_tree (book); get_random_pricedb (book); return session; diff --git a/src/engine/test-core/test-engine-stuff.h b/src/engine/test-core/test-engine-stuff.h index 369d4b0903..18115caf22 100644 --- a/src/engine/test-core/test-engine-stuff.h +++ b/src/engine/test-core/test-engine-stuff.h @@ -42,7 +42,7 @@ void set_max_accounts_per_level (gint max_accounts); GNCPrice * get_random_price(QofBook *book); gboolean make_random_pricedb (QofBook *book, GNCPriceDB *pdb); GNCPriceDB * get_random_pricedb(QofBook *book); -Account * get_random_accounts(QofBook * book); +Account * get_random_account_tree(QofBook * book); Account* get_random_account(QofBook * book); Split* get_random_split(QofBook *book, Account *account, Transaction *trn); Transaction* get_random_transaction(QofBook *book);