[Gnucash-changes] Neil Williams' patch to clean up the test-book-merge.

[Derek Atkins]

Log Message:
-----------
Neil Williams' patch to clean up the test-book-merge.

	* src/engine/test/test-book-merge.c:
	  The first change is just simplification, the second change is the fix.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/src/engine/test:
        test-book-merge.c

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.164
retrieving revision 1.1487.2.165
diff -LChangeLog -LChangeLog -u -r1.1487.2.164 -r1.1487.2.165
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-02-02  Derek Atkins  <derek at ihtfp.com>
+
+	Neil Williams' patch to clean up the test-book-merge:
+	* src/engine/test/test-book-merge.c:
+	  The first change is just simplification, the second change is the fix.
+
 2005-01-30  Derek Atkins  <derek at ihtfp.com>
 
 	Neil Williams' QOF sync patch:
Index: test-book-merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-book-merge.c,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -Lsrc/engine/test/test-book-merge.c -Lsrc/engine/test/test-book-merge.c -u -r1.2.2.2 -r1.2.2.3
--- src/engine/test/test-book-merge.c
+++ src/engine/test/test-book-merge.c
@@ -213,7 +213,7 @@
 gnc_numeric
 obj_getAmount(myobj *g)
 {
-	if(!g) return double_to_gnc_numeric(0,0,GNC_HOW_DENOM_EXACT);
+	if(!g) return gnc_numeric_zero();
 	return g->Amount;
 }
 
@@ -413,6 +413,7 @@
 	importstring = NULL;
 	targetstring = NULL;
 	skip_target = FALSE;
+	mergeData->currentRule = rule;
 	do_test ((rule != NULL), "loop:#1 Rule is NULL");
 	do_test (remainder > 0, "loop:#2 remainder error.");
 	do_test ((safe_strcmp(NULL, rule->mergeLabel) != 0), "loop:#3 object label\n");