use test-call

1 files changed, 20 insertions, 24 deletions

diff --git a/tests/srfi-113-sets.scm b/tests/srfi-113-sets.scm
index a43ca33..1965db6 100644
--- a/tests/srfi-113-sets.scm
+++ b/tests/srfi-113-sets.scm
@@ -46,40 +46,36 @@
 
 (test-group "set-empty?"
   (test-assert "empty" (set-empty? (%set)))
-  (test-assert "not empty 1"
-               (not (set-empty? (%set 0))))
-  (test-assert "not empty 2"
-               (not (set-empty? (%set 0 1))))
-  (test-assert "not empty 3"
-               (not (set-empty? (%set 0 1 2))))
-  (test-assert "not empty 4"
-               (not (set-empty? (%set 0 1 2 3)))))
+  (test-assert "not empty 1" (not (set-empty? (%set 0))))
+  (test-assert "not empty 2" (not (set-empty? (%set 0 1))))
+  (test-assert "not empty 3" (not (set-empty? (%set 0 1 2))))
+  (test-assert "not empty 4" (not (set-empty? (%set 0 1 2 3)))))
 
 (test-group "lengths"
-  (test-equal "0" 0 (set-size (%set)))
-  (test-equal "1" 1 (set-size (%set 0)))
-  (test-equal "2" 2 (set-size (%set 0 1)))
-  (test-equal "3" 3 (set-size (%set 0 1 2)))
-  (test-equal "4" 4 (set-size (%set 0 1 2 3))))
+  (test-call "0" (= 0 (set-size (%set))))
+  (test-call "1" (= 1 (set-size (%set 0))))
+  (test-call "2" (= 2 (set-size (%set 0 1))))
+  (test-call "3" (= 3 (set-size (%set 0 1 2))))
+  (test-call "4" (= 4 (set-size (%set 0 1 2 3)))))
 
 (test-group "set->list"
-  (test-equal "empty" '() (set->list (%set)))
-  (test-assert "1" (lset= = '(1) (set->list (%set 1))))
-  (test-assert "2" (lset= = '(1 2) (set->list (%set 1 2))))
-  (test-assert "3" (lset= = '(0 1 2) (set->list (%set 0 1 2))))
-  (test-assert "4" (lset= = '(0 1 2 3) (set->list (%set 0 1 2 3)))))
+  (test-call "empty" (eq? '() (set->list (%set))))
+  (test-call "1" (lset= = '(1) (set->list (%set 1))))
+  (test-call "2" (lset= = '(1 2) (set->list (%set 1 2))))
+  (test-call "3" (lset= = '(0 1 2) (set->list (%set 0 1 2))))
+  (test-call "4" (lset= = '(0 1 2 3) (set->list (%set 0 1 2 3)))))
 
 (define (test-create-with-duplicates creator)
   (lambda (lst)
     (let* ((new-set (creator lst))
            (set-as-list (set->list new-set)))
       (test-assert "set?" (set? new-set))
-      (test-assert "empty?" (if (null? lst)
-                                (set-empty? new-set)
-                                (not (set-empty? new-set))))
+      (if (null? lst)
+          (test-assert "empty?" (set-empty? new-set))
+          (test-assert "empty?" (not (set-empty? new-set))))
       ;; The new-set will remove duplicates.
-      (test-assert "length?" (<= (set-size new-set) (length lst)))
-      (test-assert "subset of inserted" (lset<= equal? set-as-list lst)))))
+      (test-call "length?" (<= (set-size new-set) (length lst)))
+      (test-call "subset of inserted" (lset<= equal? set-as-list lst)))))
 
 (test-group "multiple element set using `list->set` procedure"
   (test-property (test-create-with-duplicates
@@ -110,7 +106,7 @@
                                 (set-empty? new-set)
                                 (not (set-empty? new-set))))
       (test-equal "length?" (set-size new-set) (length lst))
-      (test-assert "exactly inserted" (lset= equal? set-as-list lst)))))
+      (test-call "exactly inserted" (lset= equal? set-as-list lst)))))
 
 (test-group "multiple element set using `list->set` procedure, unique elements"
   (test-property (test-create-without-duplicates