From bcab28e5d222490d5bd538cb39a2099a8c7461f1 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 17 May 2010 03:07:10 -0400 Subject: [PATCH] Misc tests/drracket improvements. Removed "info.rkt", since all entries were unused; switched ".ss" to ".rkt" in both real code and tested code (except for the teachpack tests); modernized some tests to use symbolic requires (which would also make it easier to deal with). --- collects/tests/drracket/info.rkt | 11 -- collects/tests/drracket/io.rkt | 6 +- collects/tests/drracket/language-test.rkt | 4 +- .../tests/drracket/module-lang-test-utils.rkt | 4 +- collects/tests/drracket/module-lang-test.rkt | 26 +-- .../randomly-click-language-dialog.rkt | 2 +- .../drracket/randomly-click-preferences.rkt | 2 +- collects/tests/drracket/randomly-click.rkt | 2 +- collects/tests/drracket/repl-test.rkt | 134 +++++++-------- .../drracket/sample-solutions-one-window.rkt | 11 +- .../drracket/save-teaching-lang-file.rkt | 5 +- collects/tests/drracket/stepper-test.rkt | 2 +- collects/tests/drracket/syncheck-test.rkt | 158 +++++++++--------- collects/tests/drracket/teachpack.rkt | 2 +- 14 files changed, 178 insertions(+), 191 deletions(-) delete mode 100644 collects/tests/drracket/info.rkt diff --git a/collects/tests/drracket/info.rkt b/collects/tests/drracket/info.rkt deleted file mode 100644 index d850fdaca3..0000000000 --- a/collects/tests/drracket/info.rkt +++ /dev/null @@ -1,11 +0,0 @@ -#lang setup/infotab - -(define compile-omit-paths - '("config-lang-test.ss" "drscheme-jr.ss" "drscheme-test.ss" - "event-efficency.ss" ;"language-test.ss" - "repl-test-tmp3.ss" "repl-test-tmp2.ss" - "launcher.ss" - "line-art.ss" "menu-test.ss" "repl-test-tmp.ss" - "pr-144.ss" "pr-246.ss" "pr-39.ss" "pr-46.ss" "pr-48.ss" - "pr-51.ss" "pr-58.ss" "pr-80.ss" "pr-99.ss" - "sig.ss" "sixlib.ss")) diff --git a/collects/tests/drracket/io.rkt b/collects/tests/drracket/io.rkt index 88ba8da5d1..4b2d683ee7 100644 --- a/collects/tests/drracket/io.rkt +++ b/collects/tests/drracket/io.rkt @@ -12,7 +12,7 @@ add this test: |# -(require "drracket-test-util.ss" +(require "drracket-test-util.rkt" tests/utils/gui mzlib/class mzlib/pretty @@ -111,11 +111,11 @@ add this test: (clear-definitions drs-frame) (do-execute drs-frame) (unless (equal? "" (fetch-output drs-frame)) - (error 'io.ss "failed long io / execute test (extra io)")) + (error 'io.rkt "failed long io / execute test (extra io)")) (unless (whitespace-string=? (get-output-string string-port) got-output) - (error 'io.ss "failed long io / execute test (output doesn't match)"))))) + (error 'io.rkt "failed long io / execute test (output doesn't match)"))))) (define (reading-test) diff --git a/collects/tests/drracket/language-test.rkt b/collects/tests/drracket/language-test.rkt index 3a3ea329c1..9bbbe9ce90 100644 --- a/collects/tests/drracket/language-test.rkt +++ b/collects/tests/drracket/language-test.rkt @@ -14,7 +14,7 @@ the settings above should match r5rs |# -(require "drracket-test-util.ss" +(require "drracket-test-util.rkt" tests/utils/gui mred framework @@ -1098,7 +1098,7 @@ the settings above should match r5rs "expected lines: ~n ~a~n ~a~ngot lines:~n ~a~n ~a~n" line0-expect line1-expect line0-got line1-got) - (error 'language-test.ss "failed get top of repl test"))))) + (error 'language-test.rkt "failed get top of repl test"))))) ;; teaching-language-fraction-output diff --git a/collects/tests/drracket/module-lang-test-utils.rkt b/collects/tests/drracket/module-lang-test-utils.rkt index b12b5b0f70..8821109990 100644 --- a/collects/tests/drracket/module-lang-test-utils.rkt +++ b/collects/tests/drracket/module-lang-test-utils.rkt @@ -1,5 +1,5 @@ #lang scheme/gui -(require "drracket-test-util.ss" mzlib/etc framework scheme/string) +(require "drracket-test-util.rkt" mzlib/etc framework scheme/string) (provide test t rx run-test in-here write-test-modules) @@ -49,7 +49,7 @@ (set! init-temp-files (let ([old init-temp-files]) (λ () - (let ([file (build-path (find-system-path 'temp-dir) (format "~a.ss" name))]) + (let ([file (build-path (find-system-path 'temp-dir) (format "~a.rkt" name))]) (set! temp-files (cons file temp-files)) (with-output-to-file file #:exists 'truncate (lambda () (printf "~s\n" code)))) diff --git a/collects/tests/drracket/module-lang-test.rkt b/collects/tests/drracket/module-lang-test.rkt index 7de75cd9a5..b4f31fb82f 100644 --- a/collects/tests/drracket/module-lang-test.rkt +++ b/collects/tests/drracket/module-lang-test.rkt @@ -1,5 +1,5 @@ #lang at-exp scheme/gui -(require "module-lang-test-utils.ss") +(require "module-lang-test-utils.rkt") (provide run-test) ;; set up for tests that need external files @@ -71,16 +71,16 @@ (test @t{(module m mzscheme (define x 1) (define y 2) (provide y))} @t{y} "2") -(test @t{(module m mzscheme (require (lib "list.ss")))} +(test @t{(module m mzscheme (require mzlib/list))} @t{foldl} #rx"foldl") -(test @t{(module m mzscheme (require (rename (lib "list.ss") local-foldl foldl)))} +(test @t{(module m mzscheme (require (rename mzlib/list local-foldl foldl)))} @t{local-foldl} #rx"foldl>") -(test @t{(module m mzscheme (require (all-except (lib "list.ss") foldl)))} +(test @t{(module m mzscheme (require (all-except mzlib/list foldl)))} @t{first} #rx"first>") -(test @t{(module m mzscheme (require (all-except (lib "list.ss") foldl)))} +(test @t{(module m mzscheme (require (all-except mzlib/list foldl)))} @t{foldl} ". . reference to an identifier before its definition: foldl") (test @t{(module m mzscheme (require (prefix mz: mzscheme)))} @@ -90,18 +90,18 @@ @t{+} #rx"procedure:[+]") (test @t{(module m mzscheme - (require (prefix x: (lib "list.ss")) (lib "list.ss")))} + (require (prefix x: mzlib/list) mzlib/list))} @t{foldl} #rx"foldl>") (test @t{(module m mzscheme - (require (prefix x: (lib "list.ss")) (lib "list.ss")))} + (require (prefix x: mzlib/list) mzlib/list))} @t{x:foldl} #rx"foldl>") -(test @t{(module m (file @in-here{module-lang-test-tmp1.ss}) x)} +(test @t{(module m (file @in-here{module-lang-test-tmp1.rkt}) x)} @t{x} "1") ;; + shouldn't be bound in the REPL because it isn't bound in the module. -(test @t{(module m (file @in-here{module-lang-test-tmp1.ss}) x)} +(test @t{(module m (file @in-here{module-lang-test-tmp1.rkt}) x)} @t{+} ". . reference to an identifier before its definition: +") (test @t{(module m mzscheme (provide lambda))} @@ -137,7 +137,7 @@ @t{a} "78") (test @t{(module m mzscheme - (require-for-syntax (file @in-here{module-lang-test-tmp2.ss})) + (require-for-syntax (file @in-here{module-lang-test-tmp2.rkt})) (provide s) (define-syntax (s stx) e))} @t{(require m) s} @@ -158,7 +158,7 @@ (eval 'cons)} #f @rx{. compile: unbound identifier \(and no #%top syntax transformer is bound\) in: cons}) -(test @t{(module m (file @in-here{module-lang-test-tmp1.ss}) 1 2 3)} +(test @t{(module m (file @in-here{module-lang-test-tmp1.rkt}) 1 2 3)} @t{1} ;; just make sure no errors. "1") @@ -193,7 +193,7 @@ Interactions disabled: does not support a REPL \(no #%top-interaction\)} #t) -(test @t{(module xx (file @in-here{module-lang-test-tmp4.ss}) +(test @t{(module xx (file @in-here{module-lang-test-tmp4.rkt}) (define x 1) (* x 123))} #f @@ -260,5 +260,5 @@ "3") -(require "drracket-test-util.ss") +(require "drracket-test-util.rkt") (fire-up-drscheme-and-run-tests run-test) diff --git a/collects/tests/drracket/randomly-click-language-dialog.rkt b/collects/tests/drracket/randomly-click-language-dialog.rkt index d63009c9e1..8e3c6dea27 100644 --- a/collects/tests/drracket/randomly-click-language-dialog.rkt +++ b/collects/tests/drracket/randomly-click-language-dialog.rkt @@ -1,3 +1,3 @@ #lang scheme -(require "randomly-click.ss") +(require "randomly-click.rkt") (go 'language-dialog) diff --git a/collects/tests/drracket/randomly-click-preferences.rkt b/collects/tests/drracket/randomly-click-preferences.rkt index ae40c20e8c..56e6ac796c 100644 --- a/collects/tests/drracket/randomly-click-preferences.rkt +++ b/collects/tests/drracket/randomly-click-preferences.rkt @@ -1,3 +1,3 @@ #lang scheme -(require "randomly-click.ss") +(require "randomly-click.rkt") (go 'preferences-dialog) diff --git a/collects/tests/drracket/randomly-click.rkt b/collects/tests/drracket/randomly-click.rkt index 4ff449ba43..a9ebd6e917 100644 --- a/collects/tests/drracket/randomly-click.rkt +++ b/collects/tests/drracket/randomly-click.rkt @@ -126,7 +126,7 @@ "\nExists/Meets window with no button: Bug? seed ~s\n" the-seed) (apply show-log actions) - (error 'randomly-click.ss "giving up")]))]))])))) + (error 'randomly-click.rkt "giving up")]))]))])))) (define (show-log . actions) (for ((action (in-list actions))) diff --git a/collects/tests/drracket/repl-test.rkt b/collects/tests/drracket/repl-test.rkt index ce1773ac04..84a9b08309 100644 --- a/collects/tests/drracket/repl-test.rkt +++ b/collects/tests/drracket/repl-test.rkt @@ -9,11 +9,11 @@ This produces an ACK message #lang scheme (require scheme/sandbox) -(make-evaluator '(file "/tmp/foo.ss")) +(make-evaluator '(file "/tmp/foo.rkt")) |# -(require "drracket-test-util.ss" +(require "drracket-test-util.rkt" mred framework) @@ -61,7 +61,7 @@ This produces an ACK message ".*" (regexp-quote "tests/drracket/repl-test-tmp") "3?" - (regexp-quote ".ss"))) + (regexp-quote ".rkt"))) (define (to-strings . args) @@ -135,10 +135,10 @@ This produces an ACK message (mktest "(" ("{stop-22x22.png} read: expected a `)' to close `('" "{stop-multi.png} {stop-22x22.png} read: expected a `)' to close `('" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: read: expected a `)' to close `('" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: read: expected a `)' to close `('" "{stop-22x22.png} read: expected a `)' to close `('" "{stop-multi.png} {stop-22x22.png} read: expected a `)' to close `('" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: read: expected a `)' to close `('") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: read: expected a `)' to close `('") 'definitions #f void @@ -148,10 +148,10 @@ This produces an ACK message ("{stop-22x22.png} read: illegal use of \".\"" "{stop-multi.png} {stop-22x22.png} read: illegal use of \".\"" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: read: illegal use of \".\"" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: read: illegal use of \".\"" "{stop-22x22.png} read: illegal use of \".\"" "{stop-multi.png} {stop-22x22.png} read: illegal use of \".\"" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: read: illegal use of \".\"") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: read: illegal use of \".\"") 'definitions #f void @@ -161,10 +161,10 @@ This produces an ACK message ("{stop-22x22.png} lambda: bad syntax in: (lambda ())" "{stop-22x22.png} lambda: bad syntax in: (lambda ())" - "{stop-22x22.png} repl-test-tmp3.ss:1:0: lambda: bad syntax in: (lambda ())" + "{stop-22x22.png} repl-test-tmp3.rkt:1:0: lambda: bad syntax in: (lambda ())" "{stop-22x22.png} lambda: bad syntax in: (lambda ())" "{stop-multi.png} {stop-22x22.png} lambda: bad syntax in: (lambda ())" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: lambda: bad syntax in: (lambda ())") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: lambda: bad syntax in: (lambda ())") 'definitions #f void @@ -175,10 +175,10 @@ This produces an ACK message ("{stop-22x22.png} lambda: bad syntax in: (lambda ())" "{stop-22x22.png} lambda: bad syntax in: (lambda ())" - "{stop-22x22.png} repl-test-tmp3.ss:1:7: lambda: bad syntax in: (lambda ())" + "{stop-22x22.png} repl-test-tmp3.rkt:1:7: lambda: bad syntax in: (lambda ())" "{stop-22x22.png} lambda: bad syntax in: (lambda ())" "{stop-multi.png} {stop-22x22.png} lambda: bad syntax in: (lambda ())" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:7: lambda: bad syntax in: (lambda ())") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:7: lambda: bad syntax in: (lambda ())") 'definitions #f void @@ -188,7 +188,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: reference to undefined identifier: xx" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: reference to undefined identifier: xx" "reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx") @@ -303,7 +303,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:7: reference to undefined identifier: xx" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:7: reference to undefined identifier: xx" "reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx") @@ -320,10 +320,10 @@ This produces an ACK message ("{stop-22x22.png} compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1" "{stop-22x22.png} compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1" - "{stop-22x22.png} repl-test-tmp3.ss:1:43: compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1" + "{stop-22x22.png} repl-test-tmp3.rkt:1:43: compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1" "{stop-22x22.png} compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1" "{stop-multi.png} {stop-22x22.png} compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:43: compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:43: compile: bad syntax; literal data is not allowed, because no #%datum syntax transformer is bound in: 1") 'definitions #f void @@ -348,7 +348,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:2:0: reference to undefined identifier: xx" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:2:0: reference to undefined identifier: xx" "reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx") @@ -415,7 +415,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: reference to undefined identifier: x" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: reference to undefined identifier: x" "reference to undefined identifier: x" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: x" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: x") @@ -455,7 +455,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #" "{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: expt: expected argument of type ; given #" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: expt: expected argument of type ; given #" "expt: expected argument of type ; given #" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: expt: expected argument of type ; given #" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: expt: expected argument of type ; given #") @@ -469,10 +469,10 @@ This produces an ACK message ("1\n2\n{stop-22x22.png} read: expected a `)' to close `('" "{stop-multi.png} {stop-22x22.png} read: expected a `)' to close `('" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: read: expected a `)' to close `('" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: read: expected a `)' to close `('" "1\n2\n{stop-22x22.png} read: expected a `)' to close `('" "{stop-multi.png} {stop-22x22.png} read: expected a `)' to close `('" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: read: expected a `)' to close `('") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: read: expected a `)' to close `('") 'definitions #f void @@ -481,10 +481,10 @@ This produces an ACK message ("1\n2\n{stop-22x22.png} read: illegal use of \".\"" "{stop-multi.png} {stop-22x22.png} read: illegal use of \".\"" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: read: illegal use of \".\"" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: read: illegal use of \".\"" "1\n2\n{stop-22x22.png} read: illegal use of \".\"" "{stop-multi.png} {stop-22x22.png} read: illegal use of \".\"" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: read: illegal use of \".\"") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: read: illegal use of \".\"") 'definitions #f void @@ -493,10 +493,10 @@ This produces an ACK message ("1\n2\n{stop-22x22.png} lambda: bad syntax in: (lambda ())" "{stop-22x22.png} lambda: bad syntax in: (lambda ())" - "{stop-22x22.png} repl-test-tmp3.ss:1:4: lambda: bad syntax in: (lambda ())" + "{stop-22x22.png} repl-test-tmp3.rkt:1:4: lambda: bad syntax in: (lambda ())" "1\n2\n{stop-22x22.png} lambda: bad syntax in: (lambda ())" "{stop-multi.png} {stop-22x22.png} lambda: bad syntax in: (lambda ())" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: lambda: bad syntax in: (lambda ())") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: lambda: bad syntax in: (lambda ())") 'definitions #f void @@ -505,7 +505,7 @@ This produces an ACK message ("1\n2\n{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:4: reference to undefined identifier: x" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: reference to undefined identifier: x" "1\n2\nreference to undefined identifier: x" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: x" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: x") @@ -542,10 +542,10 @@ This produces an ACK message ("{stop-22x22.png} cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4" "{stop-22x22.png} cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4" - "{stop-22x22.png} repl-test-tmp3.ss:2:7: cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4" + "{stop-22x22.png} repl-test-tmp3.rkt:2:7: cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4" "{stop-multi.png} {stop-22x22.png} cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4" "{stop-multi.png} {stop-22x22.png} cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:2:7: cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:2:7: cond: expected a clause with one question and one answer, but found a clause with 4 parts in:\n 1\n 2\n 3\n 4") 'definitions #f void @@ -553,33 +553,33 @@ This produces an ACK message ;; error across separate files (mktest - "(load \"repl-test-tmp2.ss\") (define (g) (+ 1 (expt 3 #f))) (f g)" + "(load \"repl-test-tmp2.rkt\") (define (g) (+ 1 (expt 3 #f))) (f g)" ("{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f" "{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:44: expt: expected argument of type ; given #f" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:45: expt: expected argument of type ; given #f" "{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f" "{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:27: expt: expected argument of type ; given #f") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:28: expt: expected argument of type ; given #f") 'definitions #f (λ () - (call-with-output-file (build-path tmp-load-directory "repl-test-tmp2.ss") + (call-with-output-file (build-path tmp-load-directory "repl-test-tmp2.rkt") (lambda (port) (write '(define (f t) (+ 1 (t))) port)) #:exists 'truncate)) - (λ () (delete-file (build-path tmp-load-directory "repl-test-tmp2.ss")))) + (λ () (delete-file (build-path tmp-load-directory "repl-test-tmp2.rkt")))) ;; new namespace test (mktest "(current-namespace (make-namespace))\nif" ("{stop-22x22.png} if: bad syntax in: if" "{stop-22x22.png} if: bad syntax in: if" - "{stop-22x22.png} repl-test-tmp3.ss:2:0: if: bad syntax in: if" + "{stop-22x22.png} repl-test-tmp3.rkt:2:0: if: bad syntax in: if" "{stop-22x22.png} if: bad syntax in: if" "{stop-multi.png} {stop-22x22.png} if: bad syntax in: if" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:2:0: if: bad syntax in: if") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:2:0: if: bad syntax in: if") 'definitions #f void @@ -589,10 +589,10 @@ This produces an ACK message ("{stop-22x22.png} compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction" "{stop-22x22.png} compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction" - "{stop-22x22.png} repl-test-tmp3.ss:2:0: compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction" + "{stop-22x22.png} repl-test-tmp3.rkt:2:0: compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction" "{stop-22x22.png} compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction" "{stop-multi.png} {stop-22x22.png} compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:2:0: compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:2:0: compile: unbound identifier (and no #%app syntax transformer is bound) in: #%top-interaction") 'definitions #f void @@ -618,7 +618,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f\n15" "{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f\n15" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:5:19: expt: expected argument of type ; given #f\n15" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:5:19: expt: expected argument of type ; given #f\n15" "expt: expected argument of type ; given #f\n15" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: expt: expected argument of type ; given #f\n15" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: expt: expected argument of type ; given #f\n15") @@ -644,12 +644,12 @@ This produces an ACK message ;; should produce a syntax object with a turn-down triangle. (mktest "(write (list (syntax x)))" - (#rx"({embedded \".#\"})" - #rx"({embedded \".#\"})" - #rx"({embedded \".#\"})" - #rx"({embedded \".#\"})" - #rx"({embedded \".#\"})" - #rx"({embedded \".#\"})") + (#rx"({embedded \".#\"})" + #rx"({embedded \".#\"})" + #rx"({embedded \".#\"})" + #rx"({embedded \".#\"})" + #rx"({embedded \".#\"})" + #rx"({embedded \".#\"})") 'interactions #f void @@ -685,12 +685,12 @@ This produces an ACK message (mktest "(parameterize ([current-output-port (open-output-string)]) (fprintf (current-error-port) \"~e\" #'foot))" - (#rx"#" - #rx"#" - #rx"#" - #rx"#" - #rx"#" - #rx"#") + (#rx"#" + #rx"#" + #rx"#" + #rx"#" + #rx"#" + #rx"#") 'interactions #f void @@ -717,7 +717,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f" "{stop-multi.png} {stop-22x22.png} expt: expected argument of type ; given #f" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:6:15: expt: expected argument of type ; given #f" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:6:15: expt: expected argument of type ; given #f" "expt: expected argument of type ; given #f" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: expt: expected argument of type ; given #f" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: expt: expected argument of type ; given #f") @@ -794,7 +794,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} procedure application: expected procedure, given: 3; arguments were: 3" "{stop-multi.png} {stop-22x22.png} procedure application: expected procedure, given: 3; arguments were: 3" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:3:13: procedure application: expected procedure, given: 3; arguments were: 3" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:3:13: procedure application: expected procedure, given: 3; arguments were: 3" "procedure application: expected procedure, given: 3; arguments were: 3" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: procedure application: expected procedure, given: 3; arguments were: 3" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: procedure application: expected procedure, given: 3; arguments were: 3") @@ -868,10 +868,10 @@ This produces an ACK message ("{stop-22x22.png} λ: bad syntax in: (λ ())" "{stop-22x22.png} λ: bad syntax in: (λ ())" - "{stop-22x22.png} repl-test-tmp3.ss:1:0: λ: bad syntax in: (λ ())" + "{stop-22x22.png} repl-test-tmp3.rkt:1:0: λ: bad syntax in: (λ ())" "{stop-22x22.png} λ: bad syntax in: (λ ())" "{stop-multi.png} {stop-22x22.png} λ: bad syntax in: (λ ())" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: λ: bad syntax in: (λ ())") + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: λ: bad syntax in: (λ ())") 'definitions #f void @@ -882,7 +882,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:26: reference to undefined identifier: x" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:26: reference to undefined identifier: x" "reference to undefined identifier: x" "reference to undefined identifier: x" "reference to undefined identifier: x") @@ -896,7 +896,7 @@ This produces an ACK message ("{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: xx" - "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.ss:1:0: reference to undefined identifier: xx" + "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: reference to undefined identifier: xx" "reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx" #rx"{stop-multi.png} {stop-22x22.png} .*mred/private/snipfile.rkt:[0-9]+:[0-9]+: reference to undefined identifier: xx") @@ -904,11 +904,11 @@ This produces an ACK message #f void void) - + ;; setup of the namespaces for pict printing (from slideshow) - - (mktest "(require (lib \"utils.ss\" \"texpict\"))(disk 3)" - + + (mktest "(require texpict/utils)(disk 3)" + ("{image}" "{image}" "{image}" @@ -955,12 +955,12 @@ This produces an ACK message #f void void) - + (mktest (string-append - "(require (lib \"pretty.ss\"))" + "(require mzlib/pretty)" "(pretty-print-print-hook (lambda x (expt 3 #f)))" "(list 1 2 3)") - + ("(1 2 3)" "(1 2 3)" "(1 2 3)" @@ -1090,10 +1090,10 @@ This produces an ACK message (normalize-path (collection-path "tests" "drracket")))) -(define tmp-load-short-filename "repl-test-tmp.ss") +(define tmp-load-short-filename "repl-test-tmp.rkt") (define tmp-load-filename (build-path tmp-load-directory tmp-load-short-filename)) -(define tmp-load3-short-filename "repl-test-tmp3.ss") +(define tmp-load3-short-filename "repl-test-tmp3.rkt") (define tmp-load3-filename (build-path tmp-load-directory tmp-load3-short-filename)) (define (cleanup-tmp-files) @@ -1143,9 +1143,9 @@ This produces an ACK message (type-in-definitions drscheme-frame "(+ ") (test:menu-select "Edit" "Paste") (type-in-definitions drscheme-frame " 1/3)")) - - ; given a filename "foo", we perform two operations on the contents - ; of the file "foo.ss". First, we insert its contents into the REPL + + ; given a filename "foo", we perform two operations on the contents + ; of the file "foo.rkt". First, we insert its contents into the REPL ; directly, and second, we use the load command. We compare the ; results of these operations against expected results. (define ((run-single-test execute-text-start escape language-cust) in-vector) diff --git a/collects/tests/drracket/sample-solutions-one-window.rkt b/collects/tests/drracket/sample-solutions-one-window.rkt index 7ef39b7465..9ded8235bc 100644 --- a/collects/tests/drracket/sample-solutions-one-window.rkt +++ b/collects/tests/drracket/sample-solutions-one-window.rkt @@ -1,6 +1,6 @@ (module sample-solutions-one-window mzscheme - (require "drracket-test-util.ss" + (require "drracket-test-util.rkt" tests/utils/gui mzlib/class mzlib/list @@ -222,15 +222,14 @@ (define stupid-internal-definitions-syntax (unless (directory-exists? sample-solutions-dir) - (error 'sample-solutions.ss "expected directory ~s to exist" sample-solutions-dir))) + (error 'sample-solutions.rkt "expected directory ~s to exist" sample-solutions-dir))) (define stupid-internal-definitions-syntax2 (set! sample-solutions-dir (normalize-path sample-solutions-dir))) - (define toc (call-with-input-file (build-path sample-solutions-dir "toc.ss") read)) - - - + (define toc (call-with-input-file (build-path sample-solutions-dir "toc.rkt") read)) + + (define labels (let* ([all-info (call-with-input-file (build-path (collection-path "solutions") 'up 'up "proj" "book" "solutions" diff --git a/collects/tests/drracket/save-teaching-lang-file.rkt b/collects/tests/drracket/save-teaching-lang-file.rkt index d36d1b0f54..8101ba1df7 100644 --- a/collects/tests/drracket/save-teaching-lang-file.rkt +++ b/collects/tests/drracket/save-teaching-lang-file.rkt @@ -27,7 +27,8 @@ (fprintf (current-error-port) "---- saved file, cut here ----\n") (call-with-input-file fn (λ (p) (copy-port p (current-error-port)))) (fprintf (current-error-port) "---- saved file, cut here ----\n") - (error 'save-teaching-lang-file.ss "expected the saved file to contain the word 'metadata' in a comment")) + (error 'save-teaching-lang-file.rkt + "expected the saved file to contain the word 'metadata' in a comment")) (do-execute drs-frame) (test:menu-select "File" "Close Tab") (use-get/put-dialog @@ -42,4 +43,4 @@ (test:menu-select "File" "Close Tab") (delete-file fn) (unless (equal? result "1\n> ") - (error 'save-teaching-lang-file.ss "expected the program to produce 1 (followed by the prompt), got ~s" result))))))) + (error 'save-teaching-lang-file.rkt "expected the program to produce 1 (followed by the prompt), got ~s" result))))))) diff --git a/collects/tests/drracket/stepper-test.rkt b/collects/tests/drracket/stepper-test.rkt index 029ab28a4c..cd24eac464 100644 --- a/collects/tests/drracket/stepper-test.rkt +++ b/collects/tests/drracket/stepper-test.rkt @@ -2,7 +2,7 @@ (module stepper-test mzscheme (require mred mzlib/class - "drracket-test-util.ss" + "drracket-test-util.rkt" tests/utils/gui framework mzlib/pretty) diff --git a/collects/tests/drracket/syncheck-test.rkt b/collects/tests/drracket/syncheck-test.rkt index 51387918c3..0ba2d298d9 100644 --- a/collects/tests/drracket/syncheck-test.rkt +++ b/collects/tests/drracket/syncheck-test.rkt @@ -7,7 +7,7 @@ trigger runtime errors in check syntax. |# #lang scheme/base - (require "drracket-test-util.ss" + (require "drracket-test-util.rkt" string-constants/string-constant tests/utils/gui scheme/path @@ -261,11 +261,11 @@ trigger runtime errors in check syntax. (" " default-color) ("mzscheme" error) (")" default-color))) - (build-test "(require (lib \"list.ss\"))" + (build-test "(require mzlib/list)" '(("(" default-color) ("require" imported-syntax) (" " default-color) - ("(lib \"list.ss\")" error) + ("mzlib/list" error) (")" default-color))) (build-test "(module m mzscheme (provide x) (define x 1))" '(("(" default-color) @@ -296,37 +296,37 @@ trigger runtime errors in check syntax. ("))" default-color)) (list '((10 18) (20 21)))) - (build-test "(module m mzscheme (require (lib \"list.ss\")))" + (build-test "(module m mzscheme (require mzlib/list))" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require" imported-syntax) (" " default-color) - ("(lib \"list.ss\")" error) + ("mzlib/list" error) ("))" default-color)) (list '((10 18) (20 27)))) - (build-test "(module m mzscheme (require-for-syntax (lib \"list.ss\")) (define-syntax s foldl))" + (build-test "(module m mzscheme (require-for-syntax mzlib/list) (define-syntax s foldl))" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require-for-syntax" imported-syntax) - (" (lib \"list.ss\")) (" default-color) + (" mzlib/list) (" default-color) ("define-syntax" imported-syntax) (" " default-color) ("s" lexically-bound-syntax) (" " default-color) ("foldl" imported-variable) ("))" default-color)) - (list '((10 18) (20 38) (57 70)) - '((39 54) (73 78)))) + (list '((10 18) (20 38) (52 65)) + '((39 49) (68 73)))) - (build-test "(module m mzscheme (require-for-syntax (lib \"etc.ss\")) (define-syntax s (rec f 1)))" + (build-test "(module m mzscheme (require-for-syntax mzlib/etc) (define-syntax s (rec f 1)))" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require-for-syntax" imported-syntax) - (" (lib \"etc.ss\")) (" default-color) + (" mzlib/etc) (" default-color) ("define-syntax" imported-syntax) (" " default-color) ("s" lexically-bound-syntax) @@ -337,11 +337,10 @@ trigger runtime errors in check syntax. (" " default-color) ("1" constant) (")))" default-color)) - (list '((10 18) (20 38) (56 69)) - '((39 53) (73 76)))) + (list '((10 18) (20 38) (51 64)) + '((39 48) (68 71)))) + - - (build-test "(define-for-syntax (f x) x) (define (f x) x) f (define-syntax (m x) (f x))" '(("(" default-color) ("define-for-syntax" imported) @@ -437,25 +436,25 @@ trigger runtime errors in check syntax. ("))))" default-color)) (list '((26 29) (44 47)))) - (build-test "(require (lib \"list.ss\")) first" + (build-test "(require mzlib/list) first" '(("(" default-color) ("require" imported-syntax) - (" (lib \"list.ss\")) " default-color) + (" mzlib/list) " default-color) ("first" imported-variable)) - (list '((9 24) (26 31)))) - - (build-test "(require (lib \"etc.ss\")) (rec f 1)" + (list '((9 19) (21 26)))) + + (build-test "(require mzlib/etc) (rec f 1)" '(("(" default-color) ("require" imported-syntax) - (" (lib \"etc.ss\")) (" default-color) + (" mzlib/etc) (" default-color) ("rec" imported-syntax) (" " default-color) ("f" lexically-bound-variable) (" " default-color) ("1" constant) (")" default-color)) - (list '((9 23) (26 29)))) - + (list '((9 18) (21 24)))) + (build-test "(define-struct s ())" '(("(" default-color) ("define-struct" imported-syntax) @@ -608,62 +607,62 @@ trigger runtime errors in check syntax. ("this" imported) (")" default-color))) - (build-test "(module m mzscheme (require (lib \"list.ss\")) foldl)" + (build-test "(module m mzscheme (require mzlib/list) foldl)" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require" imported-syntax) - (" (lib \"list.ss\")) " default-color) + (" mzlib/list) " default-color) ("foldl" imported-variable) (")" default-color)) (list '((10 18) (20 27)) - '((28 43) (45 50)))) - (build-test "(module m (lib \"htdp-beginner.ss\" \"lang\") empty)" - '(("(" default-color) - ("module" imported-syntax) - (" m (lib \"htdp-beginner.ss\" \"lang\") " default-color) - ("empty" imported-variable) - (")" default-color)) - (list '((10 41) (42 47)))) - (build-test "(module m mzscheme (require (prefix x: (lib \"list.ss\"))) x:foldl)" + '((28 38) (40 45)))) + (build-test "(module m lang/htdp-beginner empty)" + '(("(" default-color) + ("module" imported-syntax) + (" m lang/htdp-beginner " default-color) + ("empty" imported-variable) + (")" default-color)) + (list '((10 28) (29 34)))) + (build-test "(module m mzscheme (require (prefix x: mzlib/list)) x:foldl)" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require" imported-syntax) - (" (prefix x: (lib \"list.ss\"))) " default-color) + (" (prefix x: mzlib/list)) " default-color) ("x:foldl" imported-variable) (")" default-color)) (list '((10 18) (20 27)) - '((28 55) (57 64)))) - - (build-test "(module m mzscheme (require (prefix x: (lib \"list.ss\")) (lib \"list.ss\")) x:foldl foldl)" - '(("(" default-color) - ("module" imported-syntax) - (" m mzscheme (" default-color) - ("require" imported-syntax) - (" (prefix x: (lib \"list.ss\")) (lib \"list.ss\")) " default-color) - ("x:foldl" imported-variable) - (" " default-color) - ("foldl" imported-variable) - (")" default-color)) - (list '((10 18) (20 27)) - '((28 55) (73 80)) - '((56 71) (81 86)))) + '((28 50) (52 59)))) - (build-test "(module m mzscheme (require (only (lib \"list.ss\") foldr) (only (lib \"list.ss\") foldl)) foldl foldr)" + (build-test "(module m mzscheme (require (prefix x: mzlib/list) mzlib/list) x:foldl foldl)" + '(("(" default-color) + ("module" imported-syntax) + (" m mzscheme (" default-color) + ("require" imported-syntax) + (" (prefix x: mzlib/list) mzlib/list) " default-color) + ("x:foldl" imported-variable) + (" " default-color) + ("foldl" imported-variable) + (")" default-color)) + (list '((10 18) (20 27)) + '((28 50) (63 70)) + '((51 61) (71 76)))) + + (build-test "(module m mzscheme (require (only mzlib/list foldr) (only mzlib/list foldl)) foldl foldr)" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require" imported-syntax) - (" (only (lib \"list.ss\") foldr) (only (lib \"list.ss\") foldl)) " default-color) + (" (only mzlib/list foldr) (only mzlib/list foldl)) " default-color) ("foldl" imported-variable) (" " default-color) ("foldr" imported-variable) (")" default-color)) (list '((10 18) (20 27)) - '((28 56) (87 92) (93 98)) - '((57 85) (87 92) (93 98)))) - + '((28 51) (77 82) (83 88)) + '((52 75) (77 82) (83 88)))) + (build-test "(module m mzscheme (require (prefix x: mzscheme)) x:+ +)" '(("(" default-color) ("module" imported-syntax) @@ -676,13 +675,13 @@ trigger runtime errors in check syntax. (")" default-color)) (list '((10 18) (20 27) (54 55)) '((28 48) (50 53)))) - - (build-test "(module m mzscheme (require (lib \"etc.ss\")) (rec f 1))" + + (build-test "(module m mzscheme (require mzlib/etc) (rec f 1))" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require" imported-syntax) - (" (lib \"etc.ss\")) (" default-color) + (" mzlib/etc) (" default-color) ("rec" imported-syntax) (" " default-color) ("f" lexically-bound-variable) @@ -690,24 +689,23 @@ trigger runtime errors in check syntax. ("1" constant) ("))" default-color)) (list '((10 18) (20 27)) - '((28 42) (45 48)))) - - (build-test "(module m (lib \"htdp-intermediate.ss\" \"lang\") (local ((define x x)) x))" - '(("(" default-color) - ("module" imported-syntax) - (" m (lib \"htdp-intermediate.ss\" \"lang\") (" default-color) - ("local" imported-syntax) - (" ((define " default-color) - ("x" lexically-bound-variable) - (" " default-color) - ("x" lexically-bound-variable) - (")) " default-color) - ("x" lexically-bound-variable) - ("))" default-color)) - (list '((10 45) (47 52)) - '((62 63) (64 65) (68 69)))) - - + '((28 37) (40 43)))) + + (build-test "(module m lang/htdp-intermediate (local ((define x x)) x))" + '(("(" default-color) + ("module" imported-syntax) + (" m lang/htdp-intermediate (" default-color) + ("local" imported-syntax) + (" ((define " default-color) + ("x" lexically-bound-variable) + (" " default-color) + ("x" lexically-bound-variable) + (")) " default-color) + ("x" lexically-bound-variable) + ("))" default-color)) + (list '((10 32) (34 39)) + '((49 50) (51 52) (55 56)))) + (build-test "(module m mzscheme (define-syntax rename #f) (require (rename mzscheme ++ +)))" '(("(" default-color) ("module" imported) @@ -816,14 +814,14 @@ trigger runtime errors in check syntax. '((77 79) (210 212)) '((73 76) (41 44)))) - (make-dir-test "(module m mzscheme (require \"~a/list.ss\") foldl foldl)" + (make-dir-test "(module m mzscheme (require \"~a/list.rkt\") foldl foldl)" '(("(" default-color) ("module" imported-syntax) (" m mzscheme (" default-color) ("require" imported-syntax) (" \"" default-color) (relative-path default-color) - ("/list.ss\") " default-color) + ("/list.rkt\") " default-color) ("foldl" imported-variable) (" " default-color) ("foldl" imported-variable) @@ -883,7 +881,7 @@ trigger runtime errors in check syntax. ;; this isn't right -- seems like there is a race condition because ;; wait-for-computation isn't waiting long enough? '(when (send defs in-edit-sequence?) - (error 'syncheck-test.ss "still in edit sequence for ~s" input)) + (error 'syncheck-test.rkt "still in edit sequence for ~s" input)) (when (send drs syncheck:error-report-visible?) (fprintf (current-error-port) @@ -997,4 +995,4 @@ trigger runtime errors in check syntax. (channel-put chan (get-string/style-desc (send drs get-definitions-text))))) (channel-get chan))) - (main) \ No newline at end of file + (main) diff --git a/collects/tests/drracket/teachpack.rkt b/collects/tests/drracket/teachpack.rkt index 2bbf8a22b1..af13156fbb 100644 --- a/collects/tests/drracket/teachpack.rkt +++ b/collects/tests/drracket/teachpack.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require "drracket-test-util.ss" +(require "drracket-test-util.rkt" scheme/class scheme/path scheme/gui/base