[test-core-utils] uses srfi-64

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
   )

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