From b2da67e4e03b1238ed6b7f4c002c648e7bc3c22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Tue, 11 Apr 2023 14:00:28 +0200
Subject: [PATCH] Fix and run string tests.

---
 src/Makefile        | 3 ++-
 src/tests.scm       | 6 ++++--
 src/util-string.scm | 7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 4545b56..ca96ed0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -302,7 +302,8 @@ TESTS-SOURCES=tests.scm listing.import.scm util-dict-list.import.scm	\
 	ansi.import.scm command-line.import.scm				\
 	members-dir.import.scm primes.import.scm			\
 	member-record.import.scm table.import.scm util-csv.import.scm	\
-	util-set-list.import.scm util-parser.import.scm
+	util-set-list.import.scm util-parser.import.scm			\
+	util-string.import.scm
 
 tests.o: tests.import.scm
 tests.import.scm: $(TESTS-SOURCES)
diff --git a/src/tests.scm b/src/tests.scm
index b18990b..87593c5 100644
--- a/src/tests.scm
+++ b/src/tests.scm
@@ -45,7 +45,8 @@
 	 table
 	 util-csv
 	 util-set-list
-	 util-parser)
+	 util-parser
+	 util-string)
 
  (define (run-all-tests!)
    (listing-tests!)
@@ -61,6 +62,7 @@
    (table-tests!)
    (csv-simple-tests!)
    (lset-tests!)
-   (parser-tests!))
+   (parser-tests!)
+   (string-tests!))
 
  )
diff --git a/src/util-string.scm b/src/util-string.scm
index 204497f..4cf369a 100644
--- a/src/util-string.scm
+++ b/src/util-string.scm
@@ -31,6 +31,7 @@
   string-repeat
   string-first+rest
   string-utf8?
+  string-tests!
   )
 
  (import scheme
@@ -62,13 +63,13 @@
  ;; Returns true, if given string contains UTF-8 characters
  (define (string-utf8? str)
    (let ((asciilen (string-length str))
-	 (utf8len (length (irregex-extract (irregex "." 'u)))))
+	 (utf8len (length (irregex-extract (irregex "." 'u) str))))
      (not (= asciilen utf8len))))
 	 
  ;; Performs utils module self-tests.
- (define (utils-tests!)
+ (define (string-tests!)
    (run-tests
-    utils
+    util-string
     (test-equal? string-repeat
 		 (string-repeat "-" 4)
 		 "----")