diff --git a/collects/2htdp/tests/batch-io.rkt b/collects/2htdp/tests/batch-io.rkt index cbabba4e3c..a44e391b89 100644 --- a/collects/2htdp/tests/batch-io.rkt +++ b/collects/2htdp/tests/batch-io.rkt @@ -1,6 +1,6 @@ #lang scheme/load -(require rktunit) +(require racunit) (require 2htdp/batch-io) (define file "batch-io.txt") diff --git a/collects/2htdp/tests/test-image.rkt b/collects/2htdp/tests/test-image.rkt index b8f8ff5451..e53be1f265 100644 --- a/collects/2htdp/tests/test-image.rkt +++ b/collects/2htdp/tests/test-image.rkt @@ -45,7 +45,7 @@ scheme/math scheme/class scheme/gui/base - rktunit + racunit (prefix-in 1: htdp/image) (only-in lang/htdp-advanced equal~?)) diff --git a/collects/meta/dist-specs.rkt b/collects/meta/dist-specs.rkt index 869ab4223f..90be9f4d58 100644 --- a/collects/meta/dist-specs.rkt +++ b/collects/meta/dist-specs.rkt @@ -662,7 +662,7 @@ mz-extras :+= (- (package: "unstable") ;; -------------------- plai plt-extras :+= (package: "plai/") -plt-extras :+= (package: "rktunit/") +plt-extras :+= (package: "racunit/") plt-extras :+= (package: "schemeunit/") ;; ============================================================================ diff --git a/collects/meta/drdr/pkgs.bak b/collects/meta/drdr/pkgs.bak index 66c34ab0f1..a733b187cd 100644 --- a/collects/meta/drdr/pkgs.bak +++ b/collects/meta/drdr/pkgs.bak @@ -615,26 +615,26 @@ ("schematics" "port.plt" 1 0 #f) ("schematics" "random.plt" 1 0 #f) ("schematics" "sake.plt" 1 0 "4.0") - ("schematics" "rktunit.plt" 3 4 "4.0") - ("schematics" "rktunit.plt" 3 3 "4.0") - ("schematics" "rktunit.plt" 3 2 "4.0") - ("schematics" "rktunit.plt" 3 1 "4.0") - ("schematics" "rktunit.plt" 3 0 "4.0") - ("schematics" "rktunit.plt" 2 11 "4.1.0.3") - ("schematics" "rktunit.plt" 2 10 "369.1") - ("schematics" "rktunit.plt" 2 9 "369.1") - ("schematics" "rktunit.plt" 2 8 "369.1") - ("schematics" "rktunit.plt" 2 7 "369.1") - ("schematics" "rktunit.plt" 2 6 "369.1") - ("schematics" "rktunit.plt" 2 5 "369.1") - ("schematics" "rktunit.plt" 2 4 "369.1") - ("schematics" "rktunit.plt" 2 3 #f) - ("schematics" "rktunit.plt" 2 2 #f) - ("schematics" "rktunit.plt" 2 1 #f) - ("schematics" "rktunit.plt" 2 0 #f) - ("schematics" "rktunit.plt" 1 2 #f) - ("schematics" "rktunit.plt" 1 1 #f) - ("schematics" "rktunit.plt" 1 0 #f) + ("schematics" "racunit.plt" 3 4 "4.0") + ("schematics" "racunit.plt" 3 3 "4.0") + ("schematics" "racunit.plt" 3 2 "4.0") + ("schematics" "racunit.plt" 3 1 "4.0") + ("schematics" "racunit.plt" 3 0 "4.0") + ("schematics" "racunit.plt" 2 11 "4.1.0.3") + ("schematics" "racunit.plt" 2 10 "369.1") + ("schematics" "racunit.plt" 2 9 "369.1") + ("schematics" "racunit.plt" 2 8 "369.1") + ("schematics" "racunit.plt" 2 7 "369.1") + ("schematics" "racunit.plt" 2 6 "369.1") + ("schematics" "racunit.plt" 2 5 "369.1") + ("schematics" "racunit.plt" 2 4 "369.1") + ("schematics" "racunit.plt" 2 3 #f) + ("schematics" "racunit.plt" 2 2 #f) + ("schematics" "racunit.plt" 2 1 #f) + ("schematics" "racunit.plt" 2 0 #f) + ("schematics" "racunit.plt" 1 2 #f) + ("schematics" "racunit.plt" 1 1 #f) + ("schematics" "racunit.plt" 1 0 #f) ("schematics" "si.plt" 1 0 #f) ("schematics" "spgsql.plt" 2 3 "371.3") ("schematics" "spgsql.plt" 2 2 "371.3") diff --git a/collects/meta/props b/collects/meta/props index 5733db644a..58d07ae4da 100644 --- a/collects/meta/props +++ b/collects/meta/props @@ -1126,17 +1126,18 @@ path/s is either such a string or a list of them. "collects/scheme/gui.rkt" drdr:command-line "mred-text -t ~s" "collects/scheme/match" responsible (samth) "collects/scheme/match.rkt" responsible (samth) -"collects/rktunit" responsible (jay noel ryanc) +"collects/racunit" responsible (jay noel ryanc) "collects/schemeunit" responsible (jay) -"collects/rktunit/gui.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" -"collects/rktunit/private/gui" responsible (ryanc) -"collects/rktunit/private/gui/config.rkt" drdr:command-line "mred-text -t ~s" -"collects/rktunit/private/gui/controller.rkt" drdr:command-line "mred-text -t ~s" -"collects/rktunit/private/gui/gui.rkt" drdr:command-line "mred-text -t ~s" -"collects/rktunit/private/gui/model2rml.rkt" drdr:command-line "mred-text -t ~s" -"collects/rktunit/private/gui/rml.rkt" drdr:command-line "mred-text -t ~s" -"collects/rktunit/private/gui/view.rkt" drdr:command-line "mred-text -t ~s" -"collects/rktunit/tool.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" +"collects/schemeunit/gui.rkt" responsible (jay) drdr:command-line "mred-text -t ~s" +"collects/racunit/gui.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" +"collects/racunit/private/gui" responsible (ryanc) +"collects/racunit/private/gui/config.rkt" drdr:command-line "mred-text -t ~s" +"collects/racunit/private/gui/controller.rkt" drdr:command-line "mred-text -t ~s" +"collects/racunit/private/gui/gui.rkt" drdr:command-line "mred-text -t ~s" +"collects/racunit/private/gui/model2rml.rkt" drdr:command-line "mred-text -t ~s" +"collects/racunit/private/gui/rml.rkt" drdr:command-line "mred-text -t ~s" +"collects/racunit/private/gui/view.rkt" drdr:command-line "mred-text -t ~s" +"collects/racunit/tool.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" "collects/scribble/run.rkt" drdr:command-line "mzc ~s" "collects/scribble/tools/drscheme-buttons.rkt" drdr:command-line "mred-text ~s" "collects/scribble/tools/private/mk-drs-bitmaps.rkt" drdr:command-line "mred-text ~s" drdr:timeout 240 @@ -1583,7 +1584,7 @@ path/s is either such a string or a list of them. "collects/tests/planet/examples/dummy-module.rkt" drdr:command-line "" "collects/tests/plot/run-tests.rkt" drdr:command-line "mred-text -t ~s" "collects/tests/run-automated-tests.rkt" drdr:command-line "mzc -k ~s" drdr:timeout 600 -"collects/tests/rktunit" responsible (jay noel) +"collects/tests/racunit" responsible (jay noel) "collects/tests/srfi/1/run-tests.rkt" drdr:command-line "mzscheme -f ~s" "collects/tests/srfi/40/run-tests.rkt" drdr:command-line "mzscheme -f ~s" "collects/tests/srfi/43/run-tests.rkt" drdr:command-line "mzscheme -f ~s" diff --git a/collects/parser-tools/private-lex/error-tests.rkt b/collects/parser-tools/private-lex/error-tests.rkt index 88876985aa..92307f8633 100644 --- a/collects/parser-tools/private-lex/error-tests.rkt +++ b/collects/parser-tools/private-lex/error-tests.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require (for-syntax scheme/base) "../lex.ss" - rktunit) + racunit) (define-syntax (catch-syn-error stx) (syntax-case stx () diff --git a/collects/rktunit/gui.rkt b/collects/racunit/gui.rkt similarity index 84% rename from collects/rktunit/gui.rkt rename to collects/racunit/gui.rkt index 0b57fd641e..8daff1a5a4 100644 --- a/collects/rktunit/gui.rkt +++ b/collects/racunit/gui.rkt @@ -6,7 +6,7 @@ (define (test/gui . tests) (apply (make-gui-runner) tests)) -(define test/c (or/c rktunit-test-case? rktunit-test-suite?)) +(define test/c (or/c racunit-test-case? racunit-test-suite?)) (provide/contract [test/gui diff --git a/collects/rktunit/info.rkt b/collects/racunit/info.rkt similarity index 54% rename from collects/rktunit/info.rkt rename to collects/racunit/info.rkt index 3b9fbfce4a..a12d54d758 100644 --- a/collects/rktunit/info.rkt +++ b/collects/racunit/info.rkt @@ -1,13 +1,13 @@ #lang setup/infotab -(define name "RktUnit") +(define name "RacUnit") -(define blurb '((p "RktUnit is a unit testing framework based on the " +(define blurb '((p "RacUnit is a unit testing framework based on the " " Extreme Programming unit test frameworks"))) -(define scribblings '(("scribblings/rktunit.scrbl" (multi-page) (tool)))) +(define scribblings '(("scribblings/racunit.scrbl" (multi-page) (tool)))) (define tools '[("tool.rkt")]) -(define tool-names '["RktUnit DrRacket integration"]) +(define tool-names '["RacUnit DrRacket integration"]) (define homepage "http://schematics.sourceforge.net/") (define url "http://schematics.sourceforge.net/") diff --git a/collects/rktunit/main.rkt b/collects/racunit/main.rkt similarity index 100% rename from collects/rktunit/main.rkt rename to collects/racunit/main.rkt diff --git a/collects/rktunit/private/base.rkt b/collects/racunit/private/base.rkt similarity index 82% rename from collects/rktunit/private/base.rkt rename to collects/racunit/private/base.rkt index bb87c10134..6809635198 100644 --- a/collects/rktunit/private/base.rkt +++ b/collects/racunit/private/base.rkt @@ -4,10 +4,10 @@ ;; struct test : (define-struct test ()) -;; struct (rktunit-test-case test) : (U string #f) thunk -(define-struct (rktunit-test-case test) (name action) #:transparent) -;; struct (rktunit-test-suite test) : string (fdown fup fhere seed -> (listof test-result)) thunk thunk -(define-struct (rktunit-test-suite test) (name tests before after) #:transparent) +;; struct (racunit-test-case test) : (U string #f) thunk +(define-struct (racunit-test-case test) (name action) #:transparent) +;; struct (racunit-test-suite test) : string (fdown fup fhere seed -> (listof test-result)) thunk thunk +(define-struct (racunit-test-suite test) (name tests before after) #:transparent) ;; struct exn:test exn : () ;; @@ -33,10 +33,10 @@ (define-struct (test-success test-result) (result)) (provide/contract - (struct (rktunit-test-case test) + (struct (racunit-test-case test) ((name (or/c string? false/c)) (action (-> any)))) - (struct (rktunit-test-suite test) + (struct (racunit-test-suite test) ((name string?) (tests procedure?) (before (-> any)) diff --git a/collects/rktunit/private/check-info.rkt b/collects/racunit/private/check-info.rkt similarity index 97% rename from collects/rktunit/private/check-info.rkt rename to collects/racunit/private/check-info.rkt index 3b3ec4e1a5..de98d71bf2 100644 --- a/collects/rktunit/private/check-info.rkt +++ b/collects/racunit/private/check-info.rkt @@ -11,7 +11,7 @@ ;; Infrastructure ---------------------------------------------- ;; The continuation mark under which all check-info is keyed -(define check-info-mark (gensym 'rktunit)) +(define check-info-mark (gensym 'racunit)) ;; (continuation-mark-set -> (listof check-info)) (define (check-info-stack marks) diff --git a/collects/rktunit/private/check.rkt b/collects/racunit/private/check.rkt similarity index 100% rename from collects/rktunit/private/check.rkt rename to collects/racunit/private/check.rkt diff --git a/collects/rktunit/private/counter.rkt b/collects/racunit/private/counter.rkt similarity index 100% rename from collects/rktunit/private/counter.rkt rename to collects/racunit/private/counter.rkt diff --git a/collects/rktunit/private/format.rkt b/collects/racunit/private/format.rkt similarity index 100% rename from collects/rktunit/private/format.rkt rename to collects/racunit/private/format.rkt diff --git a/collects/rktunit/private/gui/cache-box.rkt b/collects/racunit/private/gui/cache-box.rkt similarity index 100% rename from collects/rktunit/private/gui/cache-box.rkt rename to collects/racunit/private/gui/cache-box.rkt diff --git a/collects/rktunit/private/gui/config.rkt b/collects/racunit/private/gui/config.rkt similarity index 78% rename from collects/rktunit/private/gui/config.rkt rename to collects/racunit/private/gui/config.rkt index c0123eecab..1d843d9a79 100644 --- a/collects/rktunit/private/gui/config.rkt +++ b/collects/racunit/private/gui/config.rkt @@ -5,20 +5,20 @@ ;; Frame size preferences -(preferences:set-default 'rktunit:frame:width 400 exact-positive-integer?) -(preferences:set-default 'rktunit:frame:height 400 exact-positive-integer?) -(define pref:width (pref:get/set 'rktunit:frame:width)) -(define pref:height (pref:get/set 'rktunit:frame:height)) +(preferences:set-default 'racunit:frame:width 400 exact-positive-integer?) +(preferences:set-default 'racunit:frame:height 400 exact-positive-integer?) +(define pref:width (pref:get/set 'racunit:frame:width)) +(define pref:height (pref:get/set 'racunit:frame:height)) ;; CONSTANTS ;; Some of these are obsolete, given the preferences above. (define DETAILS-CANVAS-INIT-WIDTH 400) -(define FRAME-LABEL "RktUnit") +(define FRAME-LABEL "RacUnit") (define FRAME-INIT-HEIGHT 400) (define TREE-INIT-WIDTH 240) (define TREE-COLORIZE-CASES #t) -(define DIALOG-ERROR-TITLE "RktUnit: Error") +(define DIALOG-ERROR-TITLE "RacUnit: Error") (define STATUS-SUCCESS 'success) (define STATUS-FAILURE 'failure) (define STATUS-ERROR 'error) diff --git a/collects/rktunit/private/gui/controller.rkt b/collects/racunit/private/gui/controller.rkt similarity index 87% rename from collects/rktunit/private/gui/controller.rkt rename to collects/racunit/private/gui/controller.rkt index edcd4be075..46a08349b3 100644 --- a/collects/rktunit/private/gui/controller.rkt +++ b/collects/racunit/private/gui/controller.rkt @@ -25,18 +25,18 @@ ;; create-model : test suite<%>/#f -> result<%> (define/public (create-model test parent) (define result - (cond [(rktunit-test-case? test) + (cond [(racunit-test-case? test) (new case-result% (controller this) (test test) - (name (or (rktunit-test-case-name test) + (name (or (racunit-test-case-name test) "")) (parent parent))] - [(rktunit-test-suite? test) + [(racunit-test-suite? test) (new suite-result% (controller this) (test test) - (name (or (rktunit-test-suite-name test) + (name (or (racunit-test-suite-name test) "")) (parent parent))])) (send/i view view<%> create-view-link result parent) diff --git a/collects/rktunit/private/gui/drracket-link.rkt b/collects/racunit/private/gui/drracket-link.rkt similarity index 100% rename from collects/rktunit/private/gui/drracket-link.rkt rename to collects/racunit/private/gui/drracket-link.rkt diff --git a/collects/rktunit/private/gui/drracket-ui.rkt b/collects/racunit/private/gui/drracket-ui.rkt similarity index 100% rename from collects/rktunit/private/gui/drracket-ui.rkt rename to collects/racunit/private/gui/drracket-ui.rkt diff --git a/collects/rktunit/private/gui/gui.rkt b/collects/racunit/private/gui/gui.rkt similarity index 95% rename from collects/rktunit/private/gui/gui.rkt rename to collects/racunit/private/gui/gui.rkt index 782875f0e1..e5a5c4178c 100644 --- a/collects/rktunit/private/gui/gui.rkt +++ b/collects/racunit/private/gui/gui.rkt @@ -48,8 +48,8 @@ #| (define/public (run) (let ([custodian (make-custodian)] - [before (rktunit-test-suite-before test)] - [after (rktunit-test-suite-after test)]) + [before (racunit-test-suite-before test)] + [after (racunit-test-suite-after test)]) (parameterize [(current-custodian custodian)] (dynamic-wind before @@ -112,8 +112,8 @@ (call-with-continuation-prompt (lambda () (time-apply run-test-case - (list (rktunit-test-case-name test) - (rktunit-test-case-action test)))))]) + (list (racunit-test-case-name test) + (racunit-test-case-action test)))))]) (values (car results) (list cputime realtime gctime)))) (define (make-output-ports) diff --git a/collects/rktunit/private/gui/gvector.rkt b/collects/racunit/private/gui/gvector.rkt similarity index 100% rename from collects/rktunit/private/gui/gvector.rkt rename to collects/racunit/private/gui/gvector.rkt diff --git a/collects/rktunit/private/gui/interfaces.rkt b/collects/racunit/private/gui/interfaces.rkt similarity index 100% rename from collects/rktunit/private/gui/interfaces.rkt rename to collects/racunit/private/gui/interfaces.rkt diff --git a/collects/rktunit/private/gui/model.rkt b/collects/racunit/private/gui/model.rkt similarity index 100% rename from collects/rktunit/private/gui/model.rkt rename to collects/racunit/private/gui/model.rkt diff --git a/collects/rktunit/private/gui/model2rml.rkt b/collects/racunit/private/gui/model2rml.rkt similarity index 100% rename from collects/rktunit/private/gui/model2rml.rkt rename to collects/racunit/private/gui/model2rml.rkt diff --git a/collects/rktunit/private/gui/output-icon.png b/collects/racunit/private/gui/output-icon.png similarity index 100% rename from collects/rktunit/private/gui/output-icon.png rename to collects/racunit/private/gui/output-icon.png diff --git a/collects/rktunit/private/gui/rml.rkt b/collects/racunit/private/gui/rml.rkt similarity index 96% rename from collects/rktunit/private/gui/rml.rkt rename to collects/racunit/private/gui/rml.rkt index 885958b307..1b2b65b875 100644 --- a/collects/rktunit/private/gui/rml.rkt +++ b/collects/racunit/private/gui/rml.rkt @@ -7,7 +7,7 @@ (provide insert-text ext:text% - rktunit-style-map) + racunit-style-map) ;; insert-text : text% string style-delta% -> void (define (insert-text e text style) @@ -20,7 +20,7 @@ (define ext:text-mixin (mixin (text<%>) () - (init-field (style-map rktunit-style-map)) + (init-field (style-map racunit-style-map)) (inherit last-position change-style set-clickback @@ -139,7 +139,7 @@ [error . ,style:red] [value . ,style:darkblue])) -(define rktunit-styles +(define racunit-styles `([test-unexecuted . ,style:gray] [test-success . ,style:green] [test-failure . ,style:red] @@ -181,7 +181,7 @@ (extend-style-map empty-style-map basic-styles)) -;; rktunit-style-map : style-map<%> -(define rktunit-style-map +;; racunit-style-map : style-map<%> +(define racunit-style-map (extend-style-map basic-style-map - rktunit-styles)) + racunit-styles)) diff --git a/collects/rktunit/private/gui/view.rkt b/collects/racunit/private/gui/view.rkt similarity index 98% rename from collects/rktunit/private/gui/view.rkt rename to collects/racunit/private/gui/view.rkt index 0b840db5f5..e3ab4357c3 100644 --- a/collects/rktunit/private/gui/view.rkt +++ b/collects/racunit/private/gui/view.rkt @@ -13,7 +13,7 @@ (provide make-view-frame view%) -(define style-map rktunit-style-map) +(define style-map racunit-style-map) #| @@ -50,7 +50,7 @@ still be there, just not visible? controller) (super-new) - (define editor (new ext:text% (style-map rktunit-style-map))) + (define editor (new ext:text% (style-map racunit-style-map))) (define renderer (new model-renderer% (controller controller) @@ -146,7 +146,7 @@ still be there, just not visible? ;; If the view-link has not been created, ;; yield until it is. (unless (yield) - (error 'rktunit-gui + (error 'racunit-gui "internal error: no progress waiting for view-link")) (do-model-update model)]))) diff --git a/collects/rktunit/private/hash-monad.rkt b/collects/racunit/private/hash-monad.rkt similarity index 100% rename from collects/rktunit/private/hash-monad.rkt rename to collects/racunit/private/hash-monad.rkt diff --git a/collects/rktunit/private/location.rkt b/collects/racunit/private/location.rkt similarity index 100% rename from collects/rktunit/private/location.rkt rename to collects/racunit/private/location.rkt diff --git a/collects/rktunit/private/monad.rkt b/collects/racunit/private/monad.rkt similarity index 100% rename from collects/rktunit/private/monad.rkt rename to collects/racunit/private/monad.rkt diff --git a/collects/rktunit/private/name-collector.rkt b/collects/racunit/private/name-collector.rkt similarity index 100% rename from collects/rktunit/private/name-collector.rkt rename to collects/racunit/private/name-collector.rkt diff --git a/collects/rktunit/private/result.rkt b/collects/racunit/private/result.rkt similarity index 96% rename from collects/rktunit/private/result.rkt rename to collects/racunit/private/result.rkt index 61a553ffa4..208b39d191 100644 --- a/collects/rktunit/private/result.rkt +++ b/collects/racunit/private/result.rkt @@ -51,12 +51,12 @@ ;; data so FP is a bit ugly]. (define (foldts fdown fup fhere seed test) (cond - ((rktunit-test-case? test) + ((racunit-test-case? test) (fhere test - (rktunit-test-case-name test) - (rktunit-test-case-action test) + (racunit-test-case-name test) + (racunit-test-case-action test) seed)) - ((rktunit-test-suite? test) + ((racunit-test-suite? test) (apply-test-suite test fdown fup fhere seed)) (else (raise diff --git a/collects/rktunit/private/test-case.rkt b/collects/racunit/private/test-case.rkt similarity index 100% rename from collects/rktunit/private/test-case.rkt rename to collects/racunit/private/test-case.rkt diff --git a/collects/rktunit/private/test-suite.rkt b/collects/racunit/private/test-suite.rkt similarity index 86% rename from collects/rktunit/private/test-suite.rkt rename to collects/racunit/private/test-suite.rkt index d59ef78e38..4b3aa1d5b1 100644 --- a/collects/rktunit/private/test-suite.rkt +++ b/collects/racunit/private/test-suite.rkt @@ -27,14 +27,14 @@ (define (test-suite-test-case-around fhere) (lambda (thunk) (let* ([name (current-test-name)] - [test (make-rktunit-test-case name thunk)] + [test (make-racunit-test-case name thunk)] [seed (current-seed)]) (current-seed (fhere test name thunk seed))))) (define (test-suite-check-around fhere) (lambda (thunk) (let* ([name #f] - [test (make-rktunit-test-case name thunk)] + [test (make-racunit-test-case name thunk)] [seed (current-seed)]) (current-seed (fhere test name thunk seed))))) @@ -42,12 +42,12 @@ (define delayed-test-case-around (lambda (thunk) (let ([name (current-test-name)]) - (make-rktunit-test-case name thunk)))) + (make-racunit-test-case name thunk)))) (define delayed-check-around (lambda (thunk) (let ([name #f]) - (make-rktunit-test-case name thunk)))) + (make-racunit-test-case name thunk)))) (define-syntax delay-test (syntax-rules () @@ -58,12 +58,12 @@ test test1 ...)])) (define (apply-test-suite suite fdown fup fhere seed) - (let* ([name (rktunit-test-suite-name suite)] - [tests (rktunit-test-suite-tests suite)] - [before (rktunit-test-suite-before suite)] - [after (rktunit-test-suite-after suite)] + (let* ([name (racunit-test-suite-name suite)] + [tests (racunit-test-suite-tests suite)] + [before (racunit-test-suite-before suite)] + [after (racunit-test-suite-after suite)] [kid-seed (fdown suite name before after seed)] - [kid-seed ((rktunit-test-suite-tests suite) fdown fup fhere kid-seed)]) + [kid-seed ((racunit-test-suite-tests suite) fdown fup fhere kid-seed)]) (fup suite name before after seed kid-seed))) ;; test-suite : name [#:before thunk] [#:after thunk] test ... @@ -84,7 +84,7 @@ [the-tests (lambda (fdown fup fhere seed) (define (run/inner x) - (cond [(rktunit-test-suite? x) + (cond [(racunit-test-suite? x) (current-seed (apply-test-suite x fdown fup fhere (current-seed)))] [(list? x) @@ -103,7 +103,7 @@ [(not (string? the-name)) (raise-type-error 'test-suite "test-suite name as string" the-name)] [else - (make-rktunit-test-suite + (make-racunit-test-suite the-name the-tests before-thunk @@ -138,13 +138,13 @@ (for-each (lambda (t) (cond - [(rktunit-test-suite? t) + [(racunit-test-suite? t) (current-seed (apply-test-suite t fdown fup fhere (current-seed)))] - [(rktunit-test-case? t) + [(racunit-test-case? t) (current-seed (fhere t - (rktunit-test-case-name t) - (rktunit-test-case-action t) + (racunit-test-case-name t) + (racunit-test-case-action t) (current-seed)))] [else (raise @@ -158,7 +158,7 @@ ;; ;; Construct a test suite from a list of tests (define (make-test-suite name #:before [before void-thunk] #:after [after void-thunk] tests) - (make-rktunit-test-suite name + (make-racunit-test-suite name (tests->test-suite-action tests) before after)) diff --git a/collects/rktunit/private/test.rkt b/collects/racunit/private/test.rkt similarity index 93% rename from collects/rktunit/private/test.rkt rename to collects/racunit/private/test.rkt index f6ad6fec2d..0fabb9f3a9 100644 --- a/collects/rktunit/private/test.rkt +++ b/collects/racunit/private/test.rkt @@ -15,8 +15,8 @@ (struct-out test-failure) (struct-out test-error) (struct-out test-success) - (struct-out rktunit-test-case) - (struct-out rktunit-test-suite) + (struct-out racunit-test-case) + (struct-out racunit-test-suite) with-check-info with-check-info* @@ -42,9 +42,9 @@ test-suite make-test-suite delay-test - (rename-out [make-rktunit-test-case make-test-case] - [rktunit-test-case? test-case?] - [rktunit-test-suite? test-suite?]) + (rename-out [make-racunit-test-case make-test-case] + [racunit-test-case? test-case?] + [racunit-test-suite? test-suite?]) define-test-suite define/provide-test-suite diff --git a/collects/rktunit/private/text-ui-util.rkt b/collects/racunit/private/text-ui-util.rkt similarity index 100% rename from collects/rktunit/private/text-ui-util.rkt rename to collects/racunit/private/text-ui-util.rkt diff --git a/collects/rktunit/private/util.rkt b/collects/racunit/private/util.rkt similarity index 100% rename from collects/rktunit/private/util.rkt rename to collects/racunit/private/util.rkt diff --git a/collects/rktunit/scribblings/acknowledgements.scrbl b/collects/racunit/scribblings/acknowledgements.scrbl similarity index 87% rename from collects/rktunit/scribblings/acknowledgements.scrbl rename to collects/racunit/scribblings/acknowledgements.scrbl index 147afc0b73..bdab1093a4 100644 --- a/collects/rktunit/scribblings/acknowledgements.scrbl +++ b/collects/racunit/scribblings/acknowledgements.scrbl @@ -3,7 +3,7 @@ @title{Acknowlegements} -The following people have contributed to RktUnit: +The following people have contributed to RacUnit: @itemize[ @item{Robby Findler pushed me to release version 3} @@ -12,7 +12,7 @@ The following people have contributed to RktUnit: suggested renaming @racket[test/text-ui]} @item{Dave Gurnell reported a bug in check-not-exn and - suggested improvements to RktUnit} + suggested improvements to RacUnit} @item{Danny Yoo reported a bug in and provided a fix for trim-current-directory} @@ -30,7 +30,7 @@ The following people have contributed to RktUnit: @item{Jose A. Ortega Ruiz alerted me a problem in the packaging system and helped fix it.} - @item{Sebastian H. Seidel provided help packaging RktUnit + @item{Sebastian H. Seidel provided help packaging RacUnit into a .plt} @item{Don Blaheta provided the method for grabbing line number diff --git a/collects/rktunit/scribblings/api.scrbl b/collects/racunit/scribblings/api.scrbl similarity index 78% rename from collects/rktunit/scribblings/api.scrbl rename to collects/racunit/scribblings/api.scrbl index 33ef4912a8..f99db734c4 100644 --- a/collects/rktunit/scribblings/api.scrbl +++ b/collects/racunit/scribblings/api.scrbl @@ -1,10 +1,10 @@ #lang scribble/doc @(require "base.rkt") -@title[#:tag "api"]{RktUnit API} +@title[#:tag "api"]{RacUnit API} -@defmodule[rktunit - #:use-sources (rktunit)] +@defmodule[racunit + #:use-sources (racunit)] @include-section["overview.scrbl"] @include-section["check.scrbl"] diff --git a/collects/rktunit/scribblings/base.rkt b/collects/racunit/scribblings/base.rkt similarity index 58% rename from collects/rktunit/scribblings/base.rkt rename to collects/racunit/scribblings/base.rkt index 8189c12769..1fc6e255b0 100644 --- a/collects/rktunit/scribblings/base.rkt +++ b/collects/racunit/scribblings/base.rkt @@ -6,15 +6,15 @@ (for-label scheme/base scheme/contract - rktunit - rktunit/text-ui - rktunit/gui)) + racunit + racunit/text-ui + racunit/gui)) (provide (all-from-out scribble/eval scribble/manual) (for-label (all-from-out scheme/base scheme/contract - rktunit - rktunit/text-ui - rktunit/gui))) + racunit + racunit/text-ui + racunit/gui))) diff --git a/collects/rktunit/scribblings/check.scrbl b/collects/racunit/scribblings/check.scrbl similarity index 99% rename from collects/rktunit/scribblings/check.scrbl rename to collects/racunit/scribblings/check.scrbl index 80de0ae33b..d95924c52d 100644 --- a/collects/rktunit/scribblings/check.scrbl +++ b/collects/racunit/scribblings/check.scrbl @@ -3,7 +3,7 @@ @title{Checks} -Checks are the basic building block of RktUnit. A check +Checks are the basic building block of RacUnit. A check checks some condition. If the condition holds the check evaluates to @racket[#t]. If the condition doesn't hold the check raises an instance of @racket[exn:test:check] with @@ -16,7 +16,7 @@ their arguments. You can use check as first class functions, though you will lose precision in the reported source locations if you do so. -The following are the basic checks RktUnit provides. You +The following are the basic checks RacUnit provides. You can create your own checks using @racket[define-check]. @defproc[(check (op (-> any any any)) diff --git a/collects/rktunit/scribblings/compound-testing.scrbl b/collects/racunit/scribblings/compound-testing.scrbl similarity index 99% rename from collects/rktunit/scribblings/compound-testing.scrbl rename to collects/racunit/scribblings/compound-testing.scrbl index 1879fe71ea..8a0fb71e72 100644 --- a/collects/rktunit/scribblings/compound-testing.scrbl +++ b/collects/racunit/scribblings/compound-testing.scrbl @@ -147,7 +147,7 @@ creates test cases within the suite, with the given names and body expressions. As far I know no-one uses this macro, so it might disappear -in future versions of RktUnit.} +in future versions of RacUnit.} } diff --git a/collects/rktunit/scribblings/control-flow.scrbl b/collects/racunit/scribblings/control-flow.scrbl similarity index 96% rename from collects/rktunit/scribblings/control-flow.scrbl rename to collects/racunit/scribblings/control-flow.scrbl index 68f64cab66..59758d4c17 100644 --- a/collects/rktunit/scribblings/control-flow.scrbl +++ b/collects/racunit/scribblings/control-flow.scrbl @@ -48,5 +48,5 @@ file. The after action deletes it. This somewhat curious macro evaluates the given tests in a context where @racket[current-test-case-around] is parameterized to @racket[test-suite-test-case-around]. This -has been useful in testing RktUnit. It might be useful +has been useful in testing RacUnit. It might be useful for you if you create test cases that create test cases.} diff --git a/collects/rktunit/scribblings/file-test.rkt b/collects/racunit/scribblings/file-test.rkt similarity index 96% rename from collects/rktunit/scribblings/file-test.rkt rename to collects/racunit/scribblings/file-test.rkt index 18413644d1..ce3df2728c 100644 --- a/collects/rktunit/scribblings/file-test.rkt +++ b/collects/racunit/scribblings/file-test.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require rktunit +(require racunit "file.rkt") (check-equal? (my-+ 1 1) 2) diff --git a/collects/rktunit/scribblings/file.rkt b/collects/racunit/scribblings/file.rkt similarity index 100% rename from collects/rktunit/scribblings/file.rkt rename to collects/racunit/scribblings/file.rkt diff --git a/collects/rktunit/scribblings/misc.scrbl b/collects/racunit/scribblings/misc.scrbl similarity index 89% rename from collects/rktunit/scribblings/misc.scrbl rename to collects/racunit/scribblings/misc.scrbl index 264abdf849..64bd792094 100644 --- a/collects/rktunit/scribblings/misc.scrbl +++ b/collects/racunit/scribblings/misc.scrbl @@ -14,8 +14,8 @@ Note that @racket[require/expose] can be a bit fragile, especially when mixed with compiled code. Use at your own risk! } -This example gets @racket[make-failure-test], which is defined in a RktUnit test: +This example gets @racket[make-failure-test], which is defined in a RacUnit test: @racketblock[ -(require/expose rktunit/private/check-test (make-failure-test)) +(require/expose racunit/private/check-test (make-failure-test)) ] diff --git a/collects/rktunit/scribblings/overview.scrbl b/collects/racunit/scribblings/overview.scrbl similarity index 84% rename from collects/rktunit/scribblings/overview.scrbl rename to collects/racunit/scribblings/overview.scrbl index 3d1efa629a..8645271c63 100644 --- a/collects/rktunit/scribblings/overview.scrbl +++ b/collects/racunit/scribblings/overview.scrbl @@ -1,9 +1,9 @@ #lang scribble/doc @(require "base.rkt") -@title{Overview of RktUnit} +@title{Overview of RacUnit} -There are three basic data types in RktUnit: +There are three basic data types in RacUnit: @itemize[ diff --git a/collects/rktunit/scribblings/philosophy.scrbl b/collects/racunit/scribblings/philosophy.scrbl similarity index 84% rename from collects/rktunit/scribblings/philosophy.scrbl rename to collects/racunit/scribblings/philosophy.scrbl index 359e90ed96..bf776e6d4b 100644 --- a/collects/rktunit/scribblings/philosophy.scrbl +++ b/collects/racunit/scribblings/philosophy.scrbl @@ -1,10 +1,10 @@ #lang scribble/doc @(require "base.rkt") -@title[#:tag "philosophy"]{The Philosophy of RktUnit} +@title[#:tag "philosophy"]{The Philosophy of RacUnit} -RktUnit is designed to allow tests to evolve in step with -the evolution of the program under testing. RktUnit +RacUnit is designed to allow tests to evolve in step with +the evolution of the program under testing. RacUnit scales from the unstructed checks suitable for simple programs to the complex structure necessary for large projects. @@ -25,9 +25,9 @@ checking are of the form: (equal? (length '(a b)) 2) ] -RktUnit directly supports this style of testing. A check +RacUnit directly supports this style of testing. A check on its own is a valid test. So the above examples may be -written in RktUnit as: +written in RacUnit as: @racketblock[ (check-equal? (length null) 0) @@ -35,7 +35,7 @@ written in RktUnit as: (check-equal? (length '(a b)) 2) ] -Simple programs now get all the benefits of RktUnit with +Simple programs now get all the benefits of RacUnit with very little overhead. There are limitations to this style of testing that more @@ -45,7 +45,7 @@ it does not make sense to evaluate some expressions if earlier ones have failed. This type of program needs a way to group expressions so that a failure in one group causes evaluation of that group to stop and immediately proceed to -the next group. In RktUnit all that is required is to +the next group. In RacUnit all that is required is to wrap a @racket[test-begin] expression around a group of expressions: @@ -62,7 +62,7 @@ be evaluated. Notice that all the previous tests written in the simple style are still valid. Introducing grouping is a local -change only. This is a key feature of RktUnit's support +change only. This is a key feature of RacUnit's support for the evolution of the program. The programmer may wish to name a group of tests. This is @@ -79,7 +79,7 @@ Most programs will stick with this style. However, programmers writing very complex programs may wish to maintain separate groups of tests for different parts of the program, or run their tests in different ways to the normal -RktUnit manner (for example, test results may be logged +RacUnit manner (for example, test results may be logged for the purpose of improving software quality, or they may be displayed on a website to indicate service quality). For these programmers it is necessary to delay the execution of @@ -104,15 +104,15 @@ outside the suite continue to evaluate as before. @section{Historical Context} Most testing frameworks, including earlier versions of -RktUnit, support only the final form of testing. This is +RacUnit, support only the final form of testing. This is likely due to the influence of the SUnit testing framework, -which is the ancestor of RktUnit and the most widely used +which is the ancestor of RacUnit and the most widely used frameworks in Java, .Net, Python, and Ruby, and many other languages. That this is insufficient for all users is apparent if one considers the proliferation of ``simpler'' testing frameworks in Racket such as SRFI-78, or the practice of beginner programmers. Unfortunately these simpler methods are inadequate for testing larger -systems. To the best of my knowledge RktUnit is the only +systems. To the best of my knowledge RacUnit is the only testing framework that makes a conscious effort to support the testing style of all levels of programmer. diff --git a/collects/rktunit/scribblings/quick-start.scrbl b/collects/racunit/scribblings/quick-start.scrbl similarity index 87% rename from collects/rktunit/scribblings/quick-start.scrbl rename to collects/racunit/scribblings/quick-start.scrbl index 2e0bea8cf6..af4dc31e7c 100644 --- a/collects/rktunit/scribblings/quick-start.scrbl +++ b/collects/racunit/scribblings/quick-start.scrbl @@ -1,7 +1,7 @@ #lang scribble/doc @(require "base.rkt") -@title[#:tag "quick-start"]{Quick Start Guide for RktUnit} +@title[#:tag "quick-start"]{Quick Start Guide for RacUnit} Suppose we have code contained in @tt{file.rkt}, which implements buggy versions of @racket[+] and @racket[-] @@ -24,15 +24,15 @@ racket/base my-*) ] -We want to test this code with RktUnit. We start by +We want to test this code with RacUnit. We start by creating a file called @tt{file-test.rkt} to contain our tests. At the top of @tt{file-test.rkt} we import -RktUnit and @tt{file.rkt}: +RacUnit and @tt{file.rkt}: @racketmod[ racket/base -(require rktunit +(require racunit "file.rkt") ] @@ -43,7 +43,7 @@ Now we add some tests to check our library: (check-equal? (my-* 1 2) 2 "Simple multiplication") ] -This is all it takes to define tests in RktUnit. Now +This is all it takes to define tests in RacUnit. Now evaluate this file and see if the library is correct. Here's the result I get: @@ -63,13 +63,13 @@ expected: 2 The first @racket[#t] indicates the first test passed. The second test failed, as shown by the message. -Requiring RktUnit and writing checks is all you need to +Requiring RacUnit and writing checks is all you need to get started testing, but let's take a little bit more time to look at some features beyond the essentials. Let's say we want to check that a number of properties hold. How do we do this? So far we've only seen checks of a -single expression. In RktUnit a check is always a single +single expression. In RacUnit a check is always a single expression, but we can group checks into units called test cases. Here's a simple test case written using the @racket[test-begin] form: @@ -91,7 +91,7 @@ Evalute this and you should see an error message like: A test ... has a FAILURE name: check-pred -location: (# 14 6 252 22) +location: (# 14 6 252 22) expression: (check-pred even? elt) params: (# 9) -------------------- @@ -147,13 +147,13 @@ tests, allowing you to choose how you run your tests. You might, for example, print the results to the screen or log them to a file. -Let's run our tests, using RktUnit's simple textual user +Let's run our tests, using RacUnit's simple textual user interface (there are fancier interfaces available but this will do for our example). In @tt{file-test.rkt} add the following lines: @racketblock[ - (require rktunit/text-ui) + (require racunit/text-ui) (run-tests file-tests) ] @@ -161,6 +161,6 @@ following lines: Now evaluate the file and you should see similar output again. -These are the basics of RktUnit. Refer to the +These are the basics of RacUnit. Refer to the documentation below for more advanced topics, such as defining your own checks. Have fun! diff --git a/collects/rktunit/scribblings/rktunit.scrbl b/collects/racunit/scribblings/racunit.scrbl similarity index 82% rename from collects/rktunit/scribblings/rktunit.scrbl rename to collects/racunit/scribblings/racunit.scrbl index 0bb06f1332..aa98ed24b1 100644 --- a/collects/rktunit/scribblings/rktunit.scrbl +++ b/collects/racunit/scribblings/racunit.scrbl @@ -1,12 +1,12 @@ #lang scribble/doc @(require "base.rkt") -@title{@bold{RktUnit}: Unit Testing for Racket} +@title{@bold{RacUnit}: Unit Testing for Racket} @author[(author+email "Noel Welsh" "noelwelsh@gmail.com") (author+email "Ryan Culpepper" "ryan_sml@yahoo.com")] -RktUnit is a unit-testing framework for Racket. It +RacUnit is a unit-testing framework for Racket. It is designed to handle the needs of all Racket programmers, from novices to experts. diff --git a/collects/rktunit/scribblings/release-notes.scrbl b/collects/racunit/scribblings/release-notes.scrbl similarity index 95% rename from collects/rktunit/scribblings/release-notes.scrbl rename to collects/racunit/scribblings/release-notes.scrbl index af5b2d5b40..2015dc4822 100644 --- a/collects/rktunit/scribblings/release-notes.scrbl +++ b/collects/racunit/scribblings/release-notes.scrbl @@ -12,7 +12,7 @@ There are also miscellaneous Scribble fixes. @section{Version 3} -This version of RktUnit is largely backwards compatible +This version of RacUnit is largely backwards compatible with version 2 but there are significant changes to the underlying model, justifying incrementing the major version number. These changes are best explained in diff --git a/collects/rktunit/scribblings/running-tests.scrbl b/collects/racunit/scribblings/running-tests.scrbl similarity index 97% rename from collects/rktunit/scribblings/running-tests.scrbl rename to collects/racunit/scribblings/running-tests.scrbl index d8d895abd6..efe32c6da9 100644 --- a/collects/rktunit/scribblings/running-tests.scrbl +++ b/collects/racunit/scribblings/running-tests.scrbl @@ -3,14 +3,14 @@ @title[#:tag "running"]{Programmatically Running Tests and Inspecting Results} -RktUnit provides an API for running tests, from which +RacUnit provides an API for running tests, from which custom UIs can be created. @section{Result Types} @defstruct[(exn:test exn) ()]{ -The base structure for RktUnit exceptions. You should +The base structure for RacUnit exceptions. You should never catch instances of this type, only the subtypes documented below.} @@ -187,7 +187,7 @@ recorded, and so on. To do so the functions that run the test cases need to know what type the test case has, and hence is is necessary to provide this information. -If you've made it this far you truly are a master RktUnit +If you've made it this far you truly are a master RacUnit hacker. As a bonus prize we'll just mention that the code in hash-monad.rkt and monad.rkt might be of interest for constructing user interfaces. The API is still in flux, so diff --git a/collects/rktunit/scribblings/ui.scrbl b/collects/racunit/scribblings/ui.scrbl similarity index 75% rename from collects/rktunit/scribblings/ui.scrbl rename to collects/racunit/scribblings/ui.scrbl index e070e66872..460965d870 100644 --- a/collects/rktunit/scribblings/ui.scrbl +++ b/collects/racunit/scribblings/ui.scrbl @@ -3,13 +3,13 @@ @title[#:tag "ui"]{User Interfaces} -RktUnit provides a textual and a graphical user interface +RacUnit provides a textual and a graphical user interface @section{Textual User Interface} -@defmodule[rktunit/text-ui] +@defmodule[racunit/text-ui] -The textual UI is in the @racketmodname[rktunit/text-ui] module. +The textual UI is in the @racketmodname[racunit/text-ui] module. It is run via the @racket[run-tests] function. @defproc[(run-tests (test (or/c test-case? test-suite?)) @@ -33,15 +33,15 @@ information. @section{Graphical User Interface} -@defmodule[rktunit/gui] +@defmodule[racunit/gui] -RktUnit also provides a GUI test runner, available from the -@racketmodname[rktunit/gui] module. +RacUnit also provides a GUI test runner, available from the +@racketmodname[racunit/gui] module. @defproc[(test/gui [test (or/c test-case? test-suite?)] ...) any]{ -Creates a new RktUnit GUI window and runs each @racket[test]. The +Creates a new RacUnit GUI window and runs each @racket[test]. The GUI is updated as tests complete. } @@ -49,7 +49,7 @@ GUI is updated as tests complete. @defproc[(make-gui-runner) (-> (or/c test-case? test-suite?) ... any)]{ -Creates a new RktUnit GUI window and returns a procedure that, when +Creates a new RacUnit GUI window and returns a procedure that, when applied, runs the given tests and displays the results in the GUI. } diff --git a/collects/rktunit/text-ui.rkt b/collects/racunit/text-ui.rkt similarity index 100% rename from collects/rktunit/text-ui.rkt rename to collects/racunit/text-ui.rkt diff --git a/collects/rktunit/tool.rkt b/collects/racunit/tool.rkt similarity index 97% rename from collects/rktunit/tool.rkt rename to collects/racunit/tool.rkt index a48f63747e..d725be0ee8 100644 --- a/collects/rktunit/tool.rkt +++ b/collects/racunit/tool.rkt @@ -11,7 +11,7 @@ ;; CONSTANTS (define BACKTRACE-NO-MESSAGE "No message.") -(define LINK-MODULE-SPEC 'rktunit/private/gui/drracket-link) +(define LINK-MODULE-SPEC 'racunit/private/gui/drracket-link) (define-namespace-anchor drracket-ns-anchor) diff --git a/collects/schemeunit/gui.rkt b/collects/schemeunit/gui.rkt index 5b3a672d92..bd856a0e35 100644 --- a/collects/schemeunit/gui.rkt +++ b/collects/schemeunit/gui.rkt @@ -1,3 +1,3 @@ #lang racket -(require rktunit/gui) -(provide (all-from-out rktunit/gui)) \ No newline at end of file +(require racunit/gui) +(provide (all-from-out racunit/gui)) diff --git a/collects/schemeunit/main.rkt b/collects/schemeunit/main.rkt index 969fa1a9be..89c8f2ce32 100644 --- a/collects/schemeunit/main.rkt +++ b/collects/schemeunit/main.rkt @@ -1,3 +1,3 @@ #lang racket -(require rktunit) -(provide (all-from-out rktunit)) \ No newline at end of file +(require racunit) +(provide (all-from-out racunit)) diff --git a/collects/schemeunit/text-ui.rkt b/collects/schemeunit/text-ui.rkt index 1ede14a3b2..619faa294a 100644 --- a/collects/schemeunit/text-ui.rkt +++ b/collects/schemeunit/text-ui.rkt @@ -1,3 +1,3 @@ #lang racket -(require rktunit/text-ui) -(provide (all-from-out rktunit/text-ui)) \ No newline at end of file +(require racunit/text-ui) +(provide (all-from-out racunit/text-ui)) diff --git a/collects/scribblings/guide/contracts-examples/1-test.rkt b/collects/scribblings/guide/contracts-examples/1-test.rkt index 05d48e3df2..8e1fe62059 100644 --- a/collects/scribblings/guide/contracts-examples/1-test.rkt +++ b/collects/scribblings/guide/contracts-examples/1-test.rkt @@ -1,5 +1,5 @@ #lang scheme -(require rktunit rktunit/text-ui "1.ss" "1b.ss") +(require racunit racunit/text-ui "1.ss" "1b.ss") (add (make-basic-customer 'mf "matthias" "brookstone")) (add (make-basic-customer 'rf "robby" "beverly hills park")) diff --git a/collects/scribblings/guide/contracts-examples/2-test.rkt b/collects/scribblings/guide/contracts-examples/2-test.rkt index b4e34f6d82..68b5379e97 100644 --- a/collects/scribblings/guide/contracts-examples/2-test.rkt +++ b/collects/scribblings/guide/contracts-examples/2-test.rkt @@ -1,5 +1,5 @@ #lang scheme -(require rktunit rktunit/text-ui "2.ss") +(require racunit racunit/text-ui "2.ss") (define s0 (initialize (flat-contract integer?) =)) (define s2 (push (push s0 2) 1)) diff --git a/collects/scribblings/guide/contracts-examples/3-test.rkt b/collects/scribblings/guide/contracts-examples/3-test.rkt index 6c19e34d87..65752e94fe 100644 --- a/collects/scribblings/guide/contracts-examples/3-test.rkt +++ b/collects/scribblings/guide/contracts-examples/3-test.rkt @@ -1,5 +1,5 @@ #lang scheme -(require rktunit rktunit/text-ui "3.ss") +(require racunit racunit/text-ui "3.ss") (define d0 (initialize (flat-contract integer?) =)) (define d (put (put (put d0 'a 2) 'b 2) 'c 1)) diff --git a/collects/scribblings/guide/contracts-examples/5-test.rkt b/collects/scribblings/guide/contracts-examples/5-test.rkt index 90e36a8fe1..8498c7696a 100644 --- a/collects/scribblings/guide/contracts-examples/5-test.rkt +++ b/collects/scribblings/guide/contracts-examples/5-test.rkt @@ -1,5 +1,5 @@ #lang scheme -(require rktunit rktunit/text-ui "5.ss") +(require racunit racunit/text-ui "5.ss") (define s (put (put (initialize (flat-contract integer?) =) 2) 1)) diff --git a/collects/tests/deinprogramm/contract.rkt b/collects/tests/deinprogramm/contract.rkt index e763ce6222..95519fba1b 100644 --- a/collects/tests/deinprogramm/contract.rkt +++ b/collects/tests/deinprogramm/contract.rkt @@ -2,7 +2,7 @@ (provide all-contract-tests) -(require rktunit +(require racunit deinprogramm/define-record-procedures deinprogramm/contract/contract deinprogramm/contract/contract-syntax) diff --git a/collects/tests/deinprogramm/image.rkt b/collects/tests/deinprogramm/image.rkt index 13a6753ae4..86cd7cea68 100644 --- a/collects/tests/deinprogramm/image.rkt +++ b/collects/tests/deinprogramm/image.rkt @@ -2,7 +2,7 @@ (provide all-image-tests) -(require rktunit +(require racunit deinprogramm/image (only-in lang/private/imageeq image=?) mred diff --git a/collects/tests/deinprogramm/run-contract-tests.rkt b/collects/tests/deinprogramm/run-contract-tests.rkt index c4700c10da..bae75000fc 100644 --- a/collects/tests/deinprogramm/run-contract-tests.rkt +++ b/collects/tests/deinprogramm/run-contract-tests.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require rktunit/text-ui) +(require racunit/text-ui) (require tests/deinprogramm/contract) (run-tests all-contract-tests) diff --git a/collects/tests/deinprogramm/run-image-test.rkt b/collects/tests/deinprogramm/run-image-test.rkt index 333e7095f8..d2d75a6c7d 100644 --- a/collects/tests/deinprogramm/run-image-test.rkt +++ b/collects/tests/deinprogramm/run-image-test.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require rktunit/text-ui) +(require racunit/text-ui) (require tests/deinprogramm/image) (run-tests all-image-tests) diff --git a/collects/tests/eli-tester.rkt b/collects/tests/eli-tester.rkt index b8483977e4..6bb114b90c 100644 --- a/collects/tests/eli-tester.rkt +++ b/collects/tests/eli-tester.rkt @@ -216,7 +216,7 @@ => '(#"1 test passed\n" #"2 tests passed\n") ) -;; RktUnit stuff +;; RacUnit stuff ;; (examples that should fail modified to ones that shouldn't) #| diff --git a/collects/tests/future/future.rkt b/collects/tests/future/future.rkt index 3157c7dd6d..aabc41015d 100644 --- a/collects/tests/future/future.rkt +++ b/collects/tests/future/future.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/future - rktunit) + racunit) #|Need to add expressions which raise exceptions inside a future thunk which can be caught at the touch site diff --git a/collects/tests/html/test.rkt b/collects/tests/html/test.rkt index 0d6f444c41..4981462c61 100644 --- a/collects/tests/html/test.rkt +++ b/collects/tests/html/test.rkt @@ -1,6 +1,6 @@ #lang racket -(require rktunit - rktunit/text-ui +(require racunit + racunit/text-ui net/url (prefix-in h: html) (prefix-in x: xml)) diff --git a/collects/tests/info.rkt b/collects/tests/info.rkt index a9c9912080..a7377f7216 100644 --- a/collects/tests/info.rkt +++ b/collects/tests/info.rkt @@ -21,7 +21,7 @@ "plot" "profj" "r6rs" - "rktunit" + "racunit" "srfi" "srpersist" "stepper" diff --git a/collects/tests/macro-debugger/all-tests.rkt b/collects/tests/macro-debugger/all-tests.rkt index 0d2ece8a7b..577eb8d5e7 100644 --- a/collects/tests/macro-debugger/all-tests.rkt +++ b/collects/tests/macro-debugger/all-tests.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require rktunit - rktunit/gui) +(require racunit + racunit/gui) (require macro-debugger/model/debug "gentest-framework.ss" "gentests.ss" diff --git a/collects/tests/macro-debugger/gentests.rkt b/collects/tests/macro-debugger/gentests.rkt index bcf9c2f47c..55c6e24d2a 100644 --- a/collects/tests/macro-debugger/gentests.rkt +++ b/collects/tests/macro-debugger/gentests.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require rktunit) +(require racunit) (require macro-debugger/model/debug macro-debugger/model/stx-util "gentest-framework.ss" diff --git a/collects/tests/macro-debugger/tests/collects.rkt b/collects/tests/macro-debugger/tests/collects.rkt index ee70b2650a..fff6426ea2 100644 --- a/collects/tests/macro-debugger/tests/collects.rkt +++ b/collects/tests/macro-debugger/tests/collects.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require rktunit - rktunit/gui) +(require racunit + racunit/gui) (require macro-debugger/model/debug scheme/path scheme/gui) diff --git a/collects/tests/macro-debugger/tests/hiding.rkt b/collects/tests/macro-debugger/tests/hiding.rkt index b3f4a54a54..941c093320 100644 --- a/collects/tests/macro-debugger/tests/hiding.rkt +++ b/collects/tests/macro-debugger/tests/hiding.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require rktunit) +(require racunit) (require macro-debugger/model/debug "../test-setup.ss") (provide specialized-hiding-tests) diff --git a/collects/tests/macro-debugger/tests/policy.rkt b/collects/tests/macro-debugger/tests/policy.rkt index 57f6cab63c..757de46997 100644 --- a/collects/tests/macro-debugger/tests/policy.rkt +++ b/collects/tests/macro-debugger/tests/policy.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require rktunit) +(require racunit) (require macro-debugger/model/debug "../test-setup.ss") (provide policy-tests) diff --git a/collects/tests/macro-debugger/tests/regression.rkt b/collects/tests/macro-debugger/tests/regression.rkt index fb0f9d9004..c4c92366b3 100644 --- a/collects/tests/macro-debugger/tests/regression.rkt +++ b/collects/tests/macro-debugger/tests/regression.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require rktunit) +(require racunit) (require macro-debugger/model/debug macro-debugger/model/steps "../test-setup.ss") diff --git a/collects/tests/match/examples.rkt b/collects/tests/match/examples.rkt index 753011c9d6..f8ce7d8c07 100644 --- a/collects/tests/match/examples.rkt +++ b/collects/tests/match/examples.rkt @@ -6,7 +6,7 @@ (for-syntax scheme/base) (prefix-in m: mzlib/match) (only-in srfi/13 string-contains) - rktunit) + racunit) (define-syntax (comp stx) (syntax-case stx () diff --git a/collects/tests/match/match-tests.rkt b/collects/tests/match/match-tests.rkt index a575fb631f..67ac65e00b 100644 --- a/collects/tests/match/match-tests.rkt +++ b/collects/tests/match/match-tests.rkt @@ -1,5 +1,5 @@ (module match-tests mzscheme - (require mzlib/match rktunit) + (require mzlib/match racunit) (provide match-tests) diff --git a/collects/tests/match/other-plt-tests.rkt b/collects/tests/match/other-plt-tests.rkt index 9026ce05f8..1407614be4 100644 --- a/collects/tests/match/other-plt-tests.rkt +++ b/collects/tests/match/other-plt-tests.rkt @@ -1,6 +1,6 @@ (module other-plt-tests mzscheme - (require rktunit net/uri-codec mzlib/pregexp mzlib/plt-match + (require racunit net/uri-codec mzlib/pregexp mzlib/plt-match mzlib/list mzlib/etc) (define-struct shape (color)) diff --git a/collects/tests/match/other-tests.rkt b/collects/tests/match/other-tests.rkt index 27db39ff3a..174b957ccb 100644 --- a/collects/tests/match/other-tests.rkt +++ b/collects/tests/match/other-tests.rkt @@ -1,5 +1,5 @@ (module other-tests mzscheme - (require mzlib/match rktunit) + (require mzlib/match racunit) (provide other-tests) diff --git a/collects/tests/match/plt-match-tests.rkt b/collects/tests/match/plt-match-tests.rkt index c1eb29f9f4..e707ada4ec 100644 --- a/collects/tests/match/plt-match-tests.rkt +++ b/collects/tests/match/plt-match-tests.rkt @@ -2,7 +2,7 @@ (require (for-syntax scheme/base) "match-tests.ss" "other-plt-tests.ss" "other-tests.ss" "examples.ss" - rktunit rktunit/text-ui) + racunit racunit/text-ui) (require mzlib/plt-match) diff --git a/collects/tests/plai/test-random-mutator.rkt b/collects/tests/plai/test-random-mutator.rkt index f5fb8059bc..988d3603d3 100644 --- a/collects/tests/plai/test-random-mutator.rkt +++ b/collects/tests/plai/test-random-mutator.rkt @@ -1,5 +1,5 @@ #lang scheme -(require rktunit +(require racunit plai/random-mutator scheme/runtime-path ;; test find-heap-values and save-random-mutator via the contract'd diff --git a/collects/tests/racket/contract-opt-tests.rkt b/collects/tests/racket/contract-opt-tests.rkt index cdc45afb8f..892e90b0ac 100644 --- a/collects/tests/racket/contract-opt-tests.rkt +++ b/collects/tests/racket/contract-opt-tests.rkt @@ -1,7 +1,7 @@ (module contract-opt-tests mzscheme (require mzlib/contract - rktunit - rktunit/text-ui) + racunit + racunit/text-ui) (define (exn:fail:contract-violation? exn) (if (regexp-match #rx"broke" (exn-message exn)) #t #f)) diff --git a/collects/tests/raclog/bible.rkt b/collects/tests/raclog/bible.rkt index b5ad0ba087..c971222e51 100644 --- a/collects/tests/raclog/bible.rkt +++ b/collects/tests/raclog/bible.rkt @@ -1,7 +1,7 @@ #lang racket (require raclog - rktunit) + racunit) ;The following is the "Biblical" database from "The Art of ;Prolog", Sterling & Shapiro, ch. 1. diff --git a/collects/tests/raclog/england.rkt b/collects/tests/raclog/england.rkt index 0480262a5c..3babf4bbff 100644 --- a/collects/tests/raclog/england.rkt +++ b/collects/tests/raclog/england.rkt @@ -1,7 +1,7 @@ #lang racket (require raclog - rktunit) + racunit) ;The following is a simple database about a certain family in England. ;Should be a piece of cake, but given here so that you can hone diff --git a/collects/tests/raclog/games.rkt b/collects/tests/raclog/games.rkt index 179b53745a..989448057a 100644 --- a/collects/tests/raclog/games.rkt +++ b/collects/tests/raclog/games.rkt @@ -2,7 +2,7 @@ (require raclog "./puzzle.rkt" - rktunit) + racunit) ;;This example is from Sterling & Shapiro, p. 214. ;; diff --git a/collects/tests/rktunit/all-rktunit-tests.rkt b/collects/tests/racunit/all-racunit-tests.rkt similarity index 92% rename from collects/tests/rktunit/all-rktunit-tests.rkt rename to collects/tests/racunit/all-racunit-tests.rkt index baf8d3cb82..2151ae40a8 100644 --- a/collects/tests/rktunit/all-rktunit-tests.rkt +++ b/collects/tests/racunit/all-racunit-tests.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require rktunit +(require racunit "check-test.rkt" "check-info-test.rkt" "format-test.rkt" @@ -17,12 +17,12 @@ "counter-test.rkt" "text-ui-util-test.rkt") -(provide all-rktunit-tests +(provide all-racunit-tests failure-tests) -(define all-rktunit-tests +(define all-racunit-tests (test-suite - "All RktUnit Tests" + "All RacUnit Tests" check-tests base-tests check-info-tests diff --git a/collects/tests/rktunit/base-test.rkt b/collects/tests/racunit/base-test.rkt similarity index 80% rename from collects/tests/rktunit/base-test.rkt rename to collects/tests/racunit/base-test.rkt index 3c81db7019..fe7b256add 100644 --- a/collects/tests/rktunit/base-test.rkt +++ b/collects/tests/racunit/base-test.rkt @@ -28,8 +28,8 @@ #lang racket/base -(require rktunit - rktunit/private/base) +(require racunit + racunit/private/base) (provide base-tests) @@ -37,45 +37,45 @@ (test-suite "All tests for base" (test-case - "rktunit-test-case structure has a contract on name" + "racunit-test-case structure has a contract on name" (check-exn exn:fail? (lambda () - (make-rktunit-test-case + (make-racunit-test-case 'foo (lambda () #t))))) (test-case - "rktunit-test-case structure has a contract on action" + "racunit-test-case structure has a contract on action" (check-exn exn:fail? (lambda () - (make-rktunit-test-case + (make-racunit-test-case "Name" #f)))) (test-case - "rktunit-test-suite has a contract on its fields" + "racunit-test-suite has a contract on its fields" (check-exn exn:fail? (lambda () - (make-rktunit-test-suite + (make-racunit-test-suite #f (list) (lambda () 3) (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-rktunit-test-suite + (make-racunit-test-suite "Name" #f (lambda () 3) (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-rktunit-test-suite + (make-racunit-test-suite "Name" (list) #f (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-rktunit-test-suite + (make-racunit-test-suite "Name" (list) (lambda () 3) diff --git a/collects/tests/rktunit/check-info-test.rkt b/collects/tests/racunit/check-info-test.rkt similarity index 91% rename from collects/tests/rktunit/check-info-test.rkt rename to collects/tests/racunit/check-info-test.rkt index 6cb5a6d3ca..9b0ff44d9b 100644 --- a/collects/tests/rktunit/check-info-test.rkt +++ b/collects/tests/racunit/check-info-test.rkt @@ -4,20 +4,20 @@ ;;; ;;; Copyright (C) 2003 by Noel Welsh. ;;; -;;; This file is part of RktUnit. +;;; This file is part of RacUnit. -;;; RktUnit is free software; you can redistribute it and/or +;;; RacUnit is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Lesser General Public ;;; License as published by the Free Software Foundation; either ;;; version 2.1 of the License, or (at your option) any later version. -;;; RktUnitis distributed in the hope that it will be useful, +;;; RacUnitis distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;; Lesser General Public License for more details. ;;; You should have received a copy of the GNU Lesser General Public -;;; License along with RktUnit; if not, write to the Free Software +;;; License along with RacUnit; if not, write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ;;; Author: Noel Welsh @@ -27,8 +27,8 @@ #lang racket/base -(require rktunit - rktunit/private/check-info) +(require racunit + racunit/private/check-info) (provide check-info-tests) diff --git a/collects/tests/rktunit/check-test.rkt b/collects/tests/racunit/check-test.rkt similarity index 98% rename from collects/tests/rktunit/check-test.rkt rename to collects/tests/racunit/check-test.rkt index fd2029c670..1ca69fc04a 100644 --- a/collects/tests/rktunit/check-test.rkt +++ b/collects/tests/racunit/check-test.rkt @@ -30,10 +30,10 @@ (require racket/runtime-path srfi/1 - rktunit - rktunit/private/check - rktunit/private/result - rktunit/private/test-suite) + racunit + racunit/private/check + racunit/private/result + racunit/private/test-suite) (provide check-tests) @@ -288,7 +288,7 @@ (cns (current-namespace))) (parameterize ((current-namespace destns)) (namespace-require '(for-syntax racket/base)) - (namespace-require 'rktunit/private/check) + (namespace-require 'racunit/private/check) ;; First check that the right check macro got ;; used: ie that it didn't just compile the thing ;; as an application. diff --git a/collects/tests/rktunit/counter-test.rkt b/collects/tests/racunit/counter-test.rkt similarity index 93% rename from collects/tests/rktunit/counter-test.rkt rename to collects/tests/racunit/counter-test.rkt index 516a3911df..2d32f79838 100644 --- a/collects/tests/rktunit/counter-test.rkt +++ b/collects/tests/racunit/counter-test.rkt @@ -28,10 +28,10 @@ #lang racket/base (require racket/match - rktunit - rktunit/private/counter - rktunit/private/monad - rktunit/private/hash-monad) + racunit + racunit/private/counter + racunit/private/monad + racunit/private/hash-monad) (provide counter-tests) diff --git a/collects/tests/rktunit/format-test.rkt b/collects/tests/racunit/format-test.rkt similarity index 87% rename from collects/tests/rktunit/format-test.rkt rename to collects/tests/racunit/format-test.rkt index 9ac98b13c1..6adc10a8b9 100644 --- a/collects/tests/rktunit/format-test.rkt +++ b/collects/tests/racunit/format-test.rkt @@ -1,8 +1,8 @@ #lang racket/base -(require rktunit - rktunit/private/check-info - rktunit/private/format) +(require racunit + racunit/private/check-info + racunit/private/format) (provide format-tests) diff --git a/collects/tests/rktunit/hash-monad-test.rkt b/collects/tests/racunit/hash-monad-test.rkt similarity index 95% rename from collects/tests/rktunit/hash-monad-test.rkt rename to collects/tests/racunit/hash-monad-test.rkt index cb9eecc1a1..63268021cd 100644 --- a/collects/tests/rktunit/hash-monad-test.rkt +++ b/collects/tests/racunit/hash-monad-test.rkt @@ -28,9 +28,9 @@ #lang racket/base -(require rktunit - rktunit/private/monad - rktunit/private/hash-monad) +(require racunit + racunit/private/monad + racunit/private/hash-monad) (provide hash-monad-tests) diff --git a/collects/tests/rktunit/location-test.rkt b/collects/tests/racunit/location-test.rkt similarity index 98% rename from collects/tests/rktunit/location-test.rkt rename to collects/tests/racunit/location-test.rkt index 22ebbc2500..35740c696b 100644 --- a/collects/tests/rktunit/location-test.rkt +++ b/collects/tests/racunit/location-test.rkt @@ -27,8 +27,8 @@ ;; Commentary: #lang racket/base -(require rktunit - rktunit/private/location) +(require racunit + racunit/private/location) (provide location-tests) diff --git a/collects/tests/rktunit/monad-test.rkt b/collects/tests/racunit/monad-test.rkt similarity index 98% rename from collects/tests/rktunit/monad-test.rkt rename to collects/tests/racunit/monad-test.rkt index 7aeaa5b959..0672e878c6 100644 --- a/collects/tests/rktunit/monad-test.rkt +++ b/collects/tests/racunit/monad-test.rkt @@ -29,8 +29,8 @@ #lang racket/base -(require rktunit - rktunit/private/monad) +(require racunit + racunit/private/monad) (provide monad-tests) diff --git a/collects/tests/rktunit/result-test.rkt b/collects/tests/racunit/result-test.rkt similarity index 95% rename from collects/tests/rktunit/result-test.rkt rename to collects/tests/racunit/result-test.rkt index a8534c1630..a633fb40d9 100644 --- a/collects/tests/rktunit/result-test.rkt +++ b/collects/tests/racunit/result-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require rktunit - rktunit/private/result) +(require racunit + racunit/private/result) (provide result-tests) diff --git a/collects/tests/rktunit/run-tests.rkt b/collects/tests/racunit/run-tests.rkt similarity index 74% rename from collects/tests/rktunit/run-tests.rkt rename to collects/tests/racunit/run-tests.rkt index 66f89fd7e6..45c8ccc74e 100644 --- a/collects/tests/rktunit/run-tests.rkt +++ b/collects/tests/racunit/run-tests.rkt @@ -1,10 +1,10 @@ #lang racket/base -(require rktunit - rktunit/text-ui - "all-rktunit-tests.rkt") +(require racunit + racunit/text-ui + "all-racunit-tests.rkt") -(run-tests all-rktunit-tests) +(run-tests all-racunit-tests) ;; These tests should all error, so we switch the meaning of correct and incorrect. If the error display changes significantly, DrDr will catch it (parameterize ([current-error-port (current-output-port)] diff --git a/collects/tests/rktunit/standalone-check-test.rkt b/collects/tests/racunit/standalone-check-test.rkt similarity index 98% rename from collects/tests/rktunit/standalone-check-test.rkt rename to collects/tests/racunit/standalone-check-test.rkt index 9c6615a2d2..454bfe9bf9 100644 --- a/collects/tests/rktunit/standalone-check-test.rkt +++ b/collects/tests/racunit/standalone-check-test.rkt @@ -31,7 +31,7 @@ #lang racket/base -(require rktunit/private/check) +(require racunit/private/check) ;; This check should succeed (check = 1 1 0.0) diff --git a/collects/tests/rktunit/standalone-test-case-test.rkt b/collects/tests/racunit/standalone-test-case-test.rkt similarity index 88% rename from collects/tests/rktunit/standalone-test-case-test.rkt rename to collects/tests/racunit/standalone-test-case-test.rkt index 816f082682..018bd46ece 100644 --- a/collects/tests/rktunit/standalone-test-case-test.rkt +++ b/collects/tests/racunit/standalone-test-case-test.rkt @@ -4,8 +4,8 @@ #lang racket/base -(require rktunit/private/check - rktunit/private/test-case) +(require racunit/private/check + racunit/private/test-case) ;; These tests should succeeds (test-begin (check-eq? 1 1)) diff --git a/collects/tests/rktunit/test-case-test.rkt b/collects/tests/racunit/test-case-test.rkt similarity index 86% rename from collects/tests/rktunit/test-case-test.rkt rename to collects/tests/racunit/test-case-test.rkt index 66fed4c00b..07ca05fd6e 100644 --- a/collects/tests/rktunit/test-case-test.rkt +++ b/collects/tests/racunit/test-case-test.rkt @@ -1,10 +1,10 @@ #lang racket/base -(require rktunit/private/base - rktunit/private/check - rktunit/private/test-case - rktunit/private/test-suite - rktunit/private/result) +(require racunit/private/base + racunit/private/check + racunit/private/test-case + racunit/private/test-suite + racunit/private/result) (provide test-case-tests) diff --git a/collects/tests/rktunit/test-suite-test.rkt b/collects/tests/racunit/test-suite-test.rkt similarity index 97% rename from collects/tests/rktunit/test-suite-test.rkt rename to collects/tests/racunit/test-suite-test.rkt index de7dd5511a..0d1ed9d446 100644 --- a/collects/tests/rktunit/test-suite-test.rkt +++ b/collects/tests/racunit/test-suite-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require rktunit - rktunit/private/check) +(require racunit + racunit/private/check) (define run? #f) diff --git a/collects/tests/rktunit/test-test.rkt b/collects/tests/racunit/test-test.rkt similarity index 98% rename from collects/tests/rktunit/test-test.rkt rename to collects/tests/racunit/test-test.rkt index f83dd15589..148a6856bc 100644 --- a/collects/tests/rktunit/test-test.rkt +++ b/collects/tests/racunit/test-test.rkt @@ -4,9 +4,9 @@ racket/runtime-path srfi/1 srfi/13 - rktunit - rktunit/private/util - rktunit/private/location) + racunit + racunit/private/util + racunit/private/location) (provide test-tests) @@ -43,7 +43,7 @@ (let ((destns (make-base-namespace)) (cns (current-namespace))) (parameterize ((current-namespace destns)) - (namespace-require 'rktunit) + (namespace-require 'racunit) (check-exn (lambda (e) (check-pred exn:fail:syntax? e) (check string-contains (exn-message e) msg)) diff --git a/collects/tests/rktunit/text-ui-test.rkt b/collects/tests/racunit/text-ui-test.rkt similarity index 95% rename from collects/tests/rktunit/text-ui-test.rkt rename to collects/tests/racunit/text-ui-test.rkt index 1d9a0d95a3..d8766dd859 100644 --- a/collects/tests/rktunit/text-ui-test.rkt +++ b/collects/tests/racunit/text-ui-test.rkt @@ -33,8 +33,8 @@ racket/port srfi/1 srfi/13 - rktunit - rktunit/text-ui) + racunit + racunit/text-ui) (provide text-ui-tests) @@ -119,9 +119,9 @@ (with-all-output-to-string (failing-binary-test/complex-params)))]) (check string-contains op - "(`(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) + "`((0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) (test-case "Non-binary check output is pretty printed" @@ -129,9 +129,9 @@ (with-all-output-to-string (failing-test/complex-params)))]) (check string-contains op - "(`(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) + "`((0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) (test-case "Location trimmed when file is under current directory" diff --git a/collects/tests/rktunit/text-ui-util-test.rkt b/collects/tests/racunit/text-ui-util-test.rkt similarity index 96% rename from collects/tests/rktunit/text-ui-util-test.rkt rename to collects/tests/racunit/text-ui-util-test.rkt index 2cb1362eb8..931845fd6b 100644 --- a/collects/tests/rktunit/text-ui-util-test.rkt +++ b/collects/tests/racunit/text-ui-util-test.rkt @@ -27,8 +27,8 @@ ;; Commentary: #lang racket/base -(require rktunit - rktunit/private/text-ui-util) +(require racunit + racunit/private/text-ui-util) (provide text-ui-util-tests) diff --git a/collects/tests/rktunit/util-test.rkt b/collects/tests/racunit/util-test.rkt similarity index 94% rename from collects/tests/rktunit/util-test.rkt rename to collects/tests/racunit/util-test.rkt index b1c534592b..bc054ccb13 100644 --- a/collects/tests/rktunit/util-test.rkt +++ b/collects/tests/racunit/util-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require rktunit - rktunit/private/util) +(require racunit + racunit/private/util) (provide util-tests) @@ -21,7 +21,7 @@ (check-true (procedure? make-failure-test)) (check-equal? (make-arity-at-least 2) (procedure-arity make-failure-test)) - (check-pred rktunit-test-case? + (check-pred racunit-test-case? (delay-test (make-failure-test "foo" string?))))) (test-case diff --git a/collects/tests/srfi/1/alist-test.rkt b/collects/tests/srfi/1/alist-test.rkt index 6d6277e4bb..bf9fb7aaca 100644 --- a/collects/tests/srfi/1/alist-test.rkt +++ b/collects/tests/srfi/1/alist-test.rkt @@ -33,7 +33,7 @@ ;; stone@math.grin.edu (module alist-test mzscheme - (require rktunit) + (require racunit) (require (all-except srfi/1/alist assoc) (rename srfi/1/alist s:assoc assoc)) diff --git a/collects/tests/srfi/1/all-1-tests.rkt b/collects/tests/srfi/1/all-1-tests.rkt index 6c5b992850..509b3357f4 100644 --- a/collects/tests/srfi/1/all-1-tests.rkt +++ b/collects/tests/srfi/1/all-1-tests.rkt @@ -1,6 +1,6 @@ (module all-1-tests mzscheme - (require rktunit) + (require racunit) (require "alist-test.ss" "cons-test.ss" "delete-test.ss" diff --git a/collects/tests/srfi/1/cons-test.rkt b/collects/tests/srfi/1/cons-test.rkt index d24a275e3e..9ae15fec74 100644 --- a/collects/tests/srfi/1/cons-test.rkt +++ b/collects/tests/srfi/1/cons-test.rkt @@ -34,7 +34,7 @@ (module cons-test mzscheme - (require rktunit) + (require racunit) (require srfi/1/cons) (provide cons-tests) diff --git a/collects/tests/srfi/1/delete-test.rkt b/collects/tests/srfi/1/delete-test.rkt index c721dc88fa..afc6e59a23 100644 --- a/collects/tests/srfi/1/delete-test.rkt +++ b/collects/tests/srfi/1/delete-test.rkt @@ -34,7 +34,7 @@ (module delete-test mzscheme - (require rktunit) + (require racunit) (require (all-except srfi/1/delete member)) (provide delete-tests) diff --git a/collects/tests/srfi/1/filter-test.rkt b/collects/tests/srfi/1/filter-test.rkt index ab7a7d3d92..452b875096 100644 --- a/collects/tests/srfi/1/filter-test.rkt +++ b/collects/tests/srfi/1/filter-test.rkt @@ -34,7 +34,7 @@ (module filter-test mzscheme - (require rktunit) + (require racunit) (require (all-except srfi/1/filter member)) (provide filter-tests) diff --git a/collects/tests/srfi/1/fold-test.rkt b/collects/tests/srfi/1/fold-test.rkt index 582ece5217..bf174570b7 100644 --- a/collects/tests/srfi/1/fold-test.rkt +++ b/collects/tests/srfi/1/fold-test.rkt @@ -34,7 +34,7 @@ (module fold-test mzscheme - (require rktunit) + (require racunit) (require (all-except srfi/1/fold map for-each) (rename srfi/1/fold s:map map) (rename srfi/1/fold s:for-each for-each)) diff --git a/collects/tests/srfi/1/lset-test.rkt b/collects/tests/srfi/1/lset-test.rkt index 6acd3fc9d1..6f1a014386 100644 --- a/collects/tests/srfi/1/lset-test.rkt +++ b/collects/tests/srfi/1/lset-test.rkt @@ -34,7 +34,7 @@ (module lset-test mzscheme - (require rktunit) + (require racunit) (require srfi/1/lset) (provide lset-tests) diff --git a/collects/tests/srfi/1/misc-test.rkt b/collects/tests/srfi/1/misc-test.rkt index 989715be06..66ca346e70 100644 --- a/collects/tests/srfi/1/misc-test.rkt +++ b/collects/tests/srfi/1/misc-test.rkt @@ -34,7 +34,7 @@ (module misc-test mzscheme - (require rktunit) + (require racunit) (require (all-except srfi/1/misc append! reverse!) (rename srfi/1/misc s:append! append!) (rename srfi/1/misc s:reverse! reverse!)) diff --git a/collects/tests/srfi/1/predicate-test.rkt b/collects/tests/srfi/1/predicate-test.rkt index e62d66b5f5..72337f658b 100644 --- a/collects/tests/srfi/1/predicate-test.rkt +++ b/collects/tests/srfi/1/predicate-test.rkt @@ -34,7 +34,7 @@ (module predicate-test mzscheme - (require rktunit) + (require racunit) (require srfi/1/predicate srfi/1/cons) diff --git a/collects/tests/srfi/1/run-tests.rkt b/collects/tests/srfi/1/run-tests.rkt index 5f16086162..a5e4d5169d 100644 --- a/collects/tests/srfi/1/run-tests.rkt +++ b/collects/tests/srfi/1/run-tests.rkt @@ -1,5 +1,5 @@ -(require rktunit) -(require rktunit/text-ui) +(require racunit) +(require racunit/text-ui) (require "all-1-tests.ss") (run-tests all-1-tests) diff --git a/collects/tests/srfi/1/search-test.rkt b/collects/tests/srfi/1/search-test.rkt index 12ab23f04c..a5af271f30 100644 --- a/collects/tests/srfi/1/search-test.rkt +++ b/collects/tests/srfi/1/search-test.rkt @@ -35,7 +35,7 @@ (module search-test mzscheme - (require rktunit) + (require racunit) (require (all-except srfi/1/search member)) (provide search-tests) diff --git a/collects/tests/srfi/1/selector-test.rkt b/collects/tests/srfi/1/selector-test.rkt index 76803dc9ad..a9d05e107b 100644 --- a/collects/tests/srfi/1/selector-test.rkt +++ b/collects/tests/srfi/1/selector-test.rkt @@ -35,7 +35,7 @@ (module selector-test mzscheme - (require rktunit) + (require racunit) (require srfi/1/selector) (provide selector-tests) diff --git a/collects/tests/srfi/13/string-test.rkt b/collects/tests/srfi/13/string-test.rkt index 073ba14ff3..3bf0d94e36 100644 --- a/collects/tests/srfi/13/string-test.rkt +++ b/collects/tests/srfi/13/string-test.rkt @@ -27,7 +27,7 @@ (module string-test mzscheme ;; Noel's Test Framework: (get your copy @ schematics.sourceforge.net) - (require rktunit) + (require racunit) (require srfi/13/string srfi/14/char-set ) diff --git a/collects/tests/srfi/14/char-set-test.rkt b/collects/tests/srfi/14/char-set-test.rkt index 67d8b0fff2..861f777caf 100644 --- a/collects/tests/srfi/14/char-set-test.rkt +++ b/collects/tests/srfi/14/char-set-test.rkt @@ -27,7 +27,7 @@ (module char-set-test mzscheme - (require rktunit) + (require racunit) (require srfi/14/char-set) (provide char-set-tests) diff --git a/collects/tests/srfi/19/tests.rkt b/collects/tests/srfi/19/tests.rkt index 1851ecb8a7..1e3ddf8767 100644 --- a/collects/tests/srfi/19/tests.rkt +++ b/collects/tests/srfi/19/tests.rkt @@ -10,8 +10,8 @@ (require scheme/serialize srfi/19/time) -(require rktunit - rktunit/text-ui) +(require racunit + racunit/text-ui) (define-check (check-comparisons comparison times expected) (for ([time0 (in-list times)] diff --git a/collects/tests/srfi/2/and-let-test.rkt b/collects/tests/srfi/2/and-let-test.rkt index 03ad164fc4..ecc9c711c2 100644 --- a/collects/tests/srfi/2/and-let-test.rkt +++ b/collects/tests/srfi/2/and-let-test.rkt @@ -26,7 +26,7 @@ ;; Commentary: (module and-let-test mzscheme - (require rktunit) + (require racunit) (require srfi/2/and-let) (provide and-let*-tests) diff --git a/collects/tests/srfi/26/cut-test.rkt b/collects/tests/srfi/26/cut-test.rkt index 8f2ffb84c4..c482795886 100644 --- a/collects/tests/srfi/26/cut-test.rkt +++ b/collects/tests/srfi/26/cut-test.rkt @@ -23,7 +23,7 @@ ; $Id: cut-test.ss,v 1.1 2002/06/20 15:40:52 noel Exp $ (module cut-test mzscheme - (require rktunit) + (require racunit) (require srfi/26/cut) (provide cut-tests) diff --git a/collects/tests/srfi/4/srfi-4-test.rkt b/collects/tests/srfi/4/srfi-4-test.rkt index 7aa4225ffb..5e2b4311b3 100644 --- a/collects/tests/srfi/4/srfi-4-test.rkt +++ b/collects/tests/srfi/4/srfi-4-test.rkt @@ -1,7 +1,7 @@ (module srfi-4-test mzscheme - (require rktunit) - (require rktunit/text-ui + (require racunit) + (require racunit/text-ui srfi/4) (provide srfi-4-tests) diff --git a/collects/tests/srfi/40/all-srfi-40-tests.rkt b/collects/tests/srfi/40/all-srfi-40-tests.rkt index 8f069f96f0..2e24ecd136 100644 --- a/collects/tests/srfi/40/all-srfi-40-tests.rkt +++ b/collects/tests/srfi/40/all-srfi-40-tests.rkt @@ -1,5 +1,5 @@ (module all-srfi-40-tests mzscheme - (require rktunit) + (require racunit) (require srfi/40) (provide all-srfi-40-tests) diff --git a/collects/tests/srfi/40/run-tests.rkt b/collects/tests/srfi/40/run-tests.rkt index a9b0fada83..abea2dceec 100644 --- a/collects/tests/srfi/40/run-tests.rkt +++ b/collects/tests/srfi/40/run-tests.rkt @@ -1,5 +1,5 @@ -(require rktunit) -(require rktunit/text-ui) +(require racunit) +(require racunit/text-ui) (require "all-srfi-40-tests.ss") (run-tests all-srfi-40-tests) diff --git a/collects/tests/srfi/43/all-srfi-43-tests.rkt b/collects/tests/srfi/43/all-srfi-43-tests.rkt index c4620fc684..eacd083544 100644 --- a/collects/tests/srfi/43/all-srfi-43-tests.rkt +++ b/collects/tests/srfi/43/all-srfi-43-tests.rkt @@ -1,5 +1,5 @@ (module all-srfi-43-tests mzscheme - (require rktunit) + (require racunit) (require "constructor-tests.ss" "predicate-tests.ss" "iteration-tests.ss" diff --git a/collects/tests/srfi/43/constructor-tests.rkt b/collects/tests/srfi/43/constructor-tests.rkt index c2457f093c..2a2b1d595d 100644 --- a/collects/tests/srfi/43/constructor-tests.rkt +++ b/collects/tests/srfi/43/constructor-tests.rkt @@ -1,6 +1,6 @@ (module constructor-tests mzscheme - (require rktunit) + (require racunit) (require srfi/43/vector-lib) (provide constructor-tests) diff --git a/collects/tests/srfi/43/conversion-tests.rkt b/collects/tests/srfi/43/conversion-tests.rkt index 26617e5430..c0aac37f3e 100644 --- a/collects/tests/srfi/43/conversion-tests.rkt +++ b/collects/tests/srfi/43/conversion-tests.rkt @@ -1,6 +1,6 @@ (module conversion-tests mzscheme - (require rktunit) + (require racunit) (require srfi/43/vector-lib) (provide conversion-tests) diff --git a/collects/tests/srfi/43/iteration-tests.rkt b/collects/tests/srfi/43/iteration-tests.rkt index a3ce6e6579..d2d09c28bf 100644 --- a/collects/tests/srfi/43/iteration-tests.rkt +++ b/collects/tests/srfi/43/iteration-tests.rkt @@ -1,6 +1,6 @@ (module iteration-tests mzscheme - (require rktunit) + (require racunit) (require srfi/43/vector-lib) (provide iteration-tests) diff --git a/collects/tests/srfi/43/mutator-tests.rkt b/collects/tests/srfi/43/mutator-tests.rkt index 79f1813918..d5c750add4 100644 --- a/collects/tests/srfi/43/mutator-tests.rkt +++ b/collects/tests/srfi/43/mutator-tests.rkt @@ -1,6 +1,6 @@ (module mutator-tests mzscheme - (require rktunit) + (require racunit) (require srfi/43/vector-lib) (provide mutator-tests) diff --git a/collects/tests/srfi/43/predicate-tests.rkt b/collects/tests/srfi/43/predicate-tests.rkt index a98b03d4eb..412b9f29fa 100644 --- a/collects/tests/srfi/43/predicate-tests.rkt +++ b/collects/tests/srfi/43/predicate-tests.rkt @@ -1,6 +1,6 @@ (module predicate-tests mzscheme - (require rktunit) + (require racunit) (require srfi/43/vector-lib) (provide predicate-tests) diff --git a/collects/tests/srfi/43/run-tests.rkt b/collects/tests/srfi/43/run-tests.rkt index 18e001b1fe..9891ab3900 100644 --- a/collects/tests/srfi/43/run-tests.rkt +++ b/collects/tests/srfi/43/run-tests.rkt @@ -1,5 +1,5 @@ -(require rktunit) -(require rktunit/text-ui) +(require racunit) +(require racunit/text-ui) (require "all-srfi-43-tests.ss") (run-tests all-srfi-43-tests) diff --git a/collects/tests/srfi/43/searching-tests.rkt b/collects/tests/srfi/43/searching-tests.rkt index e8c6ffcc06..96093804e7 100644 --- a/collects/tests/srfi/43/searching-tests.rkt +++ b/collects/tests/srfi/43/searching-tests.rkt @@ -1,6 +1,6 @@ (module searching-tests mzscheme - (require rktunit) + (require racunit) (require srfi/43/vector-lib) (provide searching-tests) diff --git a/collects/tests/srfi/69/hash-tests.rkt b/collects/tests/srfi/69/hash-tests.rkt index 433c1e3817..797aca6485 100644 --- a/collects/tests/srfi/69/hash-tests.rkt +++ b/collects/tests/srfi/69/hash-tests.rkt @@ -1,6 +1,6 @@ (module hash-tests mzscheme - (require rktunit) + (require racunit) (require srfi/1/list (prefix h: srfi/69)) diff --git a/collects/tests/srfi/all-srfi-tests.rkt b/collects/tests/srfi/all-srfi-tests.rkt index 4626cd8dd3..ab589733dc 100644 --- a/collects/tests/srfi/all-srfi-tests.rkt +++ b/collects/tests/srfi/all-srfi-tests.rkt @@ -1,6 +1,6 @@ (module all-srfi-tests mzscheme - (require rktunit) + (require racunit) (require "1/all-1-tests.ss" "2/and-let-test.ss" "4/srfi-4-test.ss" diff --git a/collects/tests/srfi/run-tests.rkt b/collects/tests/srfi/run-tests.rkt index b4ebddcd28..050d4e6850 100644 --- a/collects/tests/srfi/run-tests.rkt +++ b/collects/tests/srfi/run-tests.rkt @@ -1,7 +1,7 @@ #lang scheme/base -(require rktunit) -(require rktunit/text-ui) +(require racunit) +(require racunit/text-ui) (require "all-srfi-tests.ss") (run-tests all-srfi-tests) diff --git a/collects/tests/stxparse/more-tests.rkt b/collects/tests/stxparse/more-tests.rkt index 46fbbd80a3..5bba8a038a 100644 --- a/collects/tests/stxparse/more-tests.rkt +++ b/collects/tests/stxparse/more-tests.rkt @@ -1,6 +1,6 @@ #lang scheme (require syntax/parse - rktunit) + racunit) (require (for-syntax syntax/parse)) (define-syntax (convert-syntax-error stx) diff --git a/collects/tests/stxparse/select.rkt b/collects/tests/stxparse/select.rkt index 7ff85f6bec..df03b2b468 100644 --- a/collects/tests/stxparse/select.rkt +++ b/collects/tests/stxparse/select.rkt @@ -1,5 +1,5 @@ #lang scheme -(require rktunit +(require racunit syntax/parse) (require (for-syntax syntax/parse)) (provide (all-defined-out)) diff --git a/collects/tests/stxparse/stxclass.rkt b/collects/tests/stxparse/stxclass.rkt index 2d06baf0a3..0b6a32df13 100644 --- a/collects/tests/stxparse/stxclass.rkt +++ b/collects/tests/stxparse/stxclass.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require rktunit +(require racunit syntax/parse (for-syntax scheme/base syntax/parse)) diff --git a/collects/tests/stxparse/test.rkt b/collects/tests/stxparse/test.rkt index 62d41a7fe9..c2663108cd 100644 --- a/collects/tests/stxparse/test.rkt +++ b/collects/tests/stxparse/test.rkt @@ -2,7 +2,7 @@ (require syntax/parse syntax/private/stxparse/rep-attrs syntax/private/stxparse/runtime) -(require rktunit) +(require racunit) ;; tok = test pattern ok (define-syntax tok diff --git a/collects/tests/typed-scheme/main.rkt b/collects/tests/typed-scheme/main.rkt index 048b2d4195..6315119172 100644 --- a/collects/tests/typed-scheme/main.rkt +++ b/collects/tests/typed-scheme/main.rkt @@ -2,7 +2,7 @@ (provide go go/text) -(require rktunit rktunit/text-ui +(require racunit racunit/text-ui mzlib/etc scheme/port compiler/compiler scheme/match diff --git a/collects/tests/typed-scheme/succeed/fixnum.rkt b/collects/tests/typed-scheme/succeed/fixnum.rkt index 640cdf1cfa..27e50ba56d 100644 --- a/collects/tests/typed-scheme/succeed/fixnum.rkt +++ b/collects/tests/typed-scheme/succeed/fixnum.rkt @@ -10,7 +10,7 @@ ;; really badly wrong. (: check (All (a) ((a a -> Boolean) a a -> Boolean))) -;; Simple check function as RktUnit doesn't work in Typed Scheme (yet) +;; Simple check function as RacUnit doesn't work in Typed Scheme (yet) (define (check f a b) (if (f a b) #t diff --git a/collects/tests/typed-scheme/succeed/flonum.rkt b/collects/tests/typed-scheme/succeed/flonum.rkt index bacb377500..0c709e64de 100644 --- a/collects/tests/typed-scheme/succeed/flonum.rkt +++ b/collects/tests/typed-scheme/succeed/flonum.rkt @@ -5,7 +5,7 @@ scheme/unsafe/ops) (: check (All (a) ((a a -> Boolean) a a -> Boolean))) -;; Simple check function as RktUnit doesn't work in Typed Scheme (yet) +;; Simple check function as RacUnit doesn't work in Typed Scheme (yet) (define (check f a b) (if (f a b) #t diff --git a/collects/tests/typed-scheme/succeed/flvector.rkt b/collects/tests/typed-scheme/succeed/flvector.rkt index 066d2068c1..255776edf9 100644 --- a/collects/tests/typed-scheme/succeed/flvector.rkt +++ b/collects/tests/typed-scheme/succeed/flvector.rkt @@ -11,7 +11,7 @@ ;; really badly wrong. (: check (All (a) ((a a -> Boolean) a a -> Boolean))) -;; Simple check function as RktUnit doesn't work in Typed Scheme (yet) +;; Simple check function as RacUnit doesn't work in Typed Scheme (yet) (define (check f a b) (if (f a b) #t diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.rkt b/collects/tests/typed-scheme/unit-tests/all-tests.rkt index 7d6b9f542f..27fb506979 100644 --- a/collects/tests/typed-scheme/unit-tests/all-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/all-tests.rkt @@ -12,7 +12,7 @@ "subst-tests.ss" ;; pass "infer-tests.ss" ;; pass "contract-tests.ss" - (r:infer infer infer-dummy) rktunit) + (r:infer infer infer-dummy) racunit) (provide unit-tests) diff --git a/collects/tests/typed-scheme/unit-tests/contract-tests.rkt b/collects/tests/typed-scheme/unit-tests/contract-tests.rkt index 2da932c628..d83173fc8b 100644 --- a/collects/tests/typed-scheme/unit-tests/contract-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/contract-tests.rkt @@ -7,7 +7,7 @@ (rep type-rep filter-rep object-rep) (types utils union convenience) (utils tc-utils) - rktunit) + racunit) (define-syntax-rule (t e) (test-not-exn (format "~a" e) (lambda () (type->contract e (lambda _ (error "type could not be converted to contract")))))) diff --git a/collects/tests/typed-scheme/unit-tests/infer-tests.rkt b/collects/tests/typed-scheme/unit-tests/infer-tests.rkt index 4418c8f51e..011e66ae71 100644 --- a/collects/tests/typed-scheme/unit-tests/infer-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/infer-tests.rkt @@ -3,7 +3,7 @@ (require (rep type-rep) (r:infer infer) (types convenience union utils abbrev) - rktunit) + racunit) diff --git a/collects/tests/typed-scheme/unit-tests/module-tests.rkt b/collects/tests/typed-scheme/unit-tests/module-tests.rkt index 188bf916bd..f4b00aef77 100644 --- a/collects/tests/typed-scheme/unit-tests/module-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/module-tests.rkt @@ -1,5 +1,5 @@ #lang scheme -(require "test-utils.ss" rktunit) +(require "test-utils.ss" racunit) (provide module-tests) diff --git a/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt b/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt index 8f04fa8258..5252e603b2 100644 --- a/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt @@ -8,7 +8,7 @@ (private base-types-new base-types-extra colon) (for-template (private base-types-new base-types-extra base-env colon)) (private parse-type) - rktunit) + racunit) (provide parse-type-tests) diff --git a/collects/tests/typed-scheme/unit-tests/planet-requires.rkt b/collects/tests/typed-scheme/unit-tests/planet-requires.rkt index 1a7db776e2..1ec61ab5f0 100644 --- a/collects/tests/typed-scheme/unit-tests/planet-requires.rkt +++ b/collects/tests/typed-scheme/unit-tests/planet-requires.rkt @@ -30,12 +30,12 @@ (splice-requires (map mk (syntax->list #'(files ...)))))])))) -(provide rktunit) +(provide racunit) ;; why is this neccessary? (provide planet/multiple) -(define-module rktunit - (planet/multiple ("schematics" "rktunit.plt" 2 11) +(define-module racunit + (planet/multiple ("schematics" "racunit.plt" 2 11) "test.ss" ;"graphical-ui.ss" "text-ui.ss" @@ -44,4 +44,4 @@ #; (planet/multiple ("cce" "fasttest.plt" 1 2) "random.ss" - "rktunit.ss")) + "racunit.ss")) diff --git a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt index 46d0910d1c..a0cb778a3e 100644 --- a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt @@ -3,7 +3,7 @@ (rep type-rep) (r:infer infer infer-dummy) (types convenience subtype union remove-intersect) - rktunit) + racunit) (define-syntax (over-tests stx) (syntax-case stx () diff --git a/collects/tests/typed-scheme/unit-tests/subst-tests.rkt b/collects/tests/typed-scheme/unit-tests/subst-tests.rkt index 546c4eef08..61ee5c02f5 100644 --- a/collects/tests/typed-scheme/unit-tests/subst-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/subst-tests.rkt @@ -3,7 +3,7 @@ (require "test-utils.ss" (for-syntax scheme/base) (rep type-rep) (types utils abbrev) - rktunit) + racunit) (define-syntax-rule (s img var tgt result) (test-eq? "test" (substitute img 'var tgt) result)) diff --git a/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt b/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt index 9f5fe6c943..b43e4c0285 100644 --- a/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt @@ -5,7 +5,7 @@ (rep type-rep) (env init-envs type-environments) (r:infer infer infer-dummy) - rktunit + racunit (for-syntax scheme/base)) (provide subtype-tests) diff --git a/collects/tests/typed-scheme/unit-tests/test-utils.rkt b/collects/tests/typed-scheme/unit-tests/test-utils.rkt index bcce8ab843..d4ad6aedc0 100644 --- a/collects/tests/typed-scheme/unit-tests/test-utils.rkt +++ b/collects/tests/typed-scheme/unit-tests/test-utils.rkt @@ -7,7 +7,7 @@ typed-scheme/utils/utils (for-syntax scheme/base) (types comparison utils) - rktunit rktunit/text-ui) + racunit racunit/text-ui) (provide private typecheck (rename-out [infer r:infer]) utils env rep types) @@ -20,7 +20,7 @@ (run-tests (mk-suite ts))) (define (test/gui suite) - (((dynamic-require 'rktunit/private/gui/gui 'make-gui-runner)) + (((dynamic-require 'racunit/private/gui/gui 'make-gui-runner)) suite)) (define (run/gui . ts) diff --git a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt index 8479820a8f..8e73752988 100644 --- a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt @@ -6,7 +6,7 @@ (env type-environments type-name-env init-envs) (utils tc-utils) (rep type-rep) - rktunit) + racunit) (provide type-annotation-tests) diff --git a/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt b/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt index 1fcd1f759d..f66af265d9 100644 --- a/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt @@ -3,7 +3,7 @@ (require "test-utils.ss" (for-syntax scheme/base) (rep type-rep) (types comparison abbrev union) - rktunit) + racunit) (provide type-equal-tests) diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt index be6a31f2ab..ca86558640 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -17,7 +17,7 @@ (utils tc-utils utils) unstable/mutated-vars (env type-name-env type-environments init-envs) - rktunit + racunit syntax/parse (for-syntax (utils tc-utils) (typecheck typechecker) diff --git a/collects/tests/web-server/all-web-server-tests.rkt b/collects/tests/web-server/all-web-server-tests.rkt index 65b4b07ccd..8b90ea90f2 100644 --- a/collects/tests/web-server/all-web-server-tests.rkt +++ b/collects/tests/web-server/all-web-server-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "configuration/all-configuration-tests.rkt" "dispatchers/all-dispatchers-tests.rkt" "lang/all-lang-tests.rkt" diff --git a/collects/tests/web-server/configuration/all-configuration-tests.rkt b/collects/tests/web-server/configuration/all-configuration-tests.rkt index 41c99ecc30..bd7703f4c7 100644 --- a/collects/tests/web-server/configuration/all-configuration-tests.rkt +++ b/collects/tests/web-server/configuration/all-configuration-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "configuration-table-test.rkt") (provide all-configuration-tests) diff --git a/collects/tests/web-server/configuration/configuration-table-test.rkt b/collects/tests/web-server/configuration/configuration-table-test.rkt index d67e440b4d..cd602c87ad 100644 --- a/collects/tests/web-server/configuration/configuration-table-test.rkt +++ b/collects/tests/web-server/configuration/configuration-table-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit (only-in mzlib/file make-temporary-file) web-server/configuration/configuration-table) diff --git a/collects/tests/web-server/dispatch-test.rkt b/collects/tests/web-server/dispatch-test.rkt index d91d90af25..3ed75947eb 100644 --- a/collects/tests/web-server/dispatch-test.rkt +++ b/collects/tests/web-server/dispatch-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/http web-server/dispatchers/dispatch net/url @@ -458,5 +458,5 @@ #;(test-serve/dispatch) -(require rktunit/text-ui) +(require racunit/text-ui) (run-tests all-dispatch-tests) diff --git a/collects/tests/web-server/dispatchers/all-dispatchers-tests.rkt b/collects/tests/web-server/dispatchers/all-dispatchers-tests.rkt index 00083f7917..4f5c36e0e2 100644 --- a/collects/tests/web-server/dispatchers/all-dispatchers-tests.rkt +++ b/collects/tests/web-server/dispatchers/all-dispatchers-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "dispatch-passwords-test.rkt" "dispatch-files-test.rkt" "dispatch-servlets-test.rkt" diff --git a/collects/tests/web-server/dispatchers/dispatch-files-test.rkt b/collects/tests/web-server/dispatchers/dispatch-files-test.rkt index 78b5ccf047..4fb373a65b 100644 --- a/collects/tests/web-server/dispatchers/dispatch-files-test.rkt +++ b/collects/tests/web-server/dispatchers/dispatch-files-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit (only-in mzlib/file file-name-from-path make-temporary-file) @@ -120,5 +120,5 @@ exn:dispatcher? (lambda () (collect (dispatch #f a-dir) (req #t #"HEAD" empty)))))) -#;(require (planet schematics/rktunit:3/text-ui)) +#;(require (planet schematics/racunit:3/text-ui)) #;(run-tests dispatch-files-tests) diff --git a/collects/tests/web-server/dispatchers/dispatch-host-test.rkt b/collects/tests/web-server/dispatchers/dispatch-host-test.rkt index 3143d201e0..c79d6a4e9a 100644 --- a/collects/tests/web-server/dispatchers/dispatch-host-test.rkt +++ b/collects/tests/web-server/dispatchers/dispatch-host-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit (only-in mzlib/file make-temporary-file) net/url diff --git a/collects/tests/web-server/dispatchers/dispatch-lang-test.rkt b/collects/tests/web-server/dispatchers/dispatch-lang-test.rkt index 7036604798..b473e4591e 100644 --- a/collects/tests/web-server/dispatchers/dispatch-lang-test.rkt +++ b/collects/tests/web-server/dispatchers/dispatch-lang-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit mzlib/etc mzlib/list web-server/dispatchers/dispatch @@ -164,6 +164,6 @@ )) #| -(require rktunit/text-ui) +(require racunit/text-ui) (run-tests dispatch-lang-tests) |# diff --git a/collects/tests/web-server/dispatchers/dispatch-passwords-test.rkt b/collects/tests/web-server/dispatchers/dispatch-passwords-test.rkt index 869c4bbb30..33347211b7 100644 --- a/collects/tests/web-server/dispatchers/dispatch-passwords-test.rkt +++ b/collects/tests/web-server/dispatchers/dispatch-passwords-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit (only-in mzlib/file make-temporary-file) net/url diff --git a/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt b/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt index f8bfb708c9..949019e14d 100644 --- a/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt +++ b/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit mzlib/etc mzlib/list web-server/http diff --git a/collects/tests/web-server/dispatchers/filesystem-map-test.rkt b/collects/tests/web-server/dispatchers/filesystem-map-test.rkt index 8e3944fe77..061f706222 100644 --- a/collects/tests/web-server/dispatchers/filesystem-map-test.rkt +++ b/collects/tests/web-server/dispatchers/filesystem-map-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit net/url web-server/private/util web-server/dispatchers/filesystem-map) diff --git a/collects/tests/web-server/dispatchers/servlet-test-util.rkt b/collects/tests/web-server/dispatchers/servlet-test-util.rkt index 3a8891151e..3ac0782dbf 100644 --- a/collects/tests/web-server/dispatchers/servlet-test-util.rkt +++ b/collects/tests/web-server/dispatchers/servlet-test-util.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit mzlib/list web-server/http "../util.rkt") diff --git a/collects/tests/web-server/formlets-test.rkt b/collects/tests/web-server/formlets-test.rkt index 895e44d95e..be71f9bd58 100644 --- a/collects/tests/web-server/formlets-test.rkt +++ b/collects/tests/web-server/formlets-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit net/url web-server/http web-server/formlets @@ -370,5 +370,5 @@ )) -(require rktunit/text-ui) +(require racunit/text-ui) (run-tests all-formlets-tests) diff --git a/collects/tests/web-server/http/all-http-tests.rkt b/collects/tests/web-server/http/all-http-tests.rkt index 906b334a1f..a722c882ab 100644 --- a/collects/tests/web-server/http/all-http-tests.rkt +++ b/collects/tests/web-server/http/all-http-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "cookies-test.rkt" "digest-auth-test.rkt") (provide all-http-tests) diff --git a/collects/tests/web-server/http/cookies-test.rkt b/collects/tests/web-server/http/cookies-test.rkt index c1f56f8227..6ed78bfe6d 100644 --- a/collects/tests/web-server/http/cookies-test.rkt +++ b/collects/tests/web-server/http/cookies-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit net/url web-server/http/request-structs web-server/http/response-structs @@ -141,5 +141,5 @@ ))) -#;(require rktunit/text-ui) +#;(require racunit/text-ui) #;(run-tests cookies-tests) diff --git a/collects/tests/web-server/http/digest-auth-test.rkt b/collects/tests/web-server/http/digest-auth-test.rkt index bb31d356f4..1bc7263f9b 100644 --- a/collects/tests/web-server/http/digest-auth-test.rkt +++ b/collects/tests/web-server/http/digest-auth-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/http net/url) (provide digest-auth-tests) diff --git a/collects/tests/web-server/lang-test.rkt b/collects/tests/web-server/lang-test.rkt index 98107a4d96..3da169df89 100644 --- a/collects/tests/web-server/lang-test.rkt +++ b/collects/tests/web-server/lang-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "util.rkt") (provide lang-tests) diff --git a/collects/tests/web-server/lang/abort-resume-test.rkt b/collects/tests/web-server/lang/abort-resume-test.rkt index b8305fed4c..f166cab69f 100644 --- a/collects/tests/web-server/lang/abort-resume-test.rkt +++ b/collects/tests/web-server/lang/abort-resume-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/lang/abort-resume) (require/expose web-server/lang/abort-resume (web-prompt)) (provide abort-resume-tests) @@ -306,6 +306,6 @@ )) #| -(require rktunit/text-ui) +(require racunit/text-ui) (run-tests abort-resume-tests) |# diff --git a/collects/tests/web-server/lang/all-lang-tests.rkt b/collects/tests/web-server/lang/all-lang-tests.rkt index e4830190cf..ba06886206 100644 --- a/collects/tests/web-server/lang/all-lang-tests.rkt +++ b/collects/tests/web-server/lang/all-lang-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "abort-resume-test.rkt" "anormal-test.rkt" "defun-test.rkt" diff --git a/collects/tests/web-server/lang/anormal-test.rkt b/collects/tests/web-server/lang/anormal-test.rkt index 430c7099bb..cacede5139 100644 --- a/collects/tests/web-server/lang/anormal-test.rkt +++ b/collects/tests/web-server/lang/anormal-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/lang/anormal web-server/lang/util) (provide anormal-tests) diff --git a/collects/tests/web-server/lang/defun-test.rkt b/collects/tests/web-server/lang/defun-test.rkt index de10e08029..93abc043ec 100644 --- a/collects/tests/web-server/lang/defun-test.rkt +++ b/collects/tests/web-server/lang/defun-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/lang/defun web-server/lang/util) (provide defun-tests) diff --git a/collects/tests/web-server/lang/file-box-test.rkt b/collects/tests/web-server/lang/file-box-test.rkt index 144287593b..5388373a08 100644 --- a/collects/tests/web-server/lang/file-box-test.rkt +++ b/collects/tests/web-server/lang/file-box-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/lang/file-box (only-in mzlib/file make-temporary-file)) (provide file-box-tests) diff --git a/collects/tests/web-server/lang/labels-test.rkt b/collects/tests/web-server/lang/labels-test.rkt index 042b9bac1f..74aae31f54 100644 --- a/collects/tests/web-server/lang/labels-test.rkt +++ b/collects/tests/web-server/lang/labels-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/lang/labels) (provide labels-tests) diff --git a/collects/tests/web-server/lang/stuff-url-test.rkt b/collects/tests/web-server/lang/stuff-url-test.rkt index fa25f1a6ff..adbade62bc 100644 --- a/collects/tests/web-server/lang/stuff-url-test.rkt +++ b/collects/tests/web-server/lang/stuff-url-test.rkt @@ -1,7 +1,7 @@ #lang racket/base (require web-server/lang/stuff-url web-server/stuffers - rktunit + racunit net/url mzlib/serialize "../util.rkt") diff --git a/collects/tests/web-server/lang/web-param-test.rkt b/collects/tests/web-server/lang/web-param-test.rkt index 2c9f0f06a6..011a5033c0 100644 --- a/collects/tests/web-server/lang/web-param-test.rkt +++ b/collects/tests/web-server/lang/web-param-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "../util.rkt") (provide web-param-tests) diff --git a/collects/tests/web-server/managers/all-managers-tests.rkt b/collects/tests/web-server/managers/all-managers-tests.rkt index 739cab4bf4..c587719b5f 100644 --- a/collects/tests/web-server/managers/all-managers-tests.rkt +++ b/collects/tests/web-server/managers/all-managers-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit) +(require racunit) (provide all-managers-tests) (define all-managers-tests diff --git a/collects/tests/web-server/private/all-private-tests.rkt b/collects/tests/web-server/private/all-private-tests.rkt index adae03de54..d483c50c3c 100644 --- a/collects/tests/web-server/private/all-private-tests.rkt +++ b/collects/tests/web-server/private/all-private-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "request-test.rkt" "cache-table-test.rkt" "response-test.rkt" diff --git a/collects/tests/web-server/private/cache-table-test.rkt b/collects/tests/web-server/private/cache-table-test.rkt index 48028c50dc..9777f18d4d 100644 --- a/collects/tests/web-server/private/cache-table-test.rkt +++ b/collects/tests/web-server/private/cache-table-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/private/cache-table) (provide cache-table-tests) @@ -37,6 +37,6 @@ (cache-table-lookup! ct 'foo (lambda () #f))))))) #| -(require (planet schematics/rktunit:3/text-ui)) +(require (planet schematics/racunit:3/text-ui)) (run-tests cache-table-tests) |# diff --git a/collects/tests/web-server/private/connection-manager-test.rkt b/collects/tests/web-server/private/connection-manager-test.rkt index 72950e37b9..b0dbb90f35 100644 --- a/collects/tests/web-server/private/connection-manager-test.rkt +++ b/collects/tests/web-server/private/connection-manager-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/private/connection-manager) (provide connection-manager-tests) diff --git a/collects/tests/web-server/private/define-closure-test.rkt b/collects/tests/web-server/private/define-closure-test.rkt index 7e35dd3f78..a764b78fdd 100644 --- a/collects/tests/web-server/private/define-closure-test.rkt +++ b/collects/tests/web-server/private/define-closure-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit mzlib/serialize mzlib/match web-server/private/define-closure) diff --git a/collects/tests/web-server/private/gzip-test.rkt b/collects/tests/web-server/private/gzip-test.rkt index 32c5b6d06c..3746170516 100644 --- a/collects/tests/web-server/private/gzip-test.rkt +++ b/collects/tests/web-server/private/gzip-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/private/gzip) (provide gzip-tests) diff --git a/collects/tests/web-server/private/mime-types-test.rkt b/collects/tests/web-server/private/mime-types-test.rkt index 78942cce7d..ca31d96b83 100644 --- a/collects/tests/web-server/private/mime-types-test.rkt +++ b/collects/tests/web-server/private/mime-types-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit (only-in mzlib/file make-temporary-file) web-server/http web-server/private/mime-types) diff --git a/collects/tests/web-server/private/mod-map-test.rkt b/collects/tests/web-server/private/mod-map-test.rkt index df290694f4..7a15c4235a 100644 --- a/collects/tests/web-server/private/mod-map-test.rkt +++ b/collects/tests/web-server/private/mod-map-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/private/mod-map mzlib/serialize "../util.rkt") diff --git a/collects/tests/web-server/private/request-test.rkt b/collects/tests/web-server/private/request-test.rkt index 85adc37e5d..840e53b463 100644 --- a/collects/tests/web-server/private/request-test.rkt +++ b/collects/tests/web-server/private/request-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/private/connection-manager web-server/private/timer web-server/http/request diff --git a/collects/tests/web-server/private/response-test.rkt b/collects/tests/web-server/private/response-test.rkt index 95a1303b1d..19e5a7d015 100644 --- a/collects/tests/web-server/private/response-test.rkt +++ b/collects/tests/web-server/private/response-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit xml/xml (only-in mzlib/file make-temporary-file) diff --git a/collects/tests/web-server/private/url-param-test.rkt b/collects/tests/web-server/private/url-param-test.rkt index 9370012973..baaa7e0c9a 100644 --- a/collects/tests/web-server/private/url-param-test.rkt +++ b/collects/tests/web-server/private/url-param-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit net/url web-server/private/url-param) (provide url-param-tests) diff --git a/collects/tests/web-server/private/util-test.rkt b/collects/tests/web-server/private/util-test.rkt index a0a977a385..ad6903a60a 100644 --- a/collects/tests/web-server/private/util-test.rkt +++ b/collects/tests/web-server/private/util-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit net/url xml/xml mzlib/contract diff --git a/collects/tests/web-server/run-all-tests.rkt b/collects/tests/web-server/run-all-tests.rkt index 484934b0d4..c643297e7e 100644 --- a/collects/tests/web-server/run-all-tests.rkt +++ b/collects/tests/web-server/run-all-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit/text-ui +(require racunit/text-ui "all-web-server-tests.rkt") (run-tests all-web-server-tests) diff --git a/collects/tests/web-server/servlet-env-test.rkt b/collects/tests/web-server/servlet-env-test.rkt index 867dfebbf1..4d20cd5786 100644 --- a/collects/tests/web-server/servlet-env-test.rkt +++ b/collects/tests/web-server/servlet-env-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit mzlib/etc mzlib/list mzlib/pretty diff --git a/collects/tests/web-server/servlet/all-servlet-tests.rkt b/collects/tests/web-server/servlet/all-servlet-tests.rkt index cfc7e907b3..677eb4b3db 100644 --- a/collects/tests/web-server/servlet/all-servlet-tests.rkt +++ b/collects/tests/web-server/servlet/all-servlet-tests.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit "bindings-test.rkt" "basic-auth-test.rkt" "helpers-test.rkt" diff --git a/collects/tests/web-server/servlet/basic-auth-test.rkt b/collects/tests/web-server/servlet/basic-auth-test.rkt index c6e0d85ba8..2f41b84962 100644 --- a/collects/tests/web-server/servlet/basic-auth-test.rkt +++ b/collects/tests/web-server/servlet/basic-auth-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/http net/url) (provide basic-auth-tests) diff --git a/collects/tests/web-server/servlet/bindings-test.rkt b/collects/tests/web-server/servlet/bindings-test.rkt index 0757517fd8..77be8cc969 100644 --- a/collects/tests/web-server/servlet/bindings-test.rkt +++ b/collects/tests/web-server/servlet/bindings-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit mzlib/list net/url web-server/http diff --git a/collects/tests/web-server/servlet/helpers-test.rkt b/collects/tests/web-server/servlet/helpers-test.rkt index 312b7cc1c6..78688c6303 100644 --- a/collects/tests/web-server/servlet/helpers-test.rkt +++ b/collects/tests/web-server/servlet/helpers-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit web-server/servlet) (provide helpers-tests) @@ -53,5 +53,5 @@ (test-case "temporarily" (check-true (redirection-status? temporarily))) (test-case "see-other" (check-true (redirection-status? see-other)))))) -;(require (planet schematics/rktunit:3/text-ui)) +;(require (planet schematics/racunit:3/text-ui)) ;(run-tests helpers-tests) diff --git a/collects/tests/web-server/servlet/web-test.rkt b/collects/tests/web-server/servlet/web-test.rkt index be5fe60d7f..bbee9492d2 100644 --- a/collects/tests/web-server/servlet/web-test.rkt +++ b/collects/tests/web-server/servlet/web-test.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require rktunit +(require racunit net/url web-server/servlet/web) (require/expose web-server/servlet/web diff --git a/collects/tests/web-server/stuffers-test.rkt b/collects/tests/web-server/stuffers-test.rkt index 7baae5d620..a34a738d40 100644 --- a/collects/tests/web-server/stuffers-test.rkt +++ b/collects/tests/web-server/stuffers-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require rktunit +(require racunit web-server/stuffers web-server/private/servlet web-server/http @@ -127,6 +127,6 @@ (check-not-false (is-url-too-big? (make-bytes 3000 65))))))))) #| -(require (planet schematics/rktunit:3/text-ui)) +(require (planet schematics/racunit:3/text-ui)) (run-tests all-stuffers-tests) |# diff --git a/collects/tests/xml/test-clark.rkt b/collects/tests/xml/test-clark.rkt index 1b94b46cac..ecad0fc909 100644 --- a/collects/tests/xml/test-clark.rkt +++ b/collects/tests/xml/test-clark.rkt @@ -1,6 +1,6 @@ #lang racket -(require rktunit - rktunit/text-ui +(require racunit + racunit/text-ui xml racket/runtime-path) diff --git a/collects/tests/xml/test.rkt b/collects/tests/xml/test.rkt index 3862212969..d2b0c26dda 100644 --- a/collects/tests/xml/test.rkt +++ b/collects/tests/xml/test.rkt @@ -1,6 +1,6 @@ #lang racket -(require rktunit - rktunit/text-ui +(require racunit + racunit/text-ui xml xml/plist mzlib/etc