add error check to property test, and replace iota with a do loop

1 files changed, 28 insertions, 25 deletions

diff --git a/srfi-252.sld b/srfi-252.sld
index b4227c1..6d9f426 100644
--- a/srfi-252.sld
+++ b/srfi-252.sld
@@ -25,7 +25,6 @@
 (define-library (srfi 252)
   (import (scheme base)
           (scheme case-lambda)
-          (srfi 1)
           (srfi 64)
           (srfi 252 generators)
           (chicken condition))
@@ -58,31 +57,35 @@
     (define property-test-runner test-runner-create)
     ;; Test procedures
     (define (prop-test property generators runs)
-      (for-each
-       (lambda (n)
-         (test-assert
-          (apply property
-                 (let ((args (map (lambda (gen) (gen)) generators))
-                       (runner (test-runner-current)))
-                   (test-result-set! runner 'property-test-arguments args)
-                   (test-result-set! runner 'property-test-iteration
-                                     (+ n 1))
-                   (test-result-set! runner 'property-test-iterations runs)
-                   args))))
-       (iota runs)))
+      (unless (and (integer? runs)
+                   (not (negative? runs)))
+        (error "runs must be a non-negative integer" runs))
+      (do ((n 0 (+ n 1)))
+          ((= n runs))
+        (test-assert
+         (apply property
+                (let ((args (map (lambda (gen) (gen)) generators))
+                      (runner (test-runner-current)))
+                  (test-result-set! runner 'property-test-arguments args)
+                  (test-result-set! runner 'property-test-iteration
+                                    (+ n 1))
+                  (test-result-set! runner 'property-test-iterations runs)
+                  args)))))
     (define (prop-test-error type property generators runs)
-      (for-each
-       (lambda (n)
-         (test-error
-          type
-          (apply property
-                 (let ((args (map (lambda (gen) (gen)) generators))
-                       (runner (test-runner-current)))
-                   (test-result-set! runner 'property-test-arguments args)
-                   (test-result-set! runner 'property-test-iteration (+ n 1))
-                   (test-result-set! runner 'property-test-iterations runs)
-                   args))))
-       (iota runs)))
+      (unless (and (integer? runs)
+                   (not (negative? runs)))
+        (error "runs must be a non-negative integer" runs))
+      (do ((n 0 (+ n 1)))
+          ((= n runs))
+        (test-error
+         type
+         (apply property
+                (let ((args (map (lambda (gen) (gen)) generators))
+                      (runner (test-runner-current)))
+                  (test-result-set! runner 'property-test-arguments args)
+                  (test-result-set! runner 'property-test-iteration (+ n 1))
+                  (test-result-set! runner 'property-test-iterations runs)
+                  args)))))
     (define test-property-error
       (case-lambda
         ((property generators)