From d1fddf557c496df910581d61a84ebc3ee7912dc5 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Sun, 4 Aug 2019 18:51:49 +0800 Subject: [PATCH] Modifications to consider module changes in master --- .../import-export/qif-imp/test/CMakeLists.txt | 17 ++++++++++- .../qif-imp/test/test-qif-imp.scm | 6 ++-- .../qif-imp/test/test-qif-merge-groups.scm | 13 ++++----- .../qif-imp/test/test-qif-parse.scm | 28 +++++++++---------- gnucash/report/eguile-html-utilities.scm | 1 - libgnucash/app-utils/test/CMakeLists.txt | 1 + libgnucash/app-utils/test/test-options.scm | 2 +- 7 files changed, 41 insertions(+), 27 deletions(-) diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt index fea1e7ac6d..efa8c4123e 100644 --- a/gnucash/import-export/qif-imp/test/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt @@ -9,11 +9,26 @@ set(scm_qifimp_test_with_srfi64_SOURCES test-qif-merge-groups.scm ) - +set (GUILE_DEPENDS + scm-gnc-module + scm-app-utils + scm-engine + scm-test-engine + scm-gettext + scm-scm + scm-qif-import +) gnc_add_test(test-link-qif-imp test-link.c QIF_IMP_TEST_INCLUDE_DIRS QIF_IMP_TEST_LIBS) if (HAVE_SRFI64) gnc_add_scheme_tests("${scm_qifimp_test_with_srfi64_SOURCES}") + + gnc_add_scheme_test_targets(scm-test-qif-imp-srfi64 + "${scm_qifimp_test_with_srfi64_SOURCES}" + "tests" + "${GUILE_DEPENDS};scm-srfi64-extras" + FALSE + ) endif (HAVE_SRFI64) set_dist_list(test_qif_import_DIST CMakeLists.txt test-link.c diff --git a/gnucash/import-export/qif-imp/test/test-qif-imp.scm b/gnucash/import-export/qif-imp/test/test-qif-imp.scm index 384cb2df74..0cd0524f72 100644 --- a/gnucash/import-export/qif-imp/test/test-qif-imp.scm +++ b/gnucash/import-export/qif-imp/test/test-qif-imp.scm @@ -1,9 +1,9 @@ (use-modules (gnucash gnc-module)) (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0)) (use-modules (srfi srfi-64)) -(use-modules (gnucash engine test srfi64-extras)) -(use-modules (gnucash import-export qif-import)) -(use-modules (gnucash import-export string)) +(use-modules (tests srfi64-extras)) +(use-modules (gnucash qif-import)) +(use-modules (gnucash string)) (define (run-test) (test-runner-factory gnc:test-runner) diff --git a/gnucash/import-export/qif-imp/test/test-qif-merge-groups.scm b/gnucash/import-export/qif-imp/test/test-qif-merge-groups.scm index 9bbf8ad568..bd9eb022a7 100644 --- a/gnucash/import-export/qif-imp/test/test-qif-merge-groups.scm +++ b/gnucash/import-export/qif-imp/test/test-qif-merge-groups.scm @@ -1,11 +1,10 @@ (use-modules (gnucash gnc-module)) (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0)) (use-modules (srfi srfi-64)) -(use-modules (gnucash engine test srfi64-extras)) -(use-modules (gnucash import-export qif-import)) -(use-modules (gnucash import-export string)) -(use-modules (gnucash engine test test-extras)) -(use-modules (gnucash report report-system)) +(use-modules (tests srfi64-extras)) +(use-modules (gnucash qif-import)) +(use-modules (gnucash string)) +(use-modules (tests test-engine-extras)) (define (run-test) (test-runner-factory gnc:test-runner) @@ -23,7 +22,7 @@ (define (test-gnc:account-tree-get-transactions) (define gnc:account-tree-get-transactions - (@@ (gnucash import-export qif-import) gnc:account-tree-get-transactions)) + (@@ (gnucash qif-import) gnc:account-tree-get-transactions)) (test-group-with-cleanup "test-gnc:account-tree-get-transactions" (create-test-data) @@ -37,7 +36,7 @@ (define (test-gnc:account-tree-find-duplicates) (define gnc:account-tree-find-duplicates - (@@ (gnucash import-export qif-import) gnc:account-tree-find-duplicates)) + (@@ (gnucash qif-import) gnc:account-tree-find-duplicates)) (define new-structure (list "Root" (list (cons 'type ACCT-TYPE-ASSET)) (list "Asset" diff --git a/gnucash/import-export/qif-imp/test/test-qif-parse.scm b/gnucash/import-export/qif-imp/test/test-qif-parse.scm index ea47029d94..9d16b244c8 100644 --- a/gnucash/import-export/qif-imp/test/test-qif-parse.scm +++ b/gnucash/import-export/qif-imp/test/test-qif-parse.scm @@ -1,9 +1,9 @@ (use-modules (gnucash gnc-module)) (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0)) (use-modules (srfi srfi-64)) -(use-modules (gnucash engine test srfi64-extras)) -(use-modules (gnucash import-export qif-import)) -(use-modules (gnucash import-export string)) +(use-modules (tests srfi64-extras)) +(use-modules (gnucash qif-import)) +(use-modules (gnucash string)) (define (run-test) (test-runner-factory gnc:test-runner) @@ -28,27 +28,27 @@ ;; the following isn't exported but can be tested anyway! (define qif-parse:fix-year - (@@ (gnucash import-export qif-import) qif-parse:fix-year)) + (@@ (gnucash qif-import) qif-parse:fix-year)) (define qif-parse:parse-acct-type - (@@ (gnucash import-export qif-import) qif-parse:parse-acct-type)) + (@@ (gnucash qif-import) qif-parse:parse-acct-type)) (define qif-parse:parse-cleared-field - (@@ (gnucash import-export qif-import) qif-parse:parse-cleared-field)) + (@@ (gnucash qif-import) qif-parse:parse-cleared-field)) (define qif-split:parse-category - (@@ (gnucash import-export qif-import) qif-split:parse-category)) + (@@ (gnucash qif-import) qif-split:parse-category)) (define qif-parse:parse-action-field - (@@ (gnucash import-export qif-import) qif-parse:parse-action-field)) + (@@ (gnucash qif-import) qif-parse:parse-action-field)) (define qif-parse:check-date-format - (@@ (gnucash import-export qif-import) qif-parse:check-date-format)) + (@@ (gnucash qif-import) qif-parse:check-date-format)) (define qif-parse:parse-date/format - (@@ (gnucash import-export qif-import) qif-parse:parse-date/format)) + (@@ (gnucash qif-import) qif-parse:parse-date/format)) (define qif-parse:check-number-format - (@@ (gnucash import-export qif-import) qif-parse:check-number-format)) + (@@ (gnucash qif-import) qif-parse:check-number-format)) (define qif-parse:parse-number/format - (@@ (gnucash import-export qif-import) qif-parse:parse-number/format)) + (@@ (gnucash qif-import) qif-parse:parse-number/format)) (define qif-parse:check-number-formats - (@@ (gnucash import-export qif-import) qif-parse:check-number-formats)) + (@@ (gnucash qif-import) qif-parse:check-number-formats)) (define qif-parse:parse-numbers/format - (@@ (gnucash import-export qif-import) qif-parse:parse-numbers/format)) + (@@ (gnucash qif-import) qif-parse:parse-numbers/format)) (define (test-qif-parse:fix-year) diff --git a/gnucash/report/eguile-html-utilities.scm b/gnucash/report/eguile-html-utilities.scm index 2dd85917d5..2c8692acb3 100644 --- a/gnucash/report/eguile-html-utilities.scm +++ b/gnucash/report/eguile-html-utilities.scm @@ -30,7 +30,6 @@ (gnc:module-load "gnucash/report" 0) (gnc:module-load "gnucash/app-utils" 0) -(use-modules (gnucash report eguile-gnc)) (use-modules (ice-9 regex)) ; for regular expressions (use-modules (srfi srfi-13)) ; for extra string functions diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt index 86c49a8a06..111f7b3b85 100644 --- a/libgnucash/app-utils/test/CMakeLists.txt +++ b/libgnucash/app-utils/test/CMakeLists.txt @@ -91,6 +91,7 @@ set_dist_list(test_app_utils_DIST test-sx.cpp test-c-interface.scm test-date-utilities.scm + test-options.scm ${test_app_utils_scheme_SOURCES} ${test_app_utils_SOURCES} ) diff --git a/libgnucash/app-utils/test/test-options.scm b/libgnucash/app-utils/test/test-options.scm index 94c2880891..0ead090a92 100644 --- a/libgnucash/app-utils/test/test-options.scm +++ b/libgnucash/app-utils/test/test-options.scm @@ -1,7 +1,7 @@ (use-modules (gnucash gnc-module)) (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0)) (use-modules (srfi srfi-64)) -(use-modules (gnucash engine test srfi64-extras)) +(use-modules (tests srfi64-extras)) (define (run-test) (test-runner-factory gnc:test-runner)