Convert non-trep-based report tests to new API

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 (gnc-lookup-option options section name)
-    (if option
+      (gnc-set-option options section name value)
-        (gnc:option-set-value option value)
+      (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define (accsum-tests)
   (let* ((account-alist (create-test-data))

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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+        (gnc-set-option (gnc:optiondb options) section name value)
-        (gnc:option-set-value option value)
+        (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define (mnemonic->commodity sym)
   (gnc-commodity-table-lookup

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))

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

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 (gnc-lookup-option (gnc:optiondb options) section name)
-      (if option
+        (gnc-set-option (gnc:optiondb options) section name value)
-          (gnc:option-set-value option value)
+        (test-assert (format #f "[~a] wrong-option ~a ~a" variant section name) #f)))
-          (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 (gnc-lookup-option (gnc:optiondb options) section name)
-      (if option
+        (gnc-set-option (gnc:optiondb options) section name value)
-          (gnc:option-set-value option value)
+        (test-assert (format #f "[~a] wrong-option ~a ~a" variant section name) #f)))
-          (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)))))
-

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))

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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+      (gnc-set-option (gnc:optiondb options) section name value)
-        (gnc:option-set-value option value)
+      (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define (null-test)
   ;; This null-test tests for the presence of report.

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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+      (gnc-set-option (gnc:optiondb options) section name value)
-        (gnc:option-set-value option value)
+      (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define structure
   (list "Root" (list (cons 'type ACCT-TYPE-ASSET)

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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+      (gnc-set-option (gnc:optiondb options) section name value)
-        (gnc:option-set-value option value)
+      (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define (get-currency sym)
   (gnc-commodity-table-lookup

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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+      (gnc-set-option (gnc:optiondb options) section name value)
-        (gnc:option-set-value option value)
+      (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define (get-currency sym)
   (gnc-commodity-table-lookup

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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+      (gnc-set-option (gnc:optiondb options) section name value)
-        (gnc:option-set-value option value)
+      (test-assert (format #f "wrong-option ~a ~a" section name) #f)))
-        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
 
 (define (teardown)
   (gnc-clear-current-session))

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))

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

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)

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)

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)
+                     (GncOption-get-section option)
-                     (gnc:option-name option)
+                     (GncOption-get-name option)
-                     (case (gnc:option-type 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 (gnc-lookup-option (gnc:optiondb options) section name)
-    (if option
+      (gnc-set-option (gnc:optiondb options) section name value)))
-        (gnc:option-set-value option 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

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))