adjust tests for the new language dialog

(the names of the textbooks are no longer explicit
in the hierarchy of the languages so just specify
"Beginning Student", for example)
This commit is contained in:
Robby Findler 2012-11-03 15:49:33 -05:00
parent 77fb5ec69d
commit 4669b6bfed
9 changed files with 30 additions and 34 deletions

View File

@ -8,7 +8,7 @@
(define drs (wait-for-drracket-frame)) (define drs (wait-for-drracket-frame))
(define defs (send drs get-definitions-text)) (define defs (send drs get-definitions-text))
(define rep (send drs get-interactions-text)) (define rep (send drs get-interactions-text))
(set-language-level! (list #rx"How to Design Programs" #rx"Beginning Student$")) (set-language-level! (list #rx"Beginning Student$"))
(run-one/sync (run-one/sync
(lambda () (lambda ()
(send defs load-file (collection-file-path "hangman1.rkt" "htdp" "tests")))) (send defs load-file (collection-file-path "hangman1.rkt" "htdp" "tests"))))

View File

@ -364,7 +364,7 @@ the settings above should match r5rs
; ;;;;; ; ;;;;;
(define (beginner) (define (beginner)
(parameterize ([language (list "How to Design Programs" #rx"Beginning Student(;|$)")]) (parameterize ([language (list #rx"Beginning Student(;|$)")])
(check-top-of-repl) (check-top-of-repl)
(generic-settings #t) (generic-settings #t)
(generic-output #f #f #f #f) (generic-output #f #f #f #f)
@ -514,8 +514,7 @@ the settings above should match r5rs
(define (beginner/abbrev) (define (beginner/abbrev)
(parameterize ([language (list "How to Design Programs" (parameterize ([language (list #rx"Beginning Student with List Abbreviations(;|$)")])
#rx"Beginning Student with List Abbreviations(;|$)")])
(check-top-of-repl) (check-top-of-repl)
(generic-settings #t) (generic-settings #t)
@ -665,7 +664,7 @@ the settings above should match r5rs
(define (intermediate) (define (intermediate)
(parameterize ([language (list "How to Design Programs" #rx"Intermediate Student(;|$)")]) (parameterize ([language (list #rx"Intermediate Student(;|$)")])
(check-top-of-repl) (check-top-of-repl)
(generic-settings #t) (generic-settings #t)
@ -812,8 +811,7 @@ the settings above should match r5rs
(define (intermediate/lambda) (define (intermediate/lambda)
(parameterize ([language (list "How to Design Programs" (parameterize ([language (list #rx"Intermediate Student with lambda(;|$)")])
#rx"Intermediate Student with lambda(;|$)")])
(check-top-of-repl) (check-top-of-repl)
(generic-settings #t) (generic-settings #t)
@ -955,7 +953,7 @@ the settings above should match r5rs
(define (advanced) (define (advanced)
(parameterize ([language (list "How to Design Programs" #rx"Advanced Student(;|$)")]) (parameterize ([language (list #rx"Advanced Student(;|$)")])
(check-top-of-repl) (check-top-of-repl)
(generic-settings #t) (generic-settings #t)

View File

@ -13,10 +13,10 @@
(define (section->language section) (define (section->language section)
(cond (cond
[(section . <= . 12) '("How to Design Programs" "Beginning Student")] [(section . <= . 12) '("Beginning Student")]
[(section . <= . 19) '("How to Design Programs" "Intermediate Student")] [(section . <= . 19) '("Intermediate Student")]
[(section . <= . 29) '("How to Design Programs" "Intermediate Student with lambda")] [(section . <= . 29) '("Intermediate Student with lambda")]
[else '("How to Design Programs" "Advanced Student")])) [else '("Advanced Student")]))
(define default-toc-entry '(#f ())) (define default-toc-entry '(#f ()))

View File

@ -32,7 +32,7 @@
(run-fully-specified-tests) (run-fully-specified-tests)
#| #|
(set-language-level! (list "How to Design Programs" "Beginning Student with List Abbreviations")) (set-language-level! (list "Beginning Student with List Abbreviations"))
(run-string-test "(define (f x) (* x 2))\n(+ 1 (f (+ 1 1)))") (run-string-test "(define (f x) (* x 2))\n(+ 1 (f (+ 1 1)))")
(run-string-test "(sqrt 2)") (run-string-test "(sqrt 2)")
(run-string-test "(car)") (run-string-test "(car)")
@ -42,12 +42,12 @@
) )
(define (run-fully-specified-tests) (define (run-fully-specified-tests)
(set-language-level! (list "How to Design Programs" "Beginning Student")) (set-language-level! (list "Beginning Student"))
(beginner-tests/no-list) (beginner-tests/no-list)
(test-transcript '(cons 1 (cons 2 (list 3 4 5))) (test-transcript '(cons 1 (cons 2 (list 3 4 5)))
'(cons 1 (cons 2 (cons 3 (cons 4 (cons 5 empty)))))) '(cons 1 (cons 2 (cons 3 (cons 4 (cons 5 empty))))))
(set-language-level! (list "How to Design Programs" "Beginning Student with List Abbreviations")) (set-language-level! (list "Beginning Student with List Abbreviations"))
(beginner-tests/no-list) (beginner-tests/no-list)
(test-transcript '(cons 1 (cons 2 (list 3 4 5))) (test-transcript '(cons 1 (cons 2 (list 3 4 5)))
'(cons 1 (list 2 3 4 5)) '(cons 1 (list 2 3 4 5))

View File

@ -96,7 +96,7 @@
(object-name this-lang)))]) (object-name this-lang)))])
(unless same-last-time? (unless same-last-time?
(set! last-lang this-lang) (set! last-lang this-lang)
(set-language-level! (list #rx"How to Design Programs" this-lang)))) (set-language-level! (list this-lang))))
(clear-definitions drr-frame) (clear-definitions drr-frame)
(insert-in-definitions drr-frame (test-program t)) (insert-in-definitions drr-frame (test-program t))

View File

@ -16,7 +16,7 @@
(let ([definitions-text (send drr-frame get-definitions-text)] (let ([definitions-text (send drr-frame get-definitions-text)]
[interactions-text (send drr-frame get-interactions-text)]) [interactions-text (send drr-frame get-interactions-text)])
(set-language-level! (list #rx"How to Design Programs" #rx"Beginning Student$")) (set-language-level! (list #rx"Beginning Student$"))
(clear-definitions drr-frame) (clear-definitions drr-frame)
(queue-callback/res (queue-callback/res
(λ () (λ ()

View File

@ -36,7 +36,7 @@ Of course, other (similar) things can go wrong, too.
(λ () (λ ()
(putenv "PLTDRHTDPNOCOMPILED" "yes") (putenv "PLTDRHTDPNOCOMPILED" "yes")
(define drs-frame (wait-for-drracket-frame)) (define drs-frame (wait-for-drracket-frame))
(set-language-level! '("How to Design Programs" "Beginning Student")) (set-language-level! '("Beginning Student"))
(clear-definitions drs-frame) (clear-definitions drs-frame)
(for ([exp (in-list things-to-try)]) (for ([exp (in-list things-to-try)])
(insert-in-definitions drs-frame (format "~s\n" exp))) (insert-in-definitions drs-frame (format "~s\n" exp)))

View File

@ -158,12 +158,12 @@
"3")) "3"))
(define (good-tests) (define (good-tests)
(set-language-level! '("How to Design Programs" "Beginning Student")) (set-language-level! '("Beginning Student"))
(do-execute drs-frame) (do-execute drs-frame)
(generic-tests)) (generic-tests))
(define (bad-tests) (define (bad-tests)
(set-language-level! '("How to Design Programs" "Beginning Student")) (set-language-level! '("Beginning Student"))
(test-bad/execute-teachpack (test-bad/execute-teachpack
"undefined-id" "undefined-id"
@ -218,7 +218,7 @@
(directory-list dir))) (directory-list dir)))
paths))] paths))]
[teachpack-dir (normalize-path (collection-path "teachpack"))]) [teachpack-dir (normalize-path (collection-path "teachpack"))])
(set-language-level! '("How to Design Programs" "Advanced Student")) (set-language-level! '("Advanced Student"))
(do-execute drs-frame) (do-execute drs-frame)
(test-teachpacks (list (build-path teachpack-dir "2htdp") (test-teachpacks (list (build-path teachpack-dir "2htdp")
(build-path teachpack-dir "htdp"))))) (build-path teachpack-dir "htdp")))))

View File

@ -105,7 +105,7 @@
; ;;;;; ; ;;;;;
(define (beginner) (define (beginner)
(parameterize ([language (list "How to Design Programs" #rx"Beginning Student(;|$)")]) (parameterize ([language (list #rx"Beginning Student(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #f))) (common-test-engine #f)))
@ -127,8 +127,7 @@
(define (beginner/abbrev) (define (beginner/abbrev)
(parameterize ([language (list "How to Design Programs" (parameterize ([language (list #rx"Beginning Student with List Abbreviations(;|$)")])
#rx"Beginning Student with List Abbreviations(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #f))) (common-test-engine #f)))
@ -150,7 +149,7 @@
(define (intermediate) (define (intermediate)
(parameterize ([language (list "How to Design Programs" #rx"Intermediate Student(;|$)")]) (parameterize ([language (list #rx"Intermediate Student(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #f))) (common-test-engine #f)))
@ -172,8 +171,7 @@
(define (intermediate/lambda) (define (intermediate/lambda)
(parameterize ([language (list "How to Design Programs" (parameterize ([language (list #rx"Intermediate Student with lambda(;|$)")])
#rx"Intermediate Student with lambda(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #f))) (common-test-engine #f)))
@ -196,32 +194,32 @@
(define (advanced) (define (advanced)
(parameterize ([language (list "How to Design Programs" #rx"Advanced Student(;|$)")]) (parameterize ([language (list #rx"Advanced Student(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #f) (common-test-engine #f)
(common-signatures-*sl))) (common-signatures-*sl)))
(define (DMdA-beginner) (define (DMdA-beginner)
(parameterize ([language (list "DeinProgramm" #rx"Die Macht der Abstraktion - Anfänger(;|$)")]) (parameterize ([language (list #rx"Die Macht der Abstraktion - Anfänger(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #t) (common-test-engine #t)
(common-signatures-DMdA))) (common-signatures-DMdA)))
(define (DMdA-vanilla) (define (DMdA-vanilla)
(parameterize ([language (list "DeinProgramm" #rx"Die Macht der Abstraktion(;|$)")]) (parameterize ([language (list #rx"Die Macht der Abstraktion(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #t) (common-test-engine #t)
(common-signatures-DMdA))) (common-signatures-DMdA)))
(define (DMdA-assignments) (define (DMdA-assignments)
(parameterize ([language (list "DeinProgramm" #rx"Die Macht der Abstraktion mit Zuweisungen(;|$)")]) (parameterize ([language (list #rx"Die Macht der Abstraktion mit Zuweisungen(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #t) (common-test-engine #t)
(common-signatures-DMdA))) (common-signatures-DMdA)))
(define (DMdA-advanced) (define (DMdA-advanced)
(parameterize ([language (list "DeinProgramm" #rx"Die Macht der Abstraktion - fortgeschritten(;|$)")]) (parameterize ([language (list #rx"Die Macht der Abstraktion - fortgeschritten(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(common-test-engine #t) (common-test-engine #t)
(common-signatures-DMdA))) (common-signatures-DMdA)))
@ -487,13 +485,13 @@
(define (test-disabling-tests) (define (test-disabling-tests)
(define drs (wait-for-drracket-frame)) (define drs (wait-for-drracket-frame))
(parameterize ([language (list "How to Design Programs" #rx"Beginning Student(;|$)")]) (parameterize ([language (list #rx"Beginning Student(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(test:menu-select "Racket" "Disable Tests") (test:menu-select "Racket" "Disable Tests")
(test-expression "(check-expect 1 2)" "Tests disabled.") (test-expression "(check-expect 1 2)" "Tests disabled.")
(test:menu-select "Racket" "Enable Tests")) (test:menu-select "Racket" "Enable Tests"))
(parameterize ([language (list "DeinProgramm" #rx"Die Macht der Abstraktion - Anfänger(;|$)")]) (parameterize ([language (list #rx"Die Macht der Abstraktion - Anfänger(;|$)")])
(prepare-for-test-expression) (prepare-for-test-expression)
(test:menu-select "Racket" "Disable Tests") (test:menu-select "Racket" "Disable Tests")
(test-expression "(check-expect 1 2)" "Tests disabled.") (test-expression "(check-expect 1 2)" "Tests disabled.")