Update collatz-conjecture tests to allow use of contract (#326)

exercism · Jan 3, 2024 · 0d79175 · 0d79175
1 parent f913b0e
commit 0d79175
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/exercises/practice/collatz-conjecture/.meta/example.rkt b/exercises/practice/collatz-conjecture/.meta/example.rkt
@@ -10,11 +10,6 @@
                           (add1 (* 3 n)))
                       (add1 acc))))
 
-(define (collatz n)
-  (if (nand (exact-integer? n)
-            (positive? n))
-      (error "Only positive integers are allowed")
-      (collatz-length n)))
-
-
-
+(define/contract (collatz n)
+  (-> exact-positive-integer? exact-integer?)
+  (collatz-length n))
diff --git a/exercises/practice/collatz-conjecture/collatz-conjecture-test.rkt b/exercises/practice/collatz-conjecture/collatz-conjecture-test.rkt
@@ -5,11 +5,6 @@
 (module+ test
   (require rackunit rackunit/text-ui)
 
-  (define (exn-msg-matches? msg f)
-    (with-handlers ([exn:fail? (lambda (exn)
-                                 (string=? (exn-message exn) msg))])
-      (f)))
-
   (define suite
     (test-suite
      "collatz conjecture tests"
@@ -30,19 +25,16 @@
                 (collatz 1000000)
                 152)
 
-     (test-true "zero is an error"
-                (exn-msg-matches?
-                  "Only positive integers are allowed"
-                  (lambda () (collatz 0))))
+     (test-exn "zero is an error"
+                exn:fail?
+                (lambda () (collatz 0)))
 
-     (test-true "negative value is an error"
-                (exn-msg-matches?
-                  "Only positive integers are allowed"
-                  (lambda () (collatz -15))))
+     (test-exn "negative value is an error"
+                exn:fail?
+                (lambda () (collatz -15)))
 
-     (test-true "non exact value is an error"
-                (exn-msg-matches?
-                  "Only positive integers are allowed"
-                  (lambda () (collatz 3.4))))))
+     (test-exn "non exact value is an error"
+                exn:fail?
+                (lambda () (collatz 3.4)))))
 
 (run-tests suite))