From d444390dde5d87d628f8f9efc86f2aeddb0ddfc0 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 3 Aug 2007 13:26:48 +0000 Subject: [PATCH] changed test suite to match latest stuff svn: r7016 --- collects/tests/drscheme/language-test.ss | 92 ++++++++++++------------ collects/tests/drscheme/repl-test.ss | 28 ++++---- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/collects/tests/drscheme/language-test.ss b/collects/tests/drscheme/language-test.ss index 09cc3f0695..978ff82b27 100644 --- a/collects/tests/drscheme/language-test.ss +++ b/collects/tests/drscheme/language-test.ss @@ -364,10 +364,10 @@ the settings above should match r5rs (test-expression "(sqrt -1)" "0+1i") (test-expression "class" - "class: name is not defined, not an argument, and not a primitive name" + "class: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: class") (test-expression "shared" - "shared: name is not defined, not an argument, and not a primitive name" + "shared: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: shared") (test-expression "(define (. x y) (* x y))" @@ -375,7 +375,7 @@ the settings above should match r5rs (test-expression "'(1 . 2)" "read: illegal use of \".\"") (test-expression "call/cc" - "call/cc: name is not defined, not an argument, and not a primitive name" + "call/cc: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: call/cc") (test-expression "(error 'a \"~a\" 1)" @@ -384,19 +384,19 @@ the settings above should match r5rs "error: expected a symbol and a string, got \"a\" and \"a\"") (test-expression "(time 1)" - "time: name is not defined, not an argument, and not a primitive name" + "time: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: time") (test-expression "true" "true") (test-expression "mred^" - "mred^: name is not defined, not an argument, and not a primitive name" + "mred^: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: mred^") (test-expression "(eq? 'a 'A)" "false") (test-expression "(set! x 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(define qqq 2) (set! qqq 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false") @@ -406,10 +406,10 @@ the settings above should match r5rs "(cons (cons 1 empty) (cons (cons 1 empty) empty))" "define: cannot redefine name: shrd\n(cons (cons 1 empty) (cons (cons 1 empty) empty))") (test-expression "(local ((define x x)) 1)" - "local: name is not defined, not an argument, and not a primitive name" + "local: name is not defined, not a parameter, and not a primitive name" "function call: expected a defined name or a primitive operation name after an open parenthesis, but found something else") (test-expression "(letrec ([x x]) 1)" - "letrec: name is not defined, not an argument, and not a primitive name" + "letrec: name is not defined, not a parameter, and not a primitive name" "function call: expected a defined name or a primitive operation name after an open parenthesis, but found something else") (test-expression "(if 1 1 1)" "if: question result is not true or false: 1") (test-expression "(+ 1)" "procedure +: expects at least 2 arguments, given 1: 1") @@ -430,7 +430,7 @@ the settings above should match r5rs (test-expression "(exact? 1.5)" "true") (test-expression "(let ([f (lambda (x) x)]) f)" - "let: name is not defined, not an argument, and not a primitive name" + "let: name is not defined, not a parameter, and not a primitive name" "function call: expected a defined name or a primitive operation name after an open parenthesis, but found something else") (test-expression ",1" "read: illegal use of comma") @@ -439,7 +439,7 @@ the settings above should match r5rs (test-expression "(car (list))" "car: expects argument of type ; given empty") (test-expression "argv" - "argv: name is not defined, not an argument, and not a primitive name" + "argv: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: argv"))) @@ -488,17 +488,17 @@ the settings above should match r5rs (test-expression "(sqrt -1)" "0+1i") (test-expression "class" - "class: name is not defined, not an argument, and not a primitive name" + "class: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: class") (test-expression "shared" - "shared: name is not defined, not an argument, and not a primitive name" + "shared: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: shared") (test-expression "(define (. x y) (* x y))" "read: illegal use of \".\"") (test-expression "'(1 . 2)" "read: illegal use of \".\"") (test-expression "call/cc" - "call/cc: name is not defined, not an argument, and not a primitive name" + "call/cc: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: call/cc") (test-expression "(error 'a \"~a\" 1)" @@ -507,19 +507,19 @@ the settings above should match r5rs "error: expected a symbol and a string, got \"a\" and \"a\"") (test-expression "(time 1)" - "time: name is not defined, not an argument, and not a primitive name" + "time: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: time") (test-expression "true" "true") (test-expression "mred^" - "mred^: name is not defined, not an argument, and not a primitive name" + "mred^: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: mred^") (test-expression "(eq? 'a 'A)" "false") (test-expression "(set! x 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(define qqq 2) (set! qqq 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false") (test-expression "(cons 1 2)" "cons: second argument must be of type , given 1 and 2") @@ -528,10 +528,10 @@ the settings above should match r5rs "(list (list 1) (list 1))" "define: cannot redefine name: shrd\n(list (list 1) (list 1))") (test-expression "(local ((define x x)) 1)" - "local: name is not defined, not an argument, and not a primitive name" + "local: name is not defined, not a parameter, and not a primitive name" "function call: expected a defined name or a primitive operation name after an open parenthesis, but found something else") (test-expression "(letrec ([x x]) 1)" - "letrec: name is not defined, not an argument, and not a primitive name" + "letrec: name is not defined, not a parameter, and not a primitive name" "function call: expected a defined name or a primitive operation name after an open parenthesis, but found something else") (test-expression "(if 1 1 1)" "if: question result is not true or false: 1") (test-expression "(+ 1)" "procedure +: expects at least 2 arguments, given 1: 1") @@ -552,7 +552,7 @@ the settings above should match r5rs (test-expression "(exact? 1.5)" "true") (test-expression "(let ([f (lambda (x) x)]) f)" - "let: name is not defined, not an argument, and not a primitive name" + "let: name is not defined, not a parameter, and not a primitive name" "function call: expected a defined name or a primitive operation name after an open parenthesis, but found something else") (test-expression ",1" "unquote: misuse of a comma or `unquote', not under a quasiquoting backquote") @@ -561,7 +561,7 @@ the settings above should match r5rs (test-expression "(car (list))" "car: expects argument of type ; given empty") (test-expression "argv" - "argv: name is not defined, not an argument, and not a primitive name" + "argv: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: argv"))) @@ -608,17 +608,17 @@ the settings above should match r5rs (test-expression "(sqrt -1)" "0+1i") (test-expression "class" - "class: name is not defined, not an argument, and not a primitive name" + "class: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: class") (test-expression "shared" - "shared: name is not defined, not an argument, and not a primitive name" + "shared: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: shared") (test-expression "(define (. x y) (* x y))" "read: illegal use of \".\"") (test-expression "'(1 . 2)" "read: illegal use of \".\"") (test-expression "call/cc" - "call/cc: name is not defined, not an argument, and not a primitive name" + "call/cc: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: call/cc") (test-expression "(error 'a \"~a\" 1)" @@ -631,14 +631,14 @@ the settings above should match r5rs (test-expression "true" "true") (test-expression "mred^" - "mred^: name is not defined, not an argument, and not a primitive name" + "mred^: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: mred^") (test-expression "(eq? 'a 'A)" "false") (test-expression "(set! x 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(define qqq 2) (set! qqq 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false") (test-expression "(cons 1 2)" "cons: second argument must be of type , given 1 and 2") @@ -673,7 +673,7 @@ the settings above should match r5rs (test-expression "(list 1)" "(list 1)") (test-expression "(car (list))" "car: expects argument of type ; given empty") (test-expression "argv" - "argv: name is not defined, not an argument, and not a primitive name" + "argv: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: argv"))) @@ -720,17 +720,17 @@ the settings above should match r5rs (test-expression "(sqrt -1)" "0+1i") (test-expression "class" - "class: name is not defined, not an argument, and not a primitive name" + "class: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: class") (test-expression "shared" - "shared: name is not defined, not an argument, and not a primitive name" + "shared: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: shared") (test-expression "(define (. x y) (* x y))" "read: illegal use of \".\"") (test-expression "'(1 . 2)" "read: illegal use of \".\"") (test-expression "call/cc" - "call/cc: name is not defined, not an argument, and not a primitive name" + "call/cc: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: call/cc") (test-expression "(error 'a \"~a\" 1)" @@ -743,14 +743,14 @@ the settings above should match r5rs (test-expression "true" "true") (test-expression "mred^" - "mred^: name is not defined, not an argument, and not a primitive name" + "mred^: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: mred^") (test-expression "(eq? 'a 'A)" "false") (test-expression "(set! x 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(define qqq 2) (set! qqq 1)" - "set!: name is not defined, not an argument, and not a primitive name" + "set!: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: set!") (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false") (test-expression "(cons 1 2)" "cons: second argument must be of type , given 1 and 2") @@ -785,7 +785,7 @@ the settings above should match r5rs (test-expression "(list 1)" "(list 1)") (test-expression "(car (list))" "car: expects argument of type ; given empty") (test-expression "argv" - "argv: name is not defined, not an argument, and not a primitive name" + "argv: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: argv"))) @@ -831,7 +831,7 @@ the settings above should match r5rs (test-expression "(sqrt -1)" "0+1i") (test-expression "class" - "class: name is not defined, not an argument, and not a primitive name" + "class: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: class") (test-expression "shared" "shared: found a use of `shared' that does not follow an open parenthesis") @@ -840,7 +840,7 @@ the settings above should match r5rs (test-expression "'(1 . 2)" "read: illegal use of \".\"") (test-expression "call/cc" - "call/cc: name is not defined, not an argument, and not a primitive name" + "call/cc: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: call/cc") (test-expression "(error 'a \"~a\" 1)" @@ -853,7 +853,7 @@ the settings above should match r5rs (test-expression "true" "true") (test-expression "mred^" - "mred^: name is not defined, not an argument, and not a primitive name" + "mred^: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: mred^") (test-expression "(eq? 'a 'A)" "false") (test-expression "(set! x 1)" @@ -895,7 +895,7 @@ the settings above should match r5rs (test-expression "(list 1)" "(list 1)") (test-expression "(car (list))" "car: expects argument of type ; given empty") (test-expression "argv" - "argv: name is not defined, not an argument, and not a primitive name" + "argv: name is not defined, not a parameter, and not a primitive name" "reference to undefined identifier: argv"))) @@ -944,7 +944,7 @@ the settings above should match r5rs (language) setting-name expression result got))))) (define (test-hash-bang) - (let* ([expression (format "#!~n1")] + (let* ([expression "#!/bin/sh\n1"] [result "1"] [drs (get-top-level-focus-window)] [interactions (send drs get-interactions-text)]) @@ -1223,11 +1223,11 @@ the settings above should match r5rs (printf ">> finished ~a\n" (syntax-object->datum #'arg))))])) (define (run-test) - ;(go mred) - ;(go mzscheme) - ;(go beginner) - ;(go beginner/abbrev) - ;(go intermediate) + (go mred) + (go mzscheme) + (go beginner) + (go beginner/abbrev) + (go intermediate) (go intermediate/lambda) (go advanced) (go r5rs))) diff --git a/collects/tests/drscheme/repl-test.ss b/collects/tests/drscheme/repl-test.ss index 4be912e7e3..40a9dc8947 100644 --- a/collects/tests/drscheme/repl-test.ss +++ b/collects/tests/drscheme/repl-test.ss @@ -252,7 +252,7 @@ ;; leading comment test - (make-test "#!\n1" + (make-test "#!/bin/sh\n1" "1" "1" "1" @@ -667,10 +667,10 @@ ;; setup of the namespaces for pict printing (from slideshow) (make-test "(require (lib \"utils.ss\" \"texpict\"))(disk 3)" - "{unknown snip: #}\n" - "{unknown snip: #}\n" - "{unknown snip: #}\n" - "{unknown snip: #}\n" + "{image}" + "{image}" + "{image}" + "{image}" 'interactions #f void @@ -682,10 +682,10 @@ (current-namespace (make-namespace)) (namespace-set-variable-value! 'd (disk 3))) 'd) - "{unknown snip: #}\n" - "{unknown snip: #}\n" - "{unknown snip: #}\n" - "{unknown snip: #}\n" + "#" + "#" + "#" + "#" 'interactions #f void @@ -697,10 +697,10 @@ (namespace-attach-module on n)) '(require (lib "utils.ss" "texpict")) '(disk 3)) - "#" - "#" - "#" - "#" + "{image}" + "{image}" + "{image}" + "{image}" 'interactions #f void @@ -744,7 +744,7 @@ (define xml-tests (list ;; XML tests - (make-test (list "#!\n" + (make-test (list "#!/bin/sh\n" '("Special" "Insert XML Box") "") "(a ())"