drscheme => drracket

This commit is contained in:
Robby Findler 2012-02-13 09:25:16 -06:00
parent 967372c23d
commit 4763fb5189
25 changed files with 84 additions and 84 deletions

View File

@ -16,9 +16,9 @@
"there was a non-empty autosave toc when starting the test, so the test won't work right; contents:\n ~s"
autosave-contents)))
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(define drs (wait-for-drscheme-frame))
(define drs (wait-for-drracket-frame))
(define defs (send drs get-definitions-text))

View File

@ -3,9 +3,9 @@
racket/class
racket/gui/base)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(define drs (wait-for-drscheme-frame))
(define drs (wait-for-drracket-frame))
(define defs (send drs get-definitions-text))
(define rep (send drs get-interactions-text))
(set-language-level! (list #rx"How to Design Programs" #rx"Beginning Student$"))

View File

@ -10,9 +10,9 @@ to DrRacket and then tries out the keystrokes.
framework/test
racket/class)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(define drs-frame (wait-for-drscheme-frame))
(define drs-frame (wait-for-drracket-frame))
(use-get/put-dialog
(λ ()
(test:menu-select "Edit" "Keybindings" "Add User-defined Keybindings..."))

View File

@ -191,9 +191,9 @@ add this test:
(define drs-frame #f)
(define interactions-text #f)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(set! drs-frame (wait-for-drscheme-frame))
(set! drs-frame (wait-for-drracket-frame))
(set! interactions-text (queue-callback/res (lambda () (send drs-frame get-interactions-text))))
(set-language-level! (list #rx"Pretty Big"))
(clear-definitions drs-frame)

View File

@ -1090,7 +1090,7 @@ the settings above should match r5rs
(define (prepare-for-test-expression)
(let ([drs (wait-for-drscheme-frame)])
(let ([drs (wait-for-drracket-frame)])
(clear-definitions drs)
(set-language #t)
(sleep 1) ;; this shouldn't be neccessary....
@ -1143,7 +1143,7 @@ the settings above should match r5rs
""))
(define (check-top-of-repl)
(let ([drs (wait-for-drscheme-frame)])
(let ([drs (wait-for-drracket-frame)])
(set-language #t)
(with-handlers ([exn:fail? void])
(fw:test:menu-select "Testing" "Disable tests"))
@ -1221,7 +1221,7 @@ the settings above should match r5rs
(define (generic-output list? quasi-quote? has-sharing? has-print-printing?)
(let* ([plain-print-style (if has-print-printing? "print" "write")]
[drs (wait-for-drscheme-frame)]
[drs (wait-for-drracket-frame)]
[expression "(define x (list 2))\n(list x x)"]
[set-output-choice
(lambda (option show-sharing pretty?)
@ -1309,7 +1309,7 @@ the settings above should match r5rs
"WARNING: Interactions window is out of sync with the definitions window\\."))
(define (test-error-after-definition)
(let* ([drs (wait-for-drscheme-frame)]
(let* ([drs (wait-for-drracket-frame)]
[interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))])
(clear-definitions drs)
(type-in-definitions drs "(define y 0) (define (f x) (/ x y)) (f 2)")
@ -1336,7 +1336,7 @@ the settings above should match r5rs
;; types an expression in the definitions window, executes it and tests the output
;; types an expression in the REPL and tests the output from the REPL.
(define (test-expression expression defs-expected [repl-expected defs-expected])
(let* ([drs (wait-for-drscheme-frame)]
(let* ([drs (wait-for-drracket-frame)]
[interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))]
[definitions-text (queue-callback/res (λ () (send drs get-definitions-text)))]
[handle-insertion
@ -1457,4 +1457,4 @@ the settings above should match r5rs
(go advanced)
)
(fire-up-drscheme-and-run-tests run-test)
(fire-up-drracket-and-run-tests run-test)

View File

@ -41,9 +41,9 @@
(printf "cpu time: ~a real time: ~a gc time: ~a\n"
n n n))))
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(let ([drs-frame (wait-for-drscheme-frame)])
(let ([drs-frame (wait-for-drracket-frame)])
;; initial startup memory use
(wait-and-print)

View File

@ -378,4 +378,4 @@
;; test to make sure that we don't get "exception raised by error display handler"
#rx"module-lang-test-syn-error.rkt:[0-9]+:[0-9]+: lambda: bad syntax in: \\(lambda\\)")
(fire-up-drscheme-and-run-tests run-test)
(fire-up-drracket-and-run-tests run-test)

View File

@ -12,9 +12,9 @@
(error who "Deleting files is not allowed")))
void
void)])
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(define drs-frame1 (wait-for-drscheme-frame))
(define drs-frame1 (wait-for-drracket-frame))
(sync (system-idle-evt))
(test:menu-select "File" "New Tab")

View File

@ -12,13 +12,13 @@
[set-module-language! (->* () (boolean?) void?)])
(provide queue-callback/res
fire-up-drscheme-and-run-tests
save-drscheme-window-as
fire-up-drracket-and-run-tests
save-drracket-window-as
do-execute
test-util-error
poll-until
wait-for-computation
wait-for-drscheme-frame
wait-for-drracket-frame
wait-for-new-frame
clear-definitions
type-in-definitions
@ -39,11 +39,11 @@
run-one/sync
alt-return-in-interactions)
;; save-drscheme-window-as : string -> void
;; use the "save as" dialog in drscheme to save the definitions
;; save-drracket-window-as : string -> void
;; use the "save as" dialog in drracket to save the definitions
;; window to a file.
(define (save-drscheme-window-as filename)
(not-on-eventspace-handler-thread 'save-drscheme-window-as)
(define (save-drracket-window-as filename)
(not-on-eventspace-handler-thread 'save-drracket-window-as)
(use-get/put-dialog
(lambda ()
(fw:test:menu-select "File" "Save Definitions As..."))
@ -53,7 +53,7 @@
;; filename is a string naming a file that should be typed into the dialog
(define (use-get/put-dialog open-dialog filename)
(not-on-eventspace-handler-thread 'use-get/put-dialog)
(let ([drs (wait-for-drscheme-frame)])
(let ([drs (wait-for-drracket-frame)])
(with-handlers ([(lambda (x) #t)
(lambda (x)
(fw:preferences:set 'framework:file-dialogs 'std)
@ -95,22 +95,22 @@
(sleep step)
(loop (- counter step)))))))))
(define (drscheme-frame? frame)
(define (drracket-frame? frame)
(method-in-interface? 'get-execute-button (object-interface frame)))
(define (wait-for-drscheme-frame [print-message? #f])
(let ([wait-for-drscheme-frame-pred
(define (wait-for-drracket-frame [print-message? #f])
(let ([wait-for-drracket-frame-pred
(lambda ()
(let ([active (fw:test:get-active-top-level-window)])
(if (and active
(drscheme-frame? active))
(drracket-frame? active))
active
#f)))])
(or (wait-for-drscheme-frame-pred)
(or (wait-for-drracket-frame-pred)
(begin
(when print-message?
(printf "Select DrRacket frame\n"))
(poll-until wait-for-drscheme-frame-pred)))))
(poll-until wait-for-drracket-frame-pred)))))
;; wait-for-new-frame : frame [(listof eventspace) = null] -> frame
;; returns the newly opened frame, waiting until old-frame
@ -137,7 +137,7 @@
(poll-until wait-for-new-frame-pred timeout))]))
;; wait-for-computation : frame -> void
;; waits until the drscheme frame finishes some computation.
;; waits until the drracket frame finishes some computation.
;; uses the state of the execute button to indicate when the
;; computations is finished. That is, waits for the execute
;; button to dim, indicating a computation is running. Then,
@ -145,7 +145,7 @@
;; is complete.
(define (wait-for-computation frame)
(not-on-eventspace-handler-thread 'wait-for-computation)
(queue-callback/res (λ () (verify-drscheme-frame-frontmost 'wait-for-computation frame)))
(queue-callback/res (λ () (verify-drracket-frame-frontmost 'wait-for-computation frame)))
(let* ([wait-for-computation-to-start
(lambda ()
(fw:test:reraise-error)
@ -164,21 +164,21 @@
(do-execute frame #t)]
[(frame wait-for-finish?)
(not-on-eventspace-handler-thread 'do-execute)
(queue-callback/res (λ () (verify-drscheme-frame-frontmost 'do-execute frame)))
(queue-callback/res (λ () (verify-drracket-frame-frontmost 'do-execute frame)))
(let ([button (queue-callback/res (λ () (send frame get-execute-button)))])
(fw:test:run-one (lambda () (send button command)))
(when wait-for-finish?
(wait-for-computation frame)))]))
(define (verify-drscheme-frame-frontmost function-name frame)
(on-eventspace-handler-thread 'verify-drscheme-frame-frontmost)
(define (verify-drracket-frame-frontmost function-name frame)
(on-eventspace-handler-thread 'verify-drracket-frame-frontmost)
(let ([tl (fw:test:get-active-top-level-window)])
(unless (and (eq? frame tl)
(drscheme-frame? tl))
(error function-name "drscheme frame not frontmost: ~e (found ~e)" frame tl))))
(drracket-frame? tl))
(error function-name "drracket frame not frontmost: ~e (found ~e)" frame tl))))
(define (clear-definitions frame)
(queue-callback/res (λ () (verify-drscheme-frame-frontmost 'clear-definitions frame)))
(queue-callback/res (λ () (verify-drracket-frame-frontmost 'clear-definitions frame)))
(fw:test:new-window (queue-callback/res (λ () (send frame get-definitions-canvas))))
(let ([window (queue-callback/res (λ () (send frame get-edit-target-window)))])
(let-values ([(cw ch) (queue-callback/res (λ () (send window get-client-size)))]
@ -214,7 +214,7 @@
(parameterize ([current-output-port port])
(write str/sexp port))
(get-output-string port)))])
(queue-callback/res (λ () (verify-drscheme-frame-frontmost who frame)))
(queue-callback/res (λ () (verify-drracket-frame-frontmost who frame)))
(let ([canvas (queue-callback/res (λ () (get-canvas frame)))])
(fw:test:new-window canvas)
(let ([editor (queue-callback/res (λ () (send canvas get-editor)))])
@ -242,7 +242,7 @@
(define (alt-return-in-interactions frame)
(not-on-eventspace-handler-thread 'alt-return-in-interactions)
(queue-callback/res (λ () (verify-drscheme-frame-frontmost 'alt-return-in-interactions frame)))
(queue-callback/res (λ () (verify-drracket-frame-frontmost 'alt-return-in-interactions frame)))
(let ([canvas (send frame get-interactions-canvas)])
(fw:test:new-window canvas)
(let ([editor (send canvas get-editor)])
@ -406,7 +406,7 @@
(let ([new-frame (wait-for-new-frame language-dialog)])
(unless (eq? new-frame drs-frame)
(error 'set-language-level!
"didn't get drscheme frame back, got: ~s (drs-frame ~s)\n"
"didn't get drracket frame back, got: ~s (drs-frame ~s)\n"
new-frame
drs-frame))))))))
(define (set-module-language! [close-dialog? #t])
@ -426,16 +426,16 @@
(let ([new-frame (wait-for-new-frame language-dialog)])
(unless (eq? new-frame drs-frame)
(error 'set-language-level!
"didn't get drscheme frame back, got: ~s (drs-frame ~s)\n"
"didn't get drracket frame back, got: ~s (drs-frame ~s)\n"
new-frame
drs-frame)))))))
(provide/contract [check-language-level ((or/c string? regexp?) . -> . void?)])
;; checks that the language in the drscheme window is set to the given one.
;; checks that the language in the drracket window is set to the given one.
;; clears the definitions, clicks execute and checks the interactions window.
(define (check-language-level lang-spec)
(not-on-eventspace-handler-thread 'check-language-level!)
(let* ([drs-frame (wait-for-drscheme-frame)]
(let* ([drs-frame (wait-for-drracket-frame)]
[interactions (send drs-frame get-interactions-text)]
[definitions-canvas (send drs-frame get-definitions-canvas)])
(fw:test:new-window definitions-canvas)
@ -454,7 +454,7 @@
(define (repl-in-edit-sequence?)
(not-on-eventspace-handler-thread 'repl-in-edit-sequence?)
(let ([drr (wait-for-drscheme-frame)])
(let ([drr (wait-for-drracket-frame)])
(queue-callback/res
(λ ()
(send (send drr get-interactions-text) refresh-delayed?)))))
@ -466,7 +466,7 @@
(not-on-eventspace-handler-thread 'repl-in-edit-sequence?)
(run-one/sync
(lambda ()
(verify-drscheme-frame-frontmost 'had-error? frame)
(verify-drracket-frame-frontmost 'had-error? frame)
(let* ([interactions-text (send frame get-interactions-text)]
[last-para (send interactions-text last-paragraph)])
(unless (>= last-para 2)
@ -508,7 +508,7 @@
(not-on-eventspace-handler-thread 'fetch-output)
(run-one/sync
(lambda ()
(verify-drscheme-frame-frontmost 'fetch-output frame)
(verify-drracket-frame-frontmost 'fetch-output frame)
(let-values ([(start end)
(if (and _start _end)
(values _start _end)
@ -594,8 +594,8 @@
;; but just to print and return.
(define orig-display-handler (error-display-handler))
(define (fire-up-drscheme-and-run-tests #:use-focus-table? [use-focus-table? #t] run-test)
(on-eventspace-handler-thread 'fire-up-drscheme-and-run-tests)
(define (fire-up-drracket-and-run-tests #:use-focus-table? [use-focus-table? #t] run-test)
(on-eventspace-handler-thread 'fire-up-drracket-and-run-tests)
(let ()
;; change the preferences system so that it doesn't write to
;; a file; partly to avoid problems of concurrency in drdr
@ -614,7 +614,7 @@
;; set all preferences to their defaults (some pref values may have
;; been read by this point, but hopefully that won't affect much
;; of the startup of drscheme)
;; of the startup of drracket)
(fw:preferences:restore-defaults)
(fw:test:use-focus-table use-focus-table?)

View File

@ -149,7 +149,7 @@
(define definitions-text 'not-yet-definitions-text)
(define (run-test)
(set! drs (wait-for-drscheme-frame))
(set! drs (wait-for-drracket-frame))
(set! interactions-text (send drs get-interactions-text))
(set! definitions-text (send drs get-definitions-text))
(init-temp-files)

View File

@ -1096,7 +1096,7 @@ This produces an ACK message
(define (run-test which-tests)
(define drscheme-frame (wait-for-drscheme-frame))
(define drscheme-frame (wait-for-drracket-frame))
(define interactions-text (queue-callback/res (λ () (send drscheme-frame get-interactions-text))))
(define interactions-canvas (queue-callback/res (λ () (send drscheme-frame get-interactions-canvas))))
@ -1160,7 +1160,7 @@ This produces an ACK message
; load contents of test-file into the REPL, recording
; the start and end positions of the text
(wait-for-drscheme-frame)
(wait-for-drracket-frame)
(cond
[(string? program)
@ -1458,7 +1458,7 @@ This produces an ACK message
(when (file-exists? tmp-load-filename)
(delete-file tmp-load-filename))
(save-drscheme-window-as tmp-load-filename)
(save-drracket-window-as tmp-load-filename)
;; the debug and debug/profile tests should not differ in their output
;; they are both run here because debug uses the automatic-compilation

View File

@ -55,9 +55,9 @@
[((COMPILER : compiler^)) compiler@ COMPILER-OPTION DYNEXT-FILE DYNEXT-COMPILE DYNEXT-LINK]
[() setup@ LAUNCHER OPTIONS COMPILER-OPTION COMPILER DYNEXT-FILE])))))
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(define drs (wait-for-drscheme-frame))
(define drs (wait-for-drracket-frame))
(queue-callback/res (λ () (send (send drs get-definitions-canvas) focus)))
(for ([x (in-string "egg\r1\r2\r3")])
;; need #\r to actually get newlines in the editor

View File

@ -1,4 +1,4 @@
#lang racket/base
(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
(fire-up-drscheme-and-run-tests (λ () (run-test '(debug))))
(fire-up-drracket-and-run-tests (λ () (run-test '(debug))))

View File

@ -1,4 +1,4 @@
#lang racket/base
(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
(fire-up-drscheme-and-run-tests (λ () (run-test '(debug/profile))))
(fire-up-drracket-and-run-tests (λ () (run-test '(debug/profile))))

View File

@ -1,4 +1,4 @@
#lang racket/base
(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
(fire-up-drscheme-and-run-tests (λ () (run-test '(misc))))
(fire-up-drracket-and-run-tests (λ () (run-test '(misc))))

View File

@ -1,4 +1,4 @@
#lang racket/base
(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
(fire-up-drscheme-and-run-tests (λ () (run-test '(raw))))
(fire-up-drracket-and-run-tests (λ () (run-test '(raw))))

View File

@ -38,7 +38,7 @@
[language (section->language section)]
[errors-ok? (car toc-entry)]
[teachpacks (cadr toc-entry)])
(let* ([drs-frame (wait-for-drscheme-frame)]
(let* ([drs-frame (wait-for-drracket-frame)]
[definitions-text (send drs-frame get-definitions-text)]
[interactions-text (send drs-frame get-interactions-text)])
@ -115,7 +115,7 @@
"Evaluation Terminated"))))])
(poll-until wait-for-kill-window)
(fw:test:button-push "OK")
(wait-for-drscheme-frame #f)
(wait-for-drracket-frame #f)
(printf "killed\n"))))
(check-for-red-text filename drs-frame)

View File

@ -372,7 +372,7 @@
;; executes each of the steps in DrRacket and raises
;; an exception if something doesn't match up.
(define (check-steps program steps)
(let* ([drs-frame (wait-for-drscheme-frame)]
(let* ([drs-frame (wait-for-drracket-frame)]
[defs-text (send drs-frame get-definitions-text)])
(let loop ([last-results #f]
[steps steps])
@ -483,7 +483,7 @@
;; step-and-extract-program : program-spec -> (listof step)
(define (step-and-extract-program program)
(let ([drs-frame (wait-for-drscheme-frame)])
(let ([drs-frame (wait-for-drracket-frame)])
(clear-definitions drs-frame)
(set-definitions-to-program drs-frame program)
(let* ([stepper-frame (start-stepper drs-frame)]

View File

@ -5,9 +5,9 @@
framework)
(define (main)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(let ([drs (wait-for-drscheme-frame)])
(let ([drs (wait-for-drracket-frame)])
(set-module-language!)
(do-execute drs)
(queue-callback/res

View File

@ -1039,9 +1039,9 @@ trigger runtime errors in check syntax.
(define (main)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(let ([drs (wait-for-drscheme-frame)])
(let ([drs (wait-for-drracket-frame)])
;(set-language-level! (list "Pretty Big"))
(begin
(set-language-level! (list "Pretty Big") #f)
@ -1081,7 +1081,7 @@ trigger runtime errors in check syntax.
(define ((run-one-test save-dir) test)
(set! total-tests-run (+ total-tests-run 1))
(let* ([drs (wait-for-drscheme-frame)]
(let* ([drs (wait-for-drracket-frame)]
[defs (queue-callback/res (λ () (send drs get-definitions-text)))])
(clear-definitions drs)
(cond

View File

@ -80,9 +80,9 @@
(define (find-uncovered-text string/style-desc)
(map car (filter is-uncovered? string/style-desc)))
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(let* ([drr-frame (wait-for-drscheme-frame)]
(let* ([drr-frame (wait-for-drracket-frame)]
[definitions-text (send drr-frame get-definitions-text)]
[interactions-text (send drr-frame get-interactions-text)])

View File

@ -7,9 +7,9 @@
(require tests/drracket/private/drracket-test-util)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(let* ([drr-frame (wait-for-drscheme-frame)]
(let* ([drr-frame (wait-for-drracket-frame)]
[fn (make-temporary-file "save-teaching-lang-test~a")])
(test:menu-select "File" "New Tab")

View File

@ -32,10 +32,10 @@ Of course, other (similar) things can go wrong, too.
(define first-line-output (format "All ~a tests passed!" (length things-to-try)))
(define (go)
(fire-up-drscheme-and-run-tests
(fire-up-drracket-and-run-tests
(λ ()
(putenv "PLTDRHTDPNOCOMPILED" "yes")
(define drs-frame (wait-for-drscheme-frame))
(define drs-frame (wait-for-drracket-frame))
(set-language-level! '("How to Design Programs" "Beginning Student"))
(clear-definitions drs-frame)
(for ([exp (in-list things-to-try)])

View File

@ -252,10 +252,10 @@
[else #f])))
(define (run-test)
(set! drs-frame (wait-for-drscheme-frame))
(set! drs-frame (wait-for-drracket-frame))
(set! interactions-text (send drs-frame get-interactions-text))
;(good-tests)
;(bad-tests)
(test-built-in-teachpacks))
(fire-up-drscheme-and-run-tests run-test)
(fire-up-drracket-and-run-tests run-test)

View File

@ -214,7 +214,7 @@
(common-signatures-DMdA)))
(define (prepare-for-test-expression)
(let ([drs (wait-for-drscheme-frame)])
(let ([drs (wait-for-drracket-frame)])
(clear-definitions drs)
(set-language #t)
(sleep 1) ;; this shouldn't be neccessary....
@ -353,7 +353,7 @@
#:signature-violations-expected (signature-violations-expected '())
#:repl-check-failures-expected (repl-check-failures-expected '())
#:repl-signature-violations-expected (repl-signature-violations-expected '()))
(let* ([drs (wait-for-drscheme-frame)]
(let* ([drs (wait-for-drracket-frame)]
[interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))]
[definitions-text (queue-callback/res (λ () (send drs get-definitions-text)))]
[handle-definition-insertion
@ -460,7 +460,7 @@
(append check-failures-expected repl-check-failures-expected))))
(define (test-disabling-tests)
(define drs (wait-for-drscheme-frame))
(define drs (wait-for-drracket-frame))
(parameterize ([language (list "How to Design Programs" #rx"Beginning Student(;|$)")])
(prepare-for-test-expression)
@ -495,4 +495,4 @@
(go DMdA-advanced)
(go test-disabling-tests))
(fire-up-drscheme-and-run-tests run-test)
(fire-up-drracket-and-run-tests run-test)