From c6195d6e7aa8e4dd691657df00aaccc85f92388a Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Thu, 3 Oct 2019 08:05:52 +0800 Subject: [PATCH] [test-budget] centralize gnc:create-budget-and-transactions it will be reused by test-stress-options --- .../standard-reports/test/test-budget.scm | 34 ++----------------- libgnucash/engine/test/test-extras.scm | 30 ++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gnucash/report/standard-reports/test/test-budget.scm b/gnucash/report/standard-reports/test/test-budget.scm index 0c59686cf3..21e5063164 100644 --- a/gnucash/report/standard-reports/test/test-budget.scm +++ b/gnucash/report/standard-reports/test/test-budget.scm @@ -62,40 +62,10 @@ (define (options->sxml options uuid 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)) + (budget (gnc:create-budget-and-transactions env account-alist)) (options (gnc:make-report-options budget-uuid)) (bank (cdr (assoc "Bank" account-alist)))) @@ -186,7 +156,7 @@ (define (test-budget-income-statement) (let* ((env (create-test-env)) (account-alist (create-test-data)) - (budget (create-budget-and-transactions env account-alist)) + (budget (gnc:create-budget-and-transactions env account-alist)) (options (gnc:make-report-options budget-is-uuid)) (bank (assoc-ref account-alist "Bank"))) diff --git a/libgnucash/engine/test/test-extras.scm b/libgnucash/engine/test/test-extras.scm index 3fbe5bd9fc..126f7e0ec6 100644 --- a/libgnucash/engine/test/test-extras.scm +++ b/libgnucash/engine/test/test-extras.scm @@ -834,6 +834,36 @@ (vector inv-1 inv-2 inv-3 inv-4 inv-5 inv-6 inv-7 inv-8))) +(define-public (gnc: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)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; various stock transactions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;