From bafd239ef0ecd26e4be2fd04071accc82fae3f36 Mon Sep 17 00:00:00 2001 From: John Clements Date: Sat, 13 Sep 2008 06:32:42 +0000 Subject: [PATCH] changed result of check-expect svn: r11721 --- collects/tests/stepper/through-tests.ss | 45 ++++++++++++------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/collects/tests/stepper/through-tests.ss b/collects/tests/stepper/through-tests.ss index d99ea1d9ed..2c047807cd 100755 --- a/collects/tests/stepper/through-tests.ss +++ b/collects/tests/stepper/through-tests.ss @@ -101,7 +101,7 @@ (for-each (lambda (fn) (apply fn args)) level-fns))) (define test-mz-sequence - (lang-level-test-sequence 'scheme/base fake-mz-render-settings #t #f)) + (lang-level-test-sequence 'mzscheme fake-mz-render-settings #t #f)) (define test-beginner-sequence (lang-level-test-sequence `(lib "htdp-beginner.ss" "lang") fake-beginner-render-settings #f #t)) @@ -1354,19 +1354,14 @@ ; (custodian-shutdown-all new-custodian)) )) - (t1 check-expect - (test-bwla-to-int/lam - "(check-expect (+ 3 4) (+ 8 9)) (check-expect (+ 1 1) 2) (check-expect (+ 2 2) 4)(+ 4 5)" - `((before-after ((hilite (+ 4 5))) - ((hilite 9))) - (before-after (9 (check-expect (+ 3 4) (hilite (+ 8 9)))) - (9 (check-expect (+ 3 4) (hilite 17)))) - (before-after (9 (check-expect (hilite (+ 3 4)) 17)) - (9 (check-expect (hilite 7) 17))) - (before-after (9 (list 'check-expect-failed 7 17) (check-expect (hilite (+ 1 1)) 2)) - (9 (list 'check-expect-failed 7 17) (check-expect (hilite 2) 2))) - (before-after (9 (list 'check-expect-failed 7 17) (list 'check-expect-passed 2 2) (check-expect (hilite (+ 2 2)) 4)) - (9 (list 'check-expect-failed 7 17) (list 'check-expect-passed 2 2) (check-expect (hilite 4) 4)))))) + + (t check-expect test-bwla-to-int/lam + (check-expect (+ 3 4) (+ 8 9)) (check-expect (+ 1 1) 2) (check-expect (+ 2 2) 4) (+ 4 5) + :: {(+ 4 5)} -> {9} + :: 9 (check-expect (+ 3 4) {(+ 8 9)}) -> 9 (check-expect (+ 3 4) {17}) + :: 9 (check-expect {(+ 3 4)} 17) -> 9 (check-expect {7} 17) + :: 9 false (check-expect {(+ 1 1)} 2) -> 9 false (check-expect {2} 2) + :: 9 false true (check-expect {(+ 2 2)} 4) -> 9 false true (check-expect {4} 4)) (t1 check-within (test-bwla-to-int/lam @@ -1379,8 +1374,8 @@ (9 (check-within (+ 3 4) 18 (hilite 100)))) (before-after (9 (check-within (hilite (+ 3 4)) 18 100)) (9 (check-within (hilite 7) 18 100))) - (before-after (9 (list 'check-within-passed 7 18 100) (check-expect (hilite (+ 1 1)) 2)) - (9 (list 'check-within-passed 7 18 100) (check-expect (hilite 2) 2)))))) + (before-after (9 true (check-expect (hilite (+ 1 1)) 2)) + (9 true (check-expect (hilite 2) 2)))))) (t1 check-within-bad @@ -1392,8 +1387,8 @@ (9 (check-within (+ 3 4) (hilite 18) 0.01))) (before-after (9 (check-within (hilite (+ 3 4)) 18 0.01)) (9 (check-within (hilite 7) 18 0.01))) - (before-after (9 (list 'check-within-failed 7 18 0.01) (check-expect (hilite (+ 1 1)) 2)) - (9 (list 'check-within-failed 7 18 0.01) (check-expect (hilite 2) 2)))))) + (before-after (9 false (check-expect (hilite (+ 1 1)) 2)) + (9 false (check-expect (hilite 2) 2)))))) (let ([errmsg "rest: expected argument of type ; given ()"]) (t1 check-error @@ -1405,8 +1400,8 @@ (9 (check-error (+ (+ 3 4) (rest empty)) (hilite ,errmsg)))) (before-after (9 (check-error (+ (hilite (+ 3 4)) (rest empty)) ,errmsg)) (9 (check-error (+ (hilite 7) (rest empty)) ,errmsg))) - (before-after (9 (list 'check-error-passed ,errmsg ,errmsg) (check-expect (hilite (+ 3 1)) 4)) - (9 (list 'check-error-passed ,errmsg ,errmsg) (check-expect (hilite 4) 4))))))) + (before-after (9 true (check-expect (hilite (+ 3 1)) 4)) + (9 true (check-expect (hilite 4) 4))))))) (t1 check-error-bad (test-bwla-to-int/lam @@ -1417,8 +1412,8 @@ (9 (check-error (+ (+ 3 4) (rest empty)) (hilite "bogus")))) (before-after (9 (check-error (+ (hilite (+ 3 4)) (rest empty)) "bogus")) (9 (check-error (+ (hilite 7) (rest empty)) "bogus"))) - (before-after (9 (list 'check-error-failed "rest: expected argument of type ; given ()" "bogus") (check-expect (hilite (+ 3 1)) 4)) - (9 (list 'check-error-failed "rest: expected argument of type ; given ()" "bogus") (check-expect (hilite 4) 4)))))) + (before-after (9 false (check-expect (hilite (+ 3 1)) 4)) + (9 false (check-expect (hilite 4) 4)))))) ; uses set-render-settings! ;(reconstruct:set-render-settings! fake-beginner-render-settings) @@ -1693,4 +1688,8 @@ #;[store-steps #f] #;[show-all-steps #t]) #;(run-tests '(check-expect check-within check-within-bad check-error) #;'(#;check-expect #;check-expect-2 check-within check-within-bad check-error)) - (run-all-tests))) + (run-tests '(check-expect check-within check-error check-error-bad)) + #;(run-all-tests))) + + +