diff --git a/gnucash/report/reports/standard/test/test-account-summary.scm b/gnucash/report/reports/standard/test/test-account-summary.scm index 9740fe40be..d46aea6b7a 100644 --- a/gnucash/report/reports/standard/test/test-account-summary.scm +++ b/gnucash/report/reports/standard/test/test-account-summary.scm @@ -36,10 +36,9 @@ (gnc:options->sxml uuid options "test-accsum" test-title)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option options section name) + (gnc-set-option options section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define (accsum-tests) (let* ((account-alist (create-test-data)) diff --git a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm index fa2adf5ea8..6213d80bef 100644 --- a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm +++ b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm @@ -38,10 +38,9 @@ (gnc:options->sxml uuid options "test-balsheet-pnl" test-title)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define (mnemonic->commodity sym) (gnc-commodity-table-lookup diff --git a/gnucash/report/reports/standard/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm index 93adc3a3f2..621d1c3d5d 100644 --- a/gnucash/report/reports/standard/test/test-budget.scm +++ b/gnucash/report/reports/standard/test/test-budget.scm @@ -55,7 +55,7 @@ (test-end "budget")) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (teardown) (gnc-clear-current-session)) diff --git a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm index df06204a0c..b58ee9b43d 100644 --- a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm +++ b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm @@ -38,7 +38,7 @@ (test-null-txn)) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (str->num str) (string->number diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm index 99baec835d..a60251caf0 100644 --- a/gnucash/report/reports/standard/test/test-charts.scm +++ b/gnucash/report/reports/standard/test/test-charts.scm @@ -83,10 +83,9 @@ (define (test-net-chart-variant variant) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "[~a] wrong-option ~a ~a" variant section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "[~a] wrong-option ~a ~a" variant section name) #f))) (let* ((uuid (variant->uuid variant)) (inc-exp? (memq variant '(income-expense-barchart income-expense-linechart))) (env (create-test-env)) @@ -147,10 +146,9 @@ (define (test-chart-variant variant) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "[~a] wrong-option ~a ~a" variant section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "[~a] wrong-option ~a ~a" variant section name) #f))) (let* ((uuid (variant->uuid variant)) (env (create-test-env)) (account-alist (env-create-account-structure-alist env structure)) @@ -254,4 +252,3 @@ ((net-worth-barchart income-expense-barchart net-worth-linechart income-expense-linechart) (test-net-chart-variant variant))))) - diff --git a/gnucash/report/reports/standard/test/test-equity-statement.scm b/gnucash/report/reports/standard/test/test-equity-statement.scm index 7e4646d83f..24811f7e4c 100644 --- a/gnucash/report/reports/standard/test/test-equity-statement.scm +++ b/gnucash/report/reports/standard/test/test-equity-statement.scm @@ -42,7 +42,7 @@ (test-end "equity-statement")) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (teardown) (gnc-clear-current-session)) diff --git a/gnucash/report/reports/standard/test/test-ifrs-cost-basis.scm b/gnucash/report/reports/standard/test/test-ifrs-cost-basis.scm index f7b1ec754b..27539183aa 100644 --- a/gnucash/report/reports/standard/test/test-ifrs-cost-basis.scm +++ b/gnucash/report/reports/standard/test/test-ifrs-cost-basis.scm @@ -27,10 +27,9 @@ (gnc:options->sxml uuid options "test-ifrs-basis" test-title)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define (null-test) ;; This null-test tests for the presence of report. diff --git a/gnucash/report/reports/standard/test/test-invoice.scm b/gnucash/report/reports/standard/test/test-invoice.scm index 96fb56efc9..d7e04e3f87 100644 --- a/gnucash/report/reports/standard/test/test-invoice.scm +++ b/gnucash/report/reports/standard/test/test-invoice.scm @@ -52,10 +52,9 @@ 1 row col)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define structure (list "Root" (list (cons 'type ACCT-TYPE-ASSET) diff --git a/gnucash/report/reports/standard/test/test-new-owner-report.scm b/gnucash/report/reports/standard/test/test-new-owner-report.scm index 4dec7544a5..e0acfd9774 100644 --- a/gnucash/report/reports/standard/test/test-new-owner-report.scm +++ b/gnucash/report/reports/standard/test/test-new-owner-report.scm @@ -49,10 +49,9 @@ (sxml->table-row-col sxml 3 row col)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define (get-currency sym) (gnc-commodity-table-lookup diff --git a/gnucash/report/reports/standard/test/test-owner-report.scm b/gnucash/report/reports/standard/test/test-owner-report.scm index de8b157a6e..5ebd3f1be2 100644 --- a/gnucash/report/reports/standard/test/test-owner-report.scm +++ b/gnucash/report/reports/standard/test/test-owner-report.scm @@ -53,10 +53,9 @@ (sxml->table-row-col sxml 3 row col)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define (get-currency sym) (gnc-commodity-table-lookup diff --git a/gnucash/report/reports/standard/test/test-portfolios.scm b/gnucash/report/reports/standard/test/test-portfolios.scm index 8e71665bfa..a939e01ece 100644 --- a/gnucash/report/reports/standard/test/test-portfolios.scm +++ b/gnucash/report/reports/standard/test/test-portfolios.scm @@ -50,10 +50,9 @@ (gnc:options->sxml uuid options "test-apr" test-title)) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value) - (test-assert (format #f "wrong-option ~a ~a" section name) #f)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value) + (test-assert (format #f "wrong-option ~a ~a" section name) #f))) (define (teardown) (gnc-clear-current-session)) diff --git a/gnucash/report/reports/standard/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm index 59809cb266..bf3fe6fee5 100644 --- a/gnucash/report/reports/standard/test/test-register.scm +++ b/gnucash/report/reports/standard/test/test-register.scm @@ -42,7 +42,7 @@ (test-end "register")) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (teardown) (gnc-clear-current-session)) diff --git a/gnucash/report/reports/standard/test/test-standard-category-report.scm b/gnucash/report/reports/standard/test/test-standard-category-report.scm index 617fc93cb3..eb73b0cd21 100644 --- a/gnucash/report/reports/standard/test/test-standard-category-report.scm +++ b/gnucash/report/reports/standard/test/test-standard-category-report.scm @@ -46,7 +46,7 @@ (export run-category-asset-liability-test) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (str->num str) (string->number diff --git a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm index 862e5f340d..89bec638a2 100644 --- a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm +++ b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm @@ -38,7 +38,7 @@ (test-end "standard-net-barchart")) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (run-net-asset-income-test asset-report-uuid income-report-uuid) (null-test asset-report-uuid) diff --git a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm index 600327dddc..4e9fc114b2 100644 --- a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm +++ b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm @@ -38,7 +38,7 @@ (test-end "standard-net-linechart")) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (run-net-asset-test asset-report-uuid) (null-test asset-report-uuid) diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm index 6c73f9216d..79d0bc4edf 100644 --- a/gnucash/report/reports/standard/test/test-stress-options.scm +++ b/gnucash/report/reports/standard/test/test-stress-options.scm @@ -77,9 +77,9 @@ (else #f)) (set! report-options-tested (cons (make-combo - (gnc:option-section option) - (gnc:option-name option) - (case (gnc:option-type option) + (GncOption-get-section option) + (GncOption-get-name option) + (case (GncOption-get-type option) ((multichoice) (map (cut GncOption-permissible-value option <>) (iota (GncOption-num-permissible-values option)))) @@ -97,9 +97,8 @@ (get-environment-variable "COMBINATORICS")) (define (set-option! options section name value) - (let ((option (gnc:lookup-option options section name))) - (if option - (gnc:option-set-value option value)))) + (if (gnc-lookup-option (gnc:optiondb options) section name) + (gnc-set-option (gnc:optiondb options) section name value))) ;; code snippet to run report uuid, with options object (define (try-run-report uuid options option-summary) @@ -130,10 +129,10 @@ (newline) (for-each (lambda (idx) - (when (gnc:lookup-option options "General" "Start Date") + (when (gnc-lookup-option (gnc:optiondb options) "General" "Start Date") (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 1 12 1969)))) - (when (gnc:lookup-option options "General" "End Date") + (when (gnc-lookup-option (gnc:optiondb options) "General" "End Date") (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 1 1 1972)))) (let loop ((report-options report-options) @@ -174,10 +173,10 @@ (get-name option))) report-options) (newline) - (when (gnc:lookup-option options "General" "Start Date") + (when (gnc-lookup-option (gnc:optiondb options) "General" "Start Date") (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 1 12 1969)))) - (when (gnc:lookup-option options "General" "End Date") + (when (gnc-lookup-option (gnc:optiondb options) "General" "End Date") (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 1 1 1972)))) ;; generate combinatorics diff --git a/gnucash/report/reports/standard/test/test-trial-balance.scm b/gnucash/report/reports/standard/test/test-trial-balance.scm index f378fd3095..9591dcff96 100644 --- a/gnucash/report/reports/standard/test/test-trial-balance.scm +++ b/gnucash/report/reports/standard/test/test-trial-balance.scm @@ -42,7 +42,7 @@ (test-end "trial-balance")) (define (set-option options page tag value) - ((gnc:option-setter (gnc:lookup-option options page tag)) value)) + (gnc-set-option (gnc:optiondb options) page tag value)) (define (teardown) (gnc-clear-current-session))