gnucash maint: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Mon Mar 4 08:21:35 EST 2019
Updated via https://github.com/Gnucash/gnucash/commit/d16d71df (commit)
via https://github.com/Gnucash/gnucash/commit/9573359b (commit)
from https://github.com/Gnucash/gnucash/commit/e8637c74 (commit)
commit d16d71dfc625e53e979fede7694c35733ca91d38
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Mar 3 23:51:32 2019 +0800
[test-budget] initial commit
Tests budget.scm.
Options are tested; this is not exhaustive but covers most options.
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 0d00ec15f..da7fe6400 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -11,6 +11,7 @@ set(scm_test_with_srfi64_SOURCES
test-transaction.scm
test-balsheet-pnl.scm
test-income-gst.scm
+ test-budget.scm
test-register.scm
)
diff --git a/gnucash/report/standard-reports/test/test-budget.scm b/gnucash/report/standard-reports/test/test-budget.scm
new file mode 100644
index 000000000..f1fb8ce23
--- /dev/null
+++ b/gnucash/report/standard-reports/test/test-budget.scm
@@ -0,0 +1,168 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, contact:
+;;
+;; Free Software Foundation Voice: +1-617-542-5942
+;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+;; Boston, MA 02110-1301, USA gnu at gnu.org
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(use-modules (srfi srfi-1))
+(use-modules (srfi srfi-14))
+(use-modules (srfi srfi-64))
+(use-modules (gnucash gnc-module))
+(use-modules (gnucash engine test srfi64-extras))
+
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+
+(use-modules (gnucash utilities))
+(use-modules (gnucash report report-system))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash engine))
+(use-modules (sw_engine))
+(use-modules (gnucash report standard-reports budget))
+(use-modules (gnucash report report-system test test-extras))
+(use-modules (gnucash report stylesheets))
+(use-modules (gnucash engine test test-extras))
+
+;; Explicitly set locale to make the report output predictable
+(setlocale LC_ALL "C")
+(define uuid "810ed4b25ef0486ea43bbd3dddb32b11")
+
+(define (run-test)
+ (test-runner-factory gnc:test-runner)
+ (test-begin "budget")
+ (test-budget)
+ (test-end "budget"))
+
+(define (set-option options page tag value)
+ ((gnc:option-setter (gnc:lookup-option options page tag)) value))
+
+(define (teardown)
+ (gnc-clear-current-session))
+
+(define (options->sxml options test-title)
+ (gnc:options->sxml uuid options "test-budget" test-title))
+
+(define (create-budget-and-transactions env account-alist)
+ (let* ((book (gnc-get-current-book))
+ (budget (gnc-budget-new book))
+ (bank (cdr (assoc "Bank" account-alist)))
+ (income (cdr (assoc "Income" account-alist)))
+ (expense (cdr (assoc "Expenses" account-alist))))
+ (gnc-budget-set-name budget "test budget")
+ (gnc-budget-begin-edit budget)
+ (gnc-budget-set-num-periods budget 6)
+ (gnc-budget-set-account-period-value budget bank 0 20)
+ (gnc-budget-set-account-period-value budget bank 1 40)
+ (gnc-budget-set-account-period-value budget bank 3 60)
+ (gnc-budget-set-account-period-value budget expense 1 30)
+ (gnc-budget-set-account-period-value budget expense 2 20)
+ (gnc-budget-set-account-period-value budget expense 3 40)
+ (gnc-budget-set-account-period-value budget income 0 -55)
+ (gnc-budget-set-account-period-value budget income 2 -65)
+ (gnc-budget-set-account-period-value budget income 3 -75)
+ (gnc-budget-commit-edit budget)
+ (let ((midperiod (lambda (period)
+ (floor (/ (+ (gnc-budget-get-period-start-date budget period)
+ (gnc-budget-get-period-end-date budget period))
+ 2)))))
+ (env-create-transaction env (midperiod 0) bank income 55)
+ (env-create-transaction env (midperiod 2) bank income 67)
+ (env-create-transaction env (midperiod 3) bank income 77)
+ (env-create-transaction env (midperiod 0) expense bank 20)
+ (env-create-transaction env (midperiod 1) expense bank 20))
+ budget))
+
+(define (test-budget)
+ (let* ((env (create-test-env))
+ (account-alist (create-test-data))
+ (budget (create-budget-and-transactions env account-alist))
+ (options (gnc:make-report-options uuid))
+ (bank (cdr (assoc "Bank" account-alist))))
+
+ (set-option options "Accounts" "Account Display Depth" 'all)
+
+ (set-option options "Display" "Show Difference" #f)
+ (set-option options "Display" "Show Budget" #f)
+ (set-option options "Display" "Show Actual" #f)
+ (let ((sxml (options->sxml options "basic all display off")))
+ (test-equal "all display OFF, table has 15 cells"
+ 15
+ (length (sxml->table-row-col sxml 1 #f #f))))
+
+ (set-option options "Display" "Show Difference" #t)
+ (set-option options "Display" "Show Budget" #t)
+ (set-option options "Display" "Show Actual" #t)
+ (set-option options "Display" "Show Column with Totals" #t)
+ (let ((sxml (options->sxml options "basic")))
+ (test-equal "all display ON, table has 226 cells"
+ 226
+ (length (sxml->table-row-col sxml 1 #f #f)))
+ (test-equal "bank"
+ '("Bank" "$20.00" "$35.00" "-$15.00" "$40.00" "-$20.00" "$60.00"
+ "." "$67.00" "-$67.00" "$60.00" "$77.00" "-$17.00" "." "$0.00"
+ "." "." "$0.00" "." "$120.00" "$159.00" "-$39.00")
+ (sxml->table-row-col sxml 1 5 #f))
+ (test-equal "income"
+ '("Income" "-$55.00" "-$55.00" "$0.00" "." "$0.00" "." "-$65.00"
+ "-$67.00" "-$2.00" "-$75.00" "-$77.00" "-$2.00" "." "$0.00" "."
+ "." "$0.00" "." "-$195.00" "-$199.00" "-$4.00")
+ (sxml->table-row-col sxml 1 9 #f))
+ (test-equal "expense"
+ '("Expenses" "." "$20.00" "-$20.00" "$30.00" "$20.00" "$10.00"
+ "$20.00" "$0.00" "$20.00" "$40.00" "$0.00" "$40.00" "." "$0.00"
+ "." "." "$0.00" "." "$90.00" "$40.00" "$50.00")
+ (sxml->table-row-col sxml 1 11 #f)))
+
+ (set-option options "General" "Report for range of budget periods" #t)
+ (set-option options "General" "Range start" 'current)
+ (set-option options "General" "Range end" 'next)
+ (let ((sxml (options->sxml options "only next period")))
+ (test-equal "only next period - 133 cells"
+ 133
+ (length (sxml->table-row-col sxml 1 #f #f)))
+
+ (test-equal "only next period- bank"
+ '("Bank" "$20.00" "$35.00" "-$15.00" "$40.00" "-$20.00" "$60.00"
+ "$60.00" "$144.00" "-$84.00" "$120.00" "$159.00" "-$39.00")
+ (sxml->table-row-col sxml 1 5 #f)))
+
+ (set-option options "General" "Range start" 'last)
+ (set-option options "General" "Range end" 'last)
+ (let ((sxml (options->sxml options "only last period")))
+ (test-equal "only last period - 102 cells"
+ 102
+ (length (sxml->table-row-col sxml 1 #f #f)))
+
+ (test-equal "only last period - bank"
+ '("Bank" "$120.00" "$159.00" "-$39.00" "." "$0.00" "."
+ "$120.00" "$159.00" "-$39.00")
+ (sxml->table-row-col sxml 1 5 #f)))
+
+ (set-option options "General" "Range start" 'manual)
+ (set-option options "General" "Range end" 'manual)
+ (set-option options "General" "Exact start period" 2)
+ (set-option options "General" "Exact end period" 4)
+ (set-option options "General" "Include collapsed periods before selected." #f)
+ (set-option options "General" "Include collapsed periods after selected." #f)
+ (let ((sxml (options->sxml options "exact periods")))
+ (test-equal "exact periods - 133 cells"
+ 133
+ (length (sxml->table-row-col sxml 1 #f #f)))
+
+ (test-equal "exact periods - bank"
+ '("Bank" "$40.00" "-$20.00" "$60.00" "." "$67.00" "-$67.00"
+ "$60.00" "$77.00" "-$17.00" "$100.00" "$124.00" "-$24.00")
+ (sxml->table-row-col sxml 1 5 #f)))
+ ))
commit 9573359b8910945b804a891556c0cede364f1b45
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Mar 4 21:10:02 2019 +0800
[test-extras] augment xml parser to understand – entity
diff --git a/gnucash/report/report-system/test/test-extras.scm b/gnucash/report/report-system/test/test-extras.scm
index 2207e0ecb..9f546700d 100644
--- a/gnucash/report/report-system/test/test-extras.scm
+++ b/gnucash/report/report-system/test/test-extras.scm
@@ -81,7 +81,8 @@
(strip-string render strip-tag)
render)
#:trim-whitespace? #t
- #:entities '((nbsp . "\xa0"))))
+ #:entities '((nbsp . "\xa0")
+ (ndash . "Â"))))
(lambda (k . args)
(format #t "*** XML error: ~a ~a: ~a / ~a\n~a"
prefix test-title k args
Summary of changes:
gnucash/report/report-system/test/test-extras.scm | 3 +-
.../report/standard-reports/test/CMakeLists.txt | 1 +
.../report/standard-reports/test/test-budget.scm | 168 +++++++++++++++++++++
3 files changed, 171 insertions(+), 1 deletion(-)
create mode 100644 gnucash/report/standard-reports/test/test-budget.scm
More information about the gnucash-changes
mailing list