diff --git a/collects/tests/htdp-lang/beg-adv.rktl b/collects/tests/htdp-lang/beg-adv.rktl index 9f241e9d5a..5bdb2975d4 100644 --- a/collects/tests/htdp-lang/beg-adv.rktl +++ b/collects/tests/htdp-lang/beg-adv.rktl @@ -75,7 +75,7 @@ (htdp-test #t 'a3? (a3? (make-a3 1 2 3))) (htdp-test #f 'a1? (a1? (make-a3 1 2 3))) (htdp-test #f 'a3? (a3? (make-a1 1))) -(htdp-err/rt-test (a1-b 10) "a1-b: expects argument of type ; given: 10") +(htdp-err/rt-test (a1-b 10) "a1-b: contract violation\n expected: a1[?]\n given: 10") (htdp-syntax-test #'(a0 1 2 3) "a0: expected a function after the open parenthesis, but found a structure name") (htdp-syntax-test #'cond "cond: expected an open parenthesis before cond, but found none") diff --git a/collects/tests/htdp-lang/beg-bega.rktl b/collects/tests/htdp-lang/beg-bega.rktl index d4c56eaff1..55a443f0b4 100644 --- a/collects/tests/htdp-lang/beg-bega.rktl +++ b/collects/tests/htdp-lang/beg-bega.rktl @@ -34,7 +34,7 @@ (htdp-top (define (my-f x) x)) (htdp-top (define-struct foo (a b))) -(htdp-syntax-test #'(go 5 8) "go: expects a function in this position at: 8 in: (go 5 8)") +(htdp-syntax-test #'(go 5 8) "go: expects a function in this position\n at: 8\n in: (go 5 8)") (htdp-syntax-test #'(go add1 add1) "add1: expected a function call, but there is no open parenthesis before this function") (htdp-syntax-test #'(go my-f add1) "my-f: expected a function call, but there is no open parenthesis before this function") (htdp-syntax-test #'(go foo? add1) "foo?: expected a function call, but there is no open parenthesis before this function") diff --git a/collects/tests/htdp-lang/bega-adv.rktl b/collects/tests/htdp-lang/bega-adv.rktl index 4a8582d14b..6c7c1c2f23 100644 --- a/collects/tests/htdp-lang/bega-adv.rktl +++ b/collects/tests/htdp-lang/bega-adv.rktl @@ -28,4 +28,4 @@ (htdp-syntax-test #'unquote-splicing "unquote-splicing: misuse of ,@ or unquote-splicing, not under a quasiquoting backquote") (htdp-syntax-test #'(unquote-splicing (list 10)) "unquote-splicing: misuse of ,@ or unquote-splicing, not under a quasiquoting backquote") -(htdp-err/rt-test `(,@4) (exn-type-and-msg exn:fail:contract? "append: expected argument of type ; given: 4")) +(htdp-err/rt-test `(,@4) (exn-type-and-msg exn:fail:contract? "append: contract violation\n expected: list?\n given: 4")) diff --git a/collects/tests/htdp-lang/intm-adv.rktl b/collects/tests/htdp-lang/intm-adv.rktl index 6757cb56a3..a04a917c53 100644 --- a/collects/tests/htdp-lang/intm-adv.rktl +++ b/collects/tests/htdp-lang/intm-adv.rktl @@ -112,8 +112,8 @@ (htdp-test 1 '+ (+ 1)) (htdp-test 1 '* (*)) (htdp-test 1 '* (* 1)) -(htdp-err/rt-test (-) (exn-type-and-msg exn:application:arity? "-: expects at least 1 argument, given 0")) -(htdp-err/rt-test (/) (exn-type-and-msg exn:application:arity? "/: expects at least 1 argument, given 0")) +(htdp-err/rt-test (-) (exn-type-and-msg exn:application:arity? #rx"wrong number of arguments.*procedure: -\n.*expected[^:]*: at least 1.*given[^:]*: 0")) +(htdp-err/rt-test (/) (exn-type-and-msg exn:application:arity? #rx"wrong number of arguments.*procedure: /\n.*expected[^:]*: at least 1.*given[^:]*: 0")) ;(htdp-test 1 (/ 1) exn:application:arity?) ;; Check that `local' works with macros that expand to `begin':