From b5ab6cec7e3038cfd917af16e082c8bc98384807 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 26 May 2012 08:18:19 -0600
Subject: [PATCH] fix misc tests for error-message change

---
 collects/tests/lazy/lang.rkt         | 6 +++---
 collects/tests/lazy/promise.rkt      | 2 +-
 collects/tests/plai/gc/run-test.rkt  | 2 +-
 collects/tests/plai/gc2/run-test.rkt | 2 +-
 collects/tests/scribble/reader.rkt   | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/collects/tests/lazy/lang.rkt b/collects/tests/lazy/lang.rkt
index 305c1e970a..7471dc69a7 100644
--- a/collects/tests/lazy/lang.rkt
+++ b/collects/tests/lazy/lang.rkt
@@ -28,8 +28,8 @@
 
 (define (list-tests)
   (test
-   (! (car 0)) =error> "car: expects argument of type <pair>"
-   (! (cdr 0)) =error> "cdr: expects argument of type <pair>"
+   (! (car 0)) =error> "car: contract violation\n  expected: pair?"
+   (! (cdr 0)) =error> "cdr: contract violation\n  expected: pair?"
    (! (car (cons 1 (/ 1 0)))) => 1
    (! (cdr (cons (/ 1 0) 1))) => 1
    (! (list-ref (list (/ 1 0) 1 (/ 1 0)) 1)) => 1
@@ -40,7 +40,7 @@
    (!! (member 1 (cons 0 (cons 1 2)))) => '(1 . 2)
    (!! (memq   1 (cons 0 (cons 1 2)))) => '(1 . 2)
    (!! (memv   1 (cons 0 (cons 1 2)))) => '(1 . 2)
-   (! (second (map car (list 1 2 3)))) =error> "expects argument of type"
+   (! (second (map car (list 1 2 3)))) =error> "contract violation"
    (! (second (map car (list 1 '(2) 3)))) => 2
    ))
 
diff --git a/collects/tests/lazy/promise.rkt b/collects/tests/lazy/promise.rkt
index d33371e082..110330af64 100644
--- a/collects/tests/lazy/promise.rkt
+++ b/collects/tests/lazy/promise.rkt
@@ -167,7 +167,7 @@
                   [p (delayer (channel-get ch) 99)])
              (thread (lambda () (channel-put ch 'x)))
              (test (force p) => 99))
-           (test (force (delayer (+ 1 "2"))) =error> "expects type")))
+           (test (force (delayer (+ 1 "2"))) =error> "contract violation")))
   (t delay/sync)
   (t delay/idle)
   (let* ([ch (make-channel)] [p (delay/idle #:wait-for ch 99)])
diff --git a/collects/tests/plai/gc/run-test.rkt b/collects/tests/plai/gc/run-test.rkt
index 3a010804c9..fb17831027 100644
--- a/collects/tests/plai/gc/run-test.rkt
+++ b/collects/tests/plai/gc/run-test.rkt
@@ -41,7 +41,7 @@
  
  (test-mutator (build-path here "other-mutators" "top.rkt"))
  =error>
- #rx"unbound identifier in module in: frozzle"
+ #rx"unbound identifier in module\n  in: frozzle"
  
  (capture-output (test-mutator (build-path here "other-mutators" "printing.rkt")))
  =>
diff --git a/collects/tests/plai/gc2/run-test.rkt b/collects/tests/plai/gc2/run-test.rkt
index b0963af2e1..867f37b3aa 100644
--- a/collects/tests/plai/gc2/run-test.rkt
+++ b/collects/tests/plai/gc2/run-test.rkt
@@ -41,7 +41,7 @@
  
  (test-mutator (build-path here "other-mutators" "top.rkt"))
  =error>
- #rx"unbound identifier in module in: frozzle"
+ #rx"unbound identifier in module\n  in: frozzle"
  
  (capture-output (test-mutator (build-path here "other-mutators" "printing.rkt")))
  =>
diff --git a/collects/tests/scribble/reader.rkt b/collects/tests/scribble/reader.rkt
index 31b5df2621..171662556a 100644
--- a/collects/tests/scribble/reader.rkt
+++ b/collects/tests/scribble/reader.rkt
@@ -687,7 +687,7 @@ foo
 ---
 ;; -------------------- errors
 ---
-(  -@error-> "inp:1:0: read: expected a `)' to close `('" ; check -@error->
+(  -@error-> "read: expected a `)' to close `('\n  source:\n   inp:1:0" ; check -@error->
 ---
 @foo{ -@error-> #rx":1:0: missing closing `}'$"
 ---
@@ -707,10 +707,10 @@ foo
 ---
 \foo{\bar|-{} -\error-> #rx":1:5: missing closing `}-\\|'$"
 ---
-@foo{@" -@error-> #rx":1:6: read: expected a closing '\"'$"
+@foo{@" -@error-> #rx"read: expected a closing '\"'\n  source:\n   #f:1:6$"
 ;; " <-- (balance this file)
 ---
-\foo{\" -\error-> #rx":1:6: read: expected a closing '\"'$"
+\foo{\" -\error-> #rx"read: expected a closing '\"'\n  source:\n   inp:1:6$"
 ---
 @|1 2|
 -@error->