r23033 - gnucash/trunk/src/report - Reports: Reduce test verbosity
Geert Janssens
gjanssens at code.gnucash.org
Mon Jun 3 17:59:47 EDT 2013
Author: gjanssens
Date: 2013-06-03 17:59:46 -0400 (Mon, 03 Jun 2013)
New Revision: 23033
Trac: http://svn.gnucash.org/trac/changeset/23033
Modified:
gnucash/trunk/src/report/report-system/test/test-collectors.scm
gnucash/trunk/src/report/report-system/test/test-extras.scm
gnucash/trunk/src/report/standard-reports/test/test-generic-category-report.scm
gnucash/trunk/src/report/standard-reports/test/test-generic-net-barchart.scm
gnucash/trunk/src/report/standard-reports/test/test-generic-net-linechart.scm
Log:
Reports: Reduce test verbosity
Modified: gnucash/trunk/src/report/report-system/test/test-collectors.scm
===================================================================
--- gnucash/trunk/src/report/report-system/test/test-collectors.scm 2013-06-02 10:55:13 UTC (rev 23032)
+++ gnucash/trunk/src/report/report-system/test/test-collectors.scm 2013-06-03 21:59:46 UTC (rev 23033)
@@ -100,7 +100,7 @@
(define (test-collector-into-list)
(define (check l)
(equal? l (collector-add-all (collector-into-list) l)))
- (logging-and (check '())
+ (and (check '())
(check '(1))
(check '(1 2))
(check '(1 2 3))
Modified: gnucash/trunk/src/report/report-system/test/test-extras.scm
===================================================================
--- gnucash/trunk/src/report/report-system/test/test-extras.scm 2013-06-02 10:55:13 UTC (rev 23032)
+++ gnucash/trunk/src/report/report-system/test/test-extras.scm 2013-06-03 21:59:46 UTC (rev 23033)
@@ -132,7 +132,6 @@
(split-1 (xaccMallocSplit (gnc-get-current-book)))
(split-2 (xaccMallocSplit (gnc-get-current-book)))
(localtime (gnc:timepair->date date)))
- (format #t "amount ~a ~a\n" aaa debit)
(with-transaction txn
(lambda ()
(xaccTransSetDescription txn (env-string env "ponies"))
Modified: gnucash/trunk/src/report/standard-reports/test/test-generic-category-report.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-generic-category-report.scm 2013-06-02 10:55:13 UTC (rev 23032)
+++ gnucash/trunk/src/report/standard-reports/test/test-generic-category-report.scm 2013-06-03 21:59:46 UTC (rev 23033)
@@ -46,6 +46,7 @@
(asset-test asset-report-uuid)
#t))
+;; No real test here, just confirm that no exceptions are thrown
(define (null-test uuid)
(let* ((template (gnc:find-report-template uuid))
(options (gnc:make-report-options uuid))
@@ -56,7 +57,7 @@
(let ((doc (renderer report)))
(gnc:html-document-set-style-sheet! doc
(gnc:report-stylesheet report))
- (format #t "render: ~a\n" (gnc:html-document-render doc #f))
+ #t
)))
@@ -87,13 +88,6 @@
(set-option income-report gnc:pagename-accounts "Accounts" (list my-income-account))
(set-option income-report gnc:pagename-accounts "Show Accounts until level" 'all)
- (gnc:options-for-each (lambda (option)
- (format #t "Option: ~a.~a Value ~a\n"
- (gnc:option-section option)
- (gnc:option-name option)
- (gnc:option-value option)))
- income-options)
-
(let ((doc (income-renderer income-report)))
(gnc:html-document-set-style-sheet! doc
(gnc:report-stylesheet income-report))
@@ -106,8 +100,6 @@
(every (lambda (date value-list)
(let ((day (second date))
(value (first value-list)))
- (format #t "[~a] [~a]\n"
- (string->number day) (string->number value))
(= (string->number day) (string->number value))))
(map first tbl)
(map second tbl))))))))
@@ -136,7 +128,6 @@
(list "Bank"))))
(leaf-expense-accounts (list-leaves expense-accounts))
(bank-account (car (car (cdr asset-accounts)))))
- (format #t "Expense accounts ~a\n" leaf-expense-accounts)
(for-each (lambda (expense-account)
(env-create-daily-transactions env
(gnc:get-start-this-month)
@@ -179,7 +170,6 @@
(let ((columns (stream->list (pattern-streamer "<th>"
(list (list "<string> ([^<]*)</" 1))
doc))))
- (format #t "Columns ~a\n" columns)
(map caar columns)))
;;
@@ -214,14 +204,6 @@
(set-option asset-report gnc:pagename-accounts "Accounts" (list my-asset-account))
(set-option asset-report gnc:pagename-accounts "Show Accounts until level" 'all)
- (gnc:options-for-each (lambda (option)
- (format #t "Option: ~a.~a Value ~a\n"
- (gnc:option-section option)
- (gnc:option-name option)
- (gnc:option-value option)))
- asset-options)
-
-
(let ((doc (asset-renderer asset-report)))
(gnc:html-document-set-style-sheet! doc
(gnc:report-stylesheet asset-report))
@@ -233,8 +215,7 @@
(list "<number> ([^<]*)</td>" 1))
html-document)))
(row-count (tbl-row-count tbl)))
- (format #t "Report: ~a\n" tbl)
- (logging-and (member "account-1" columns)
+ (and (member "account-1" columns)
(= 2 (length columns))
(= 1 (string->number (car (tbl-ref tbl 0 1))))
(= (/ (* row-count (+ row-count 1)) 2)
Modified: gnucash/trunk/src/report/standard-reports/test/test-generic-net-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-generic-net-barchart.scm 2013-06-02 10:55:13 UTC (rev 23032)
+++ gnucash/trunk/src/report/standard-reports/test/test-generic-net-barchart.scm 2013-06-03 21:59:46 UTC (rev 23033)
@@ -40,7 +40,8 @@
(let ((doc (renderer report)))
(gnc:html-document-set-style-sheet! doc
(gnc:report-stylesheet report))
- (format #t "render: ~a\n" (gnc:html-document-render doc #f))
+ ;;(format #t "render: ~a\n" (gnc:html-document-render doc #f))
+ #t
)))
(define (single-txn-test uuid)
@@ -84,8 +85,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n" tbl)
- (logging-and (= 1 (tbl-ref->number tbl 0 1))
+ (and (= 1 (tbl-ref->number tbl 0 1))
(= 0 (tbl-ref->number tbl 0 2))
(= 1 (tbl-ref->number tbl 0 3))
(= 1 (tbl-row-count tbl))
@@ -139,8 +139,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n~a\n" result tbl)
- (logging-and (every (lambda (row)
+ (and (every (lambda (row)
(and (equal? (second row) (fourth row))
(= 0 (string->number (car (third row))))))
tbl)
@@ -194,8 +193,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n" tbl)
- (logging-and (every (lambda (row)
+ (and (every (lambda (row)
(and (= (string->number (car (fourth row)))
(+ (string->number (car (second row)))
(string->number (car (third row)))))
@@ -251,8 +249,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n" tbl)
- (logging-and (every (lambda (row)
+ (and (every (lambda (row)
(and (= (string->number (car (fourth row)))
(+ (string->number (car (second row)))
(string->number (car (third row)))))
@@ -317,8 +314,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n" tbl)
- (logging-and (every (lambda (row)
+ (and (every (lambda (row)
(and (= (string->number (car (fourth row)))
(+ (string->number (car (second row)))
(string->number (car (third row)))))))
Modified: gnucash/trunk/src/report/standard-reports/test/test-generic-net-linechart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-generic-net-linechart.scm 2013-06-02 10:55:13 UTC (rev 23032)
+++ gnucash/trunk/src/report/standard-reports/test/test-generic-net-linechart.scm 2013-06-03 21:59:46 UTC (rev 23033)
@@ -38,7 +38,8 @@
(let ((doc (renderer report)))
(gnc:html-document-set-style-sheet! doc
(gnc:report-stylesheet report))
- (format #t "render: ~a\n" (gnc:html-document-render doc #f))
+ ;;(format #t "render: ~a\n" (gnc:html-document-render doc #f))
+ #t
)))
(define (single-txn-test uuid)
@@ -82,8 +83,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n" tbl)
- (logging-and (= 1 (tbl-ref->number tbl 0 1))
+ (and (= 1 (tbl-ref->number tbl 0 1))
(= 0 (tbl-ref->number tbl 0 2))
(= 1 (tbl-ref->number tbl 0 3))
(= 1 (tbl-row-count tbl))
@@ -137,8 +137,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n~a\n" result tbl)
- (logging-and (every (lambda (row)
+ (and (every (lambda (row)
(and (equal? (second row) (fourth row))
(= 0 (string->number (car (third row))))))
tbl)
@@ -192,8 +191,7 @@
(list "<number> ([^<]*)</td>" 1)
(list "<number> ([^<]*)</td>" 1))
result))))
- (format #t "~a\n" tbl)
- (logging-and (every (lambda (row)
+ (and (every (lambda (row)
(and (= (string->number (car (fourth row)))
(+ (string->number (car (second row)))
(string->number (car (third row)))))
More information about the gnucash-changes
mailing list