From 3ff5bd824618aabfcfdbb0fdaafbe5aad1b578ad Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Thu, 7 Oct 2021 09:37:24 +0800 Subject: [PATCH] [test-core-utils] uses srfi-64 --- bindings/guile/test/CMakeLists.txt | 2 +- bindings/guile/test/test-core-utils.scm | 27 ++++++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bindings/guile/test/CMakeLists.txt b/bindings/guile/test/CMakeLists.txt index 904f9baca2..ee48e6f49f 100644 --- a/bindings/guile/test/CMakeLists.txt +++ b/bindings/guile/test/CMakeLists.txt @@ -25,7 +25,6 @@ gnc_add_test_with_guile(test-scm-query test-scm-query.cpp ENGINE_TEST_INCLUDE_DI set(bindings_test_SCHEME - test-core-utils.scm test-create-account.scm ) @@ -59,6 +58,7 @@ add_dependencies(check scm-test-engine) gnc_add_scheme_tests("${engine_test_SCHEME}") set (scm_tests_with_srfi64_SOURCES + test-core-utils.scm test-business-core.scm test-scm-engine.scm ) diff --git a/bindings/guile/test/test-core-utils.scm b/bindings/guile/test/test-core-utils.scm index 5de9dd0ff7..2d0b0cfae9 100644 --- a/bindings/guile/test/test-core-utils.scm +++ b/bindings/guile/test/test-core-utils.scm @@ -1,17 +1,20 @@ -(define exit-code 0) (setenv "GNC_UNINSTALLED" "1") + +(use-modules (srfi srfi-64)) +(use-modules (tests srfi64-extras)) (use-modules (gnucash core-utils)) -(if (procedure? (module-ref (current-module) 'N_)) - (display "N_ defined\n") - (begin - (display "Failed - N_ not defined\n") - (set! exit-code -1))) +(define (N_-tests) + + (test-assert "N_ defined" + (module-ref (current-module) 'N_)) -(if (string=? (N_ "foobar") "foobar") - (display "N_ works properly\n") - (begin - (display "Failed - N_ doesn't work\n") - (set! exit-code -1))) + (test-equal "N_ works properly" + "foobar" + (N_ "foobar"))) -(exit exit-code) +(define (run-test) + (test-runner-factory gnc:test-runner) + (test-begin "test-core-utils") + (N_-tests) + (test-end "test-core-utils"))