port to chicken

1 files changed, 39 insertions, 32 deletions

diff --git a/srfi-228-test.scm b/tests/run.scm
index f6a984d..5681733 100644
--- a/srfi-228-test.scm
+++ b/tests/run.scm
@@ -1,10 +1,20 @@
-(cond-expand
-  (chibi
-   (import (chibi test)
-           (scheme base)
-           (srfi 1)
-           (srfi 128)
-           (only (srfi 132) list-sort))))
+(import r7rs)
+
+(import test
+        (scheme base)
+        (srfi 1)
+        (srfi 128)
+        (only (srfi 132) list-sort)
+        (srfi 228))
+
+;;; Chicken's SRFI-128 does not have SRFI-162 extensions.
+
+(define string-ci-comparator
+  (make-comparator
+   string?
+   string-ci=?
+   string-ci<?
+   string-ci-hash))
 
 (define-record-type Person
     (make-person first-name last-name)
@@ -18,17 +28,15 @@
    (make-wrapper-comparator person? person-first-name string-ci-comparator)))
 
 (test-group "simple"
-  (test-equal eq?
-    #t
-    (<? person-name-comparator
-        (make-person "John" "Cowan")
-        (make-person "Daphne" "Preston-Kendal")))
+  (test-assert
+   (<? person-name-comparator
+       (make-person "John" "Cowan")
+       (make-person "Daphne" "Preston-Kendal")))
 
-  (test-equal eq?
-    #t
-    (>? person-name-comparator
-        (make-person "Tom" "Smith")
-        (make-person "John" "Smith"))))
+  (test-assert
+   (>? person-name-comparator
+       (make-person "Tom" "Smith")
+       (make-person "John" "Smith"))))
 
 (define-record-type Book
     (make-book author title)
@@ -65,19 +73,18 @@
                          "A Midsummer Night’s Dream"))
          (bob (make-cd (make-person "Bob" "Dylan") "Blonde on Blonde"))
          (revolver (make-cd (make-person "The" "Beatles") "Revolver")))
-  (test-equal
-      equal?
-    (list deutsche-grammatik
-          mnd
+  (test
+   (list deutsche-grammatik
+         mnd
+         sonnets
+         abbey-road
+         revolver
+         bob)
+   (list-sort
+    (lambda (a b) (<? item-comparator a b))
+    (list abbey-road
+          deutsche-grammatik
           sonnets
-          abbey-road
-          revolver
-          bob)
-    (list-sort
-     (lambda (a b) (<? item-comparator a b))
-     (list abbey-road
-           deutsche-grammatik
-           sonnets
-           mnd
-           bob
-           revolver)))))
+          mnd
+          bob
+          revolver)))))