From dbf0a806a2a7c5f036c25d1a19c60b4ca0d8353f Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 17 May 2010 11:04:55 -0400 Subject: [PATCH] "Racunit" -> "Rackunit" original commit: 7b14a1f585d368bca8967072fbf3530d568e1391 --- collects/{racunit => rackunit}/gui.rkt | 2 +- collects/{racunit => rackunit}/main.rkt | 0 .../{racunit => rackunit}/private/base.rkt | 12 +++--- .../private/check-info.rkt | 2 +- .../{racunit => rackunit}/private/check.rkt | 0 .../{racunit => rackunit}/private/counter.rkt | 0 .../{racunit => rackunit}/private/format.rkt | 0 .../private/gui/cache-box.rkt | 0 .../private/gui/config.rkt | 8 ++-- .../private/gui/controller.rkt | 8 ++-- .../private/gui/drracket-link.rkt | 0 .../private/gui/drracket-ui.rkt | 0 .../{racunit => rackunit}/private/gui/gui.rkt | 8 ++-- .../private/gui/interfaces.rkt | 0 .../private/gui/model.rkt | 0 .../private/gui/model2rml.rkt | 0 .../private/gui/output-icon.png | Bin .../{racunit => rackunit}/private/gui/rml.rkt | 12 +++--- .../private/gui/view.rkt | 6 +-- .../private/hash-monad.rkt | 0 .../private/location.rkt | 0 .../{racunit => rackunit}/private/monad.rkt | 0 .../private/name-collector.rkt | 0 .../{racunit => rackunit}/private/result.rkt | 8 ++-- .../private/test-case.rkt | 0 .../private/test-suite.rkt | 38 +++++++++--------- .../{racunit => rackunit}/private/test.rkt | 10 ++--- .../private/text-ui-util.rkt | 0 .../{racunit => rackunit}/private/util.rkt | 0 .../scribblings/acknowledgements.scrbl | 0 .../scribblings/api.scrbl | 4 +- .../scribblings/base.rkt | 12 +++--- .../scribblings/check.scrbl | 0 .../scribblings/compound-testing.scrbl | 0 .../scribblings/control-flow.scrbl | 0 .../scribblings/file-test.rkt | 2 +- .../scribblings/file.rkt | 0 .../scribblings/misc.scrbl | 2 +- .../scribblings/overview.scrbl | 0 .../scribblings/philosophy.scrbl | 0 .../scribblings/quick-start.scrbl | 6 +-- .../scribblings/rackunit.scrbl} | 0 .../scribblings/release-notes.scrbl | 0 .../scribblings/ui.scrbl | 8 ++-- collects/{racunit => rackunit}/text-ui.rkt | 0 collects/{racunit => rackunit}/tool.rkt | 2 +- collects/schemeunit/gui.rkt | 4 +- collects/schemeunit/text-ui.rkt | 4 +- .../all-rackunit-tests.rkt} | 6 +-- .../tests/{racunit => rackunit}/base-test.rkt | 22 +++++----- .../{racunit => rackunit}/check-info-test.rkt | 4 +- .../{racunit => rackunit}/check-test.rkt | 10 ++--- .../{racunit => rackunit}/counter-test.rkt | 8 ++-- .../{racunit => rackunit}/format-test.rkt | 6 +-- .../{racunit => rackunit}/hash-monad-test.rkt | 6 +-- .../{racunit => rackunit}/location-test.rkt | 4 +- .../{racunit => rackunit}/monad-test.rkt | 4 +- .../{racunit => rackunit}/result-test.rkt | 4 +- .../tests/{racunit => rackunit}/run-tests.rkt | 8 ++-- .../standalone-check-test.rkt | 2 +- .../standalone-test-case-test.rkt | 4 +- .../{racunit => rackunit}/test-case-test.rkt | 10 ++--- .../{racunit => rackunit}/test-suite-test.rkt | 4 +- .../tests/{racunit => rackunit}/test-test.rkt | 8 ++-- .../{racunit => rackunit}/text-ui-test.rkt | 4 +- .../text-ui-util-test.rkt | 4 +- .../tests/{racunit => rackunit}/util-test.rkt | 6 +-- 67 files changed, 141 insertions(+), 141 deletions(-) rename collects/{racunit => rackunit}/gui.rkt (83%) rename collects/{racunit => rackunit}/main.rkt (100%) rename collects/{racunit => rackunit}/private/base.rkt (78%) rename collects/{racunit => rackunit}/private/check-info.rkt (97%) rename collects/{racunit => rackunit}/private/check.rkt (100%) rename collects/{racunit => rackunit}/private/counter.rkt (100%) rename collects/{racunit => rackunit}/private/format.rkt (100%) rename collects/{racunit => rackunit}/private/gui/cache-box.rkt (100%) rename collects/{racunit => rackunit}/private/gui/config.rkt (82%) rename collects/{racunit => rackunit}/private/gui/controller.rkt (87%) rename collects/{racunit => rackunit}/private/gui/drracket-link.rkt (100%) rename collects/{racunit => rackunit}/private/gui/drracket-ui.rkt (100%) rename collects/{racunit => rackunit}/private/gui/gui.rkt (95%) rename collects/{racunit => rackunit}/private/gui/interfaces.rkt (100%) rename collects/{racunit => rackunit}/private/gui/model.rkt (100%) rename collects/{racunit => rackunit}/private/gui/model2rml.rkt (100%) rename collects/{racunit => rackunit}/private/gui/output-icon.png (100%) rename collects/{racunit => rackunit}/private/gui/rml.rkt (96%) rename collects/{racunit => rackunit}/private/gui/view.rkt (98%) rename collects/{racunit => rackunit}/private/hash-monad.rkt (100%) rename collects/{racunit => rackunit}/private/location.rkt (100%) rename collects/{racunit => rackunit}/private/monad.rkt (100%) rename collects/{racunit => rackunit}/private/name-collector.rkt (100%) rename collects/{racunit => rackunit}/private/result.rkt (96%) rename collects/{racunit => rackunit}/private/test-case.rkt (100%) rename collects/{racunit => rackunit}/private/test-suite.rkt (83%) rename collects/{racunit => rackunit}/private/test.rkt (93%) rename collects/{racunit => rackunit}/private/text-ui-util.rkt (100%) rename collects/{racunit => rackunit}/private/util.rkt (100%) rename collects/{racunit => rackunit}/scribblings/acknowledgements.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/api.scrbl (87%) rename collects/{racunit => rackunit}/scribblings/base.rkt (57%) rename collects/{racunit => rackunit}/scribblings/check.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/compound-testing.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/control-flow.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/file-test.rkt (95%) rename collects/{racunit => rackunit}/scribblings/file.rkt (100%) rename collects/{racunit => rackunit}/scribblings/misc.scrbl (91%) rename collects/{racunit => rackunit}/scribblings/overview.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/philosophy.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/quick-start.scrbl (96%) rename collects/{racunit/scribblings/racunit.scrbl => rackunit/scribblings/rackunit.scrbl} (100%) rename collects/{racunit => rackunit}/scribblings/release-notes.scrbl (100%) rename collects/{racunit => rackunit}/scribblings/ui.scrbl (90%) rename collects/{racunit => rackunit}/text-ui.rkt (100%) rename collects/{racunit => rackunit}/tool.rkt (97%) rename collects/tests/{racunit/all-racunit-tests.rkt => rackunit/all-rackunit-tests.rkt} (94%) rename collects/tests/{racunit => rackunit}/base-test.rkt (80%) rename collects/tests/{racunit => rackunit}/check-info-test.rkt (98%) rename collects/tests/{racunit => rackunit}/check-test.rkt (98%) rename collects/tests/{racunit => rackunit}/counter-test.rkt (93%) rename collects/tests/{racunit => rackunit}/format-test.rkt (86%) rename collects/tests/{racunit => rackunit}/hash-monad-test.rkt (95%) rename collects/tests/{racunit => rackunit}/location-test.rkt (98%) rename collects/tests/{racunit => rackunit}/monad-test.rkt (98%) rename collects/tests/{racunit => rackunit}/result-test.rkt (95%) rename collects/tests/{racunit => rackunit}/run-tests.rkt (74%) rename collects/tests/{racunit => rackunit}/standalone-check-test.rkt (98%) rename collects/tests/{racunit => rackunit}/standalone-test-case-test.rkt (87%) rename collects/tests/{racunit => rackunit}/test-case-test.rkt (85%) rename collects/tests/{racunit => rackunit}/test-suite-test.rkt (97%) rename collects/tests/{racunit => rackunit}/test-test.rkt (98%) rename collects/tests/{racunit => rackunit}/text-ui-test.rkt (99%) rename collects/tests/{racunit => rackunit}/text-ui-util-test.rkt (96%) rename collects/tests/{racunit => rackunit}/util-test.rkt (93%) diff --git a/collects/racunit/gui.rkt b/collects/rackunit/gui.rkt similarity index 83% rename from collects/racunit/gui.rkt rename to collects/rackunit/gui.rkt index 8daff1a..4238316 100644 --- a/collects/racunit/gui.rkt +++ b/collects/rackunit/gui.rkt @@ -6,7 +6,7 @@ (define (test/gui . tests) (apply (make-gui-runner) tests)) -(define test/c (or/c racunit-test-case? racunit-test-suite?)) +(define test/c (or/c rackunit-test-case? rackunit-test-suite?)) (provide/contract [test/gui diff --git a/collects/racunit/main.rkt b/collects/rackunit/main.rkt similarity index 100% rename from collects/racunit/main.rkt rename to collects/rackunit/main.rkt diff --git a/collects/racunit/private/base.rkt b/collects/rackunit/private/base.rkt similarity index 78% rename from collects/racunit/private/base.rkt rename to collects/rackunit/private/base.rkt index 6809635..4570be0 100644 --- a/collects/racunit/private/base.rkt +++ b/collects/rackunit/private/base.rkt @@ -4,10 +4,10 @@ ;; struct test : (define-struct test ()) -;; 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 (rackunit-test-case test) : (U string #f) thunk +(define-struct (rackunit-test-case test) (name action) #:transparent) +;; struct (rackunit-test-suite test) : string (fdown fup fhere seed -> (listof test-result)) thunk thunk +(define-struct (rackunit-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 (racunit-test-case test) + (struct (rackunit-test-case test) ((name (or/c string? false/c)) (action (-> any)))) - (struct (racunit-test-suite test) + (struct (rackunit-test-suite test) ((name string?) (tests procedure?) (before (-> any)) diff --git a/collects/racunit/private/check-info.rkt b/collects/rackunit/private/check-info.rkt similarity index 97% rename from collects/racunit/private/check-info.rkt rename to collects/rackunit/private/check-info.rkt index de98d71..f518b5e 100644 --- a/collects/racunit/private/check-info.rkt +++ b/collects/rackunit/private/check-info.rkt @@ -11,7 +11,7 @@ ;; Infrastructure ---------------------------------------------- ;; The continuation mark under which all check-info is keyed -(define check-info-mark (gensym 'racunit)) +(define check-info-mark (gensym 'rackunit)) ;; (continuation-mark-set -> (listof check-info)) (define (check-info-stack marks) diff --git a/collects/racunit/private/check.rkt b/collects/rackunit/private/check.rkt similarity index 100% rename from collects/racunit/private/check.rkt rename to collects/rackunit/private/check.rkt diff --git a/collects/racunit/private/counter.rkt b/collects/rackunit/private/counter.rkt similarity index 100% rename from collects/racunit/private/counter.rkt rename to collects/rackunit/private/counter.rkt diff --git a/collects/racunit/private/format.rkt b/collects/rackunit/private/format.rkt similarity index 100% rename from collects/racunit/private/format.rkt rename to collects/rackunit/private/format.rkt diff --git a/collects/racunit/private/gui/cache-box.rkt b/collects/rackunit/private/gui/cache-box.rkt similarity index 100% rename from collects/racunit/private/gui/cache-box.rkt rename to collects/rackunit/private/gui/cache-box.rkt diff --git a/collects/racunit/private/gui/config.rkt b/collects/rackunit/private/gui/config.rkt similarity index 82% rename from collects/racunit/private/gui/config.rkt rename to collects/rackunit/private/gui/config.rkt index 1d843d9..de80e95 100644 --- a/collects/racunit/private/gui/config.rkt +++ b/collects/rackunit/private/gui/config.rkt @@ -5,10 +5,10 @@ ;; Frame size preferences -(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)) +(preferences:set-default 'rackunit:frame:width 400 exact-positive-integer?) +(preferences:set-default 'rackunit:frame:height 400 exact-positive-integer?) +(define pref:width (pref:get/set 'rackunit:frame:width)) +(define pref:height (pref:get/set 'rackunit:frame:height)) ;; CONSTANTS ;; Some of these are obsolete, given the preferences above. diff --git a/collects/racunit/private/gui/controller.rkt b/collects/rackunit/private/gui/controller.rkt similarity index 87% rename from collects/racunit/private/gui/controller.rkt rename to collects/rackunit/private/gui/controller.rkt index 46a0834..5e62687 100644 --- a/collects/racunit/private/gui/controller.rkt +++ b/collects/rackunit/private/gui/controller.rkt @@ -25,18 +25,18 @@ ;; create-model : test suite<%>/#f -> result<%> (define/public (create-model test parent) (define result - (cond [(racunit-test-case? test) + (cond [(rackunit-test-case? test) (new case-result% (controller this) (test test) - (name (or (racunit-test-case-name test) + (name (or (rackunit-test-case-name test) "")) (parent parent))] - [(racunit-test-suite? test) + [(rackunit-test-suite? test) (new suite-result% (controller this) (test test) - (name (or (racunit-test-suite-name test) + (name (or (rackunit-test-suite-name test) "")) (parent parent))])) (send/i view view<%> create-view-link result parent) diff --git a/collects/racunit/private/gui/drracket-link.rkt b/collects/rackunit/private/gui/drracket-link.rkt similarity index 100% rename from collects/racunit/private/gui/drracket-link.rkt rename to collects/rackunit/private/gui/drracket-link.rkt diff --git a/collects/racunit/private/gui/drracket-ui.rkt b/collects/rackunit/private/gui/drracket-ui.rkt similarity index 100% rename from collects/racunit/private/gui/drracket-ui.rkt rename to collects/rackunit/private/gui/drracket-ui.rkt diff --git a/collects/racunit/private/gui/gui.rkt b/collects/rackunit/private/gui/gui.rkt similarity index 95% rename from collects/racunit/private/gui/gui.rkt rename to collects/rackunit/private/gui/gui.rkt index e5a5c41..a987036 100644 --- a/collects/racunit/private/gui/gui.rkt +++ b/collects/rackunit/private/gui/gui.rkt @@ -48,8 +48,8 @@ #| (define/public (run) (let ([custodian (make-custodian)] - [before (racunit-test-suite-before test)] - [after (racunit-test-suite-after test)]) + [before (rackunit-test-suite-before test)] + [after (rackunit-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 (racunit-test-case-name test) - (racunit-test-case-action test)))))]) + (list (rackunit-test-case-name test) + (rackunit-test-case-action test)))))]) (values (car results) (list cputime realtime gctime)))) (define (make-output-ports) diff --git a/collects/racunit/private/gui/interfaces.rkt b/collects/rackunit/private/gui/interfaces.rkt similarity index 100% rename from collects/racunit/private/gui/interfaces.rkt rename to collects/rackunit/private/gui/interfaces.rkt diff --git a/collects/racunit/private/gui/model.rkt b/collects/rackunit/private/gui/model.rkt similarity index 100% rename from collects/racunit/private/gui/model.rkt rename to collects/rackunit/private/gui/model.rkt diff --git a/collects/racunit/private/gui/model2rml.rkt b/collects/rackunit/private/gui/model2rml.rkt similarity index 100% rename from collects/racunit/private/gui/model2rml.rkt rename to collects/rackunit/private/gui/model2rml.rkt diff --git a/collects/racunit/private/gui/output-icon.png b/collects/rackunit/private/gui/output-icon.png similarity index 100% rename from collects/racunit/private/gui/output-icon.png rename to collects/rackunit/private/gui/output-icon.png diff --git a/collects/racunit/private/gui/rml.rkt b/collects/rackunit/private/gui/rml.rkt similarity index 96% rename from collects/racunit/private/gui/rml.rkt rename to collects/rackunit/private/gui/rml.rkt index 1b2b65b..596f028 100644 --- a/collects/racunit/private/gui/rml.rkt +++ b/collects/rackunit/private/gui/rml.rkt @@ -7,7 +7,7 @@ (provide insert-text ext:text% - racunit-style-map) + rackunit-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 racunit-style-map)) + (init-field (style-map rackunit-style-map)) (inherit last-position change-style set-clickback @@ -139,7 +139,7 @@ [error . ,style:red] [value . ,style:darkblue])) -(define racunit-styles +(define rackunit-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)) -;; racunit-style-map : style-map<%> -(define racunit-style-map +;; rackunit-style-map : style-map<%> +(define rackunit-style-map (extend-style-map basic-style-map - racunit-styles)) + rackunit-styles)) diff --git a/collects/racunit/private/gui/view.rkt b/collects/rackunit/private/gui/view.rkt similarity index 98% rename from collects/racunit/private/gui/view.rkt rename to collects/rackunit/private/gui/view.rkt index e3ab435..4cead96 100644 --- a/collects/racunit/private/gui/view.rkt +++ b/collects/rackunit/private/gui/view.rkt @@ -13,7 +13,7 @@ (provide make-view-frame view%) -(define style-map racunit-style-map) +(define style-map rackunit-style-map) #| @@ -50,7 +50,7 @@ still be there, just not visible? controller) (super-new) - (define editor (new ext:text% (style-map racunit-style-map))) + (define editor (new ext:text% (style-map rackunit-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 'racunit-gui + (error 'rackunit-gui "internal error: no progress waiting for view-link")) (do-model-update model)]))) diff --git a/collects/racunit/private/hash-monad.rkt b/collects/rackunit/private/hash-monad.rkt similarity index 100% rename from collects/racunit/private/hash-monad.rkt rename to collects/rackunit/private/hash-monad.rkt diff --git a/collects/racunit/private/location.rkt b/collects/rackunit/private/location.rkt similarity index 100% rename from collects/racunit/private/location.rkt rename to collects/rackunit/private/location.rkt diff --git a/collects/racunit/private/monad.rkt b/collects/rackunit/private/monad.rkt similarity index 100% rename from collects/racunit/private/monad.rkt rename to collects/rackunit/private/monad.rkt diff --git a/collects/racunit/private/name-collector.rkt b/collects/rackunit/private/name-collector.rkt similarity index 100% rename from collects/racunit/private/name-collector.rkt rename to collects/rackunit/private/name-collector.rkt diff --git a/collects/racunit/private/result.rkt b/collects/rackunit/private/result.rkt similarity index 96% rename from collects/racunit/private/result.rkt rename to collects/rackunit/private/result.rkt index 208b39d..fc5309a 100644 --- a/collects/racunit/private/result.rkt +++ b/collects/rackunit/private/result.rkt @@ -51,12 +51,12 @@ ;; data so FP is a bit ugly]. (define (foldts fdown fup fhere seed test) (cond - ((racunit-test-case? test) + ((rackunit-test-case? test) (fhere test - (racunit-test-case-name test) - (racunit-test-case-action test) + (rackunit-test-case-name test) + (rackunit-test-case-action test) seed)) - ((racunit-test-suite? test) + ((rackunit-test-suite? test) (apply-test-suite test fdown fup fhere seed)) (else (raise diff --git a/collects/racunit/private/test-case.rkt b/collects/rackunit/private/test-case.rkt similarity index 100% rename from collects/racunit/private/test-case.rkt rename to collects/rackunit/private/test-case.rkt diff --git a/collects/racunit/private/test-suite.rkt b/collects/rackunit/private/test-suite.rkt similarity index 83% rename from collects/racunit/private/test-suite.rkt rename to collects/rackunit/private/test-suite.rkt index 4b3aa1d..38a2c70 100644 --- a/collects/racunit/private/test-suite.rkt +++ b/collects/rackunit/private/test-suite.rkt @@ -27,14 +27,14 @@ (define (test-suite-test-case-around fhere) (lambda (thunk) (let* ([name (current-test-name)] - [test (make-racunit-test-case name thunk)] + [test (make-rackunit-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-racunit-test-case name thunk)] + [test (make-rackunit-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-racunit-test-case name thunk)))) + (make-rackunit-test-case name thunk)))) (define delayed-check-around (lambda (thunk) (let ([name #f]) - (make-racunit-test-case name thunk)))) + (make-rackunit-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 (racunit-test-suite-name suite)] - [tests (racunit-test-suite-tests suite)] - [before (racunit-test-suite-before suite)] - [after (racunit-test-suite-after suite)] + (let* ([name (rackunit-test-suite-name suite)] + [tests (rackunit-test-suite-tests suite)] + [before (rackunit-test-suite-before suite)] + [after (rackunit-test-suite-after suite)] [kid-seed (fdown suite name before after seed)] - [kid-seed ((racunit-test-suite-tests suite) fdown fup fhere kid-seed)]) + [kid-seed ((rackunit-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 [(racunit-test-suite? x) + (cond [(rackunit-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-racunit-test-suite + (make-rackunit-test-suite the-name the-tests before-thunk @@ -138,13 +138,13 @@ (for-each (lambda (t) (cond - [(racunit-test-suite? t) + [(rackunit-test-suite? t) (current-seed (apply-test-suite t fdown fup fhere (current-seed)))] - [(racunit-test-case? t) + [(rackunit-test-case? t) (current-seed (fhere t - (racunit-test-case-name t) - (racunit-test-case-action t) + (rackunit-test-case-name t) + (rackunit-test-case-action t) (current-seed)))] [else (raise @@ -158,10 +158,10 @@ ;; ;; Construct a test suite from a list of tests (define (make-test-suite name #:before [before void-thunk] #:after [after void-thunk] tests) - (make-racunit-test-suite name - (tests->test-suite-action tests) - before - after)) + (make-rackunit-test-suite name + (tests->test-suite-action tests) + before + after)) ;; ;; Shortcut helpers diff --git a/collects/racunit/private/test.rkt b/collects/rackunit/private/test.rkt similarity index 93% rename from collects/racunit/private/test.rkt rename to collects/rackunit/private/test.rkt index 9c9c7dd..0d6b4e2 100644 --- a/collects/racunit/private/test.rkt +++ b/collects/rackunit/private/test.rkt @@ -16,8 +16,8 @@ (struct-out test-failure) (struct-out test-error) (struct-out test-success) - (struct-out racunit-test-case) - (struct-out racunit-test-suite) + (struct-out rackunit-test-case) + (struct-out rackunit-test-suite) with-check-info with-check-info* @@ -43,9 +43,9 @@ test-suite make-test-suite delay-test - (rename-out [make-racunit-test-case make-test-case] - [racunit-test-case? test-case?] - [racunit-test-suite? test-suite?]) + (rename-out [make-rackunit-test-case make-test-case] + [rackunit-test-case? test-case?] + [rackunit-test-suite? test-suite?]) current-test-name current-test-case-around test-suite-test-case-around diff --git a/collects/racunit/private/text-ui-util.rkt b/collects/rackunit/private/text-ui-util.rkt similarity index 100% rename from collects/racunit/private/text-ui-util.rkt rename to collects/rackunit/private/text-ui-util.rkt diff --git a/collects/racunit/private/util.rkt b/collects/rackunit/private/util.rkt similarity index 100% rename from collects/racunit/private/util.rkt rename to collects/rackunit/private/util.rkt diff --git a/collects/racunit/scribblings/acknowledgements.scrbl b/collects/rackunit/scribblings/acknowledgements.scrbl similarity index 100% rename from collects/racunit/scribblings/acknowledgements.scrbl rename to collects/rackunit/scribblings/acknowledgements.scrbl diff --git a/collects/racunit/scribblings/api.scrbl b/collects/rackunit/scribblings/api.scrbl similarity index 87% rename from collects/racunit/scribblings/api.scrbl rename to collects/rackunit/scribblings/api.scrbl index f99db73..ea3467d 100644 --- a/collects/racunit/scribblings/api.scrbl +++ b/collects/rackunit/scribblings/api.scrbl @@ -3,8 +3,8 @@ @title[#:tag "api"]{RacUnit API} -@defmodule[racunit - #:use-sources (racunit)] +@defmodule[rackunit + #:use-sources (rackunit)] @include-section["overview.scrbl"] @include-section["check.scrbl"] diff --git a/collects/racunit/scribblings/base.rkt b/collects/rackunit/scribblings/base.rkt similarity index 57% rename from collects/racunit/scribblings/base.rkt rename to collects/rackunit/scribblings/base.rkt index 1fc6e25..2f6d278 100644 --- a/collects/racunit/scribblings/base.rkt +++ b/collects/rackunit/scribblings/base.rkt @@ -6,15 +6,15 @@ (for-label scheme/base scheme/contract - racunit - racunit/text-ui - racunit/gui)) + rackunit + rackunit/text-ui + rackunit/gui)) (provide (all-from-out scribble/eval scribble/manual) (for-label (all-from-out scheme/base scheme/contract - racunit - racunit/text-ui - racunit/gui))) + rackunit + rackunit/text-ui + rackunit/gui))) diff --git a/collects/racunit/scribblings/check.scrbl b/collects/rackunit/scribblings/check.scrbl similarity index 100% rename from collects/racunit/scribblings/check.scrbl rename to collects/rackunit/scribblings/check.scrbl diff --git a/collects/racunit/scribblings/compound-testing.scrbl b/collects/rackunit/scribblings/compound-testing.scrbl similarity index 100% rename from collects/racunit/scribblings/compound-testing.scrbl rename to collects/rackunit/scribblings/compound-testing.scrbl diff --git a/collects/racunit/scribblings/control-flow.scrbl b/collects/rackunit/scribblings/control-flow.scrbl similarity index 100% rename from collects/racunit/scribblings/control-flow.scrbl rename to collects/rackunit/scribblings/control-flow.scrbl diff --git a/collects/racunit/scribblings/file-test.rkt b/collects/rackunit/scribblings/file-test.rkt similarity index 95% rename from collects/racunit/scribblings/file-test.rkt rename to collects/rackunit/scribblings/file-test.rkt index ce3df27..9490f87 100644 --- a/collects/racunit/scribblings/file-test.rkt +++ b/collects/rackunit/scribblings/file-test.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require racunit +(require rackunit "file.rkt") (check-equal? (my-+ 1 1) 2) diff --git a/collects/racunit/scribblings/file.rkt b/collects/rackunit/scribblings/file.rkt similarity index 100% rename from collects/racunit/scribblings/file.rkt rename to collects/rackunit/scribblings/file.rkt diff --git a/collects/racunit/scribblings/misc.scrbl b/collects/rackunit/scribblings/misc.scrbl similarity index 91% rename from collects/racunit/scribblings/misc.scrbl rename to collects/rackunit/scribblings/misc.scrbl index 64bd792..f3cdf3b 100644 --- a/collects/racunit/scribblings/misc.scrbl +++ b/collects/rackunit/scribblings/misc.scrbl @@ -17,5 +17,5 @@ especially when mixed with compiled code. Use at your own risk! This example gets @racket[make-failure-test], which is defined in a RacUnit test: @racketblock[ -(require/expose racunit/private/check-test (make-failure-test)) +(require/expose rackunit/private/check-test (make-failure-test)) ] diff --git a/collects/racunit/scribblings/overview.scrbl b/collects/rackunit/scribblings/overview.scrbl similarity index 100% rename from collects/racunit/scribblings/overview.scrbl rename to collects/rackunit/scribblings/overview.scrbl diff --git a/collects/racunit/scribblings/philosophy.scrbl b/collects/rackunit/scribblings/philosophy.scrbl similarity index 100% rename from collects/racunit/scribblings/philosophy.scrbl rename to collects/rackunit/scribblings/philosophy.scrbl diff --git a/collects/racunit/scribblings/quick-start.scrbl b/collects/rackunit/scribblings/quick-start.scrbl similarity index 96% rename from collects/racunit/scribblings/quick-start.scrbl rename to collects/rackunit/scribblings/quick-start.scrbl index af4dc31..a7088ed 100644 --- a/collects/racunit/scribblings/quick-start.scrbl +++ b/collects/rackunit/scribblings/quick-start.scrbl @@ -32,7 +32,7 @@ RacUnit and @tt{file.rkt}: @racketmod[ racket/base -(require racunit +(require rackunit "file.rkt") ] @@ -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) -------------------- @@ -153,7 +153,7 @@ will do for our example). In @tt{file-test.rkt} add the following lines: @racketblock[ - (require racunit/text-ui) + (require rackunit/text-ui) (run-tests file-tests) ] diff --git a/collects/racunit/scribblings/racunit.scrbl b/collects/rackunit/scribblings/rackunit.scrbl similarity index 100% rename from collects/racunit/scribblings/racunit.scrbl rename to collects/rackunit/scribblings/rackunit.scrbl diff --git a/collects/racunit/scribblings/release-notes.scrbl b/collects/rackunit/scribblings/release-notes.scrbl similarity index 100% rename from collects/racunit/scribblings/release-notes.scrbl rename to collects/rackunit/scribblings/release-notes.scrbl diff --git a/collects/racunit/scribblings/ui.scrbl b/collects/rackunit/scribblings/ui.scrbl similarity index 90% rename from collects/racunit/scribblings/ui.scrbl rename to collects/rackunit/scribblings/ui.scrbl index 460965d..3015f1d 100644 --- a/collects/racunit/scribblings/ui.scrbl +++ b/collects/rackunit/scribblings/ui.scrbl @@ -7,9 +7,9 @@ RacUnit provides a textual and a graphical user interface @section{Textual User Interface} -@defmodule[racunit/text-ui] +@defmodule[rackunit/text-ui] -The textual UI is in the @racketmodname[racunit/text-ui] module. +The textual UI is in the @racketmodname[rackunit/text-ui] module. It is run via the @racket[run-tests] function. @defproc[(run-tests (test (or/c test-case? test-suite?)) @@ -33,10 +33,10 @@ information. @section{Graphical User Interface} -@defmodule[racunit/gui] +@defmodule[rackunit/gui] RacUnit also provides a GUI test runner, available from the -@racketmodname[racunit/gui] module. +@racketmodname[rackunit/gui] module. @defproc[(test/gui [test (or/c test-case? test-suite?)] ...) any]{ diff --git a/collects/racunit/text-ui.rkt b/collects/rackunit/text-ui.rkt similarity index 100% rename from collects/racunit/text-ui.rkt rename to collects/rackunit/text-ui.rkt diff --git a/collects/racunit/tool.rkt b/collects/rackunit/tool.rkt similarity index 97% rename from collects/racunit/tool.rkt rename to collects/rackunit/tool.rkt index d725be0..20bfd5e 100644 --- a/collects/racunit/tool.rkt +++ b/collects/rackunit/tool.rkt @@ -11,7 +11,7 @@ ;; CONSTANTS (define BACKTRACE-NO-MESSAGE "No message.") -(define LINK-MODULE-SPEC 'racunit/private/gui/drracket-link) +(define LINK-MODULE-SPEC 'rackunit/private/gui/drracket-link) (define-namespace-anchor drracket-ns-anchor) diff --git a/collects/schemeunit/gui.rkt b/collects/schemeunit/gui.rkt index bd856a0..c0352c6 100644 --- a/collects/schemeunit/gui.rkt +++ b/collects/schemeunit/gui.rkt @@ -1,3 +1,3 @@ #lang racket -(require racunit/gui) -(provide (all-from-out racunit/gui)) +(require rackunit/gui) +(provide (all-from-out rackunit/gui)) diff --git a/collects/schemeunit/text-ui.rkt b/collects/schemeunit/text-ui.rkt index 619faa2..d99ee6f 100644 --- a/collects/schemeunit/text-ui.rkt +++ b/collects/schemeunit/text-ui.rkt @@ -1,3 +1,3 @@ #lang racket -(require racunit/text-ui) -(provide (all-from-out racunit/text-ui)) +(require rackunit/text-ui) +(provide (all-from-out rackunit/text-ui)) diff --git a/collects/tests/racunit/all-racunit-tests.rkt b/collects/tests/rackunit/all-rackunit-tests.rkt similarity index 94% rename from collects/tests/racunit/all-racunit-tests.rkt rename to collects/tests/rackunit/all-rackunit-tests.rkt index 2151ae4..2cb4b03 100644 --- a/collects/tests/racunit/all-racunit-tests.rkt +++ b/collects/tests/rackunit/all-rackunit-tests.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racunit +(require rackunit "check-test.rkt" "check-info-test.rkt" "format-test.rkt" @@ -17,10 +17,10 @@ "counter-test.rkt" "text-ui-util-test.rkt") -(provide all-racunit-tests +(provide all-rackunit-tests failure-tests) -(define all-racunit-tests +(define all-rackunit-tests (test-suite "All RacUnit Tests" check-tests diff --git a/collects/tests/racunit/base-test.rkt b/collects/tests/rackunit/base-test.rkt similarity index 80% rename from collects/tests/racunit/base-test.rkt rename to collects/tests/rackunit/base-test.rkt index fe7b256..78fbce6 100644 --- a/collects/tests/racunit/base-test.rkt +++ b/collects/tests/rackunit/base-test.rkt @@ -28,8 +28,8 @@ #lang racket/base -(require racunit - racunit/private/base) +(require rackunit + rackunit/private/base) (provide base-tests) @@ -37,45 +37,45 @@ (test-suite "All tests for base" (test-case - "racunit-test-case structure has a contract on name" + "rackunit-test-case structure has a contract on name" (check-exn exn:fail? (lambda () - (make-racunit-test-case + (make-rackunit-test-case 'foo (lambda () #t))))) (test-case - "racunit-test-case structure has a contract on action" + "rackunit-test-case structure has a contract on action" (check-exn exn:fail? (lambda () - (make-racunit-test-case + (make-rackunit-test-case "Name" #f)))) (test-case - "racunit-test-suite has a contract on its fields" + "rackunit-test-suite has a contract on its fields" (check-exn exn:fail? (lambda () - (make-racunit-test-suite + (make-rackunit-test-suite #f (list) (lambda () 3) (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-racunit-test-suite + (make-rackunit-test-suite "Name" #f (lambda () 3) (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-racunit-test-suite + (make-rackunit-test-suite "Name" (list) #f (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-racunit-test-suite + (make-rackunit-test-suite "Name" (list) (lambda () 3) diff --git a/collects/tests/racunit/check-info-test.rkt b/collects/tests/rackunit/check-info-test.rkt similarity index 98% rename from collects/tests/racunit/check-info-test.rkt rename to collects/tests/rackunit/check-info-test.rkt index 9b0ff44..a95ffe6 100644 --- a/collects/tests/racunit/check-info-test.rkt +++ b/collects/tests/rackunit/check-info-test.rkt @@ -27,8 +27,8 @@ #lang racket/base -(require racunit - racunit/private/check-info) +(require rackunit + rackunit/private/check-info) (provide check-info-tests) diff --git a/collects/tests/racunit/check-test.rkt b/collects/tests/rackunit/check-test.rkt similarity index 98% rename from collects/tests/racunit/check-test.rkt rename to collects/tests/rackunit/check-test.rkt index 1ca69fc..53fe998 100644 --- a/collects/tests/racunit/check-test.rkt +++ b/collects/tests/rackunit/check-test.rkt @@ -30,10 +30,10 @@ (require racket/runtime-path srfi/1 - racunit - racunit/private/check - racunit/private/result - racunit/private/test-suite) + rackunit + rackunit/private/check + rackunit/private/result + rackunit/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 'racunit/private/check) + (namespace-require 'rackunit/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/racunit/counter-test.rkt b/collects/tests/rackunit/counter-test.rkt similarity index 93% rename from collects/tests/racunit/counter-test.rkt rename to collects/tests/rackunit/counter-test.rkt index 2d32f79..6dd58e2 100644 --- a/collects/tests/racunit/counter-test.rkt +++ b/collects/tests/rackunit/counter-test.rkt @@ -28,10 +28,10 @@ #lang racket/base (require racket/match - racunit - racunit/private/counter - racunit/private/monad - racunit/private/hash-monad) + rackunit + rackunit/private/counter + rackunit/private/monad + rackunit/private/hash-monad) (provide counter-tests) diff --git a/collects/tests/racunit/format-test.rkt b/collects/tests/rackunit/format-test.rkt similarity index 86% rename from collects/tests/racunit/format-test.rkt rename to collects/tests/rackunit/format-test.rkt index 6adc10a..27bae18 100644 --- a/collects/tests/racunit/format-test.rkt +++ b/collects/tests/rackunit/format-test.rkt @@ -1,8 +1,8 @@ #lang racket/base -(require racunit - racunit/private/check-info - racunit/private/format) +(require rackunit + rackunit/private/check-info + rackunit/private/format) (provide format-tests) diff --git a/collects/tests/racunit/hash-monad-test.rkt b/collects/tests/rackunit/hash-monad-test.rkt similarity index 95% rename from collects/tests/racunit/hash-monad-test.rkt rename to collects/tests/rackunit/hash-monad-test.rkt index 6326802..0577962 100644 --- a/collects/tests/racunit/hash-monad-test.rkt +++ b/collects/tests/rackunit/hash-monad-test.rkt @@ -28,9 +28,9 @@ #lang racket/base -(require racunit - racunit/private/monad - racunit/private/hash-monad) +(require rackunit + rackunit/private/monad + rackunit/private/hash-monad) (provide hash-monad-tests) diff --git a/collects/tests/racunit/location-test.rkt b/collects/tests/rackunit/location-test.rkt similarity index 98% rename from collects/tests/racunit/location-test.rkt rename to collects/tests/rackunit/location-test.rkt index 35740c6..47fdc72 100644 --- a/collects/tests/racunit/location-test.rkt +++ b/collects/tests/rackunit/location-test.rkt @@ -27,8 +27,8 @@ ;; Commentary: #lang racket/base -(require racunit - racunit/private/location) +(require rackunit + rackunit/private/location) (provide location-tests) diff --git a/collects/tests/racunit/monad-test.rkt b/collects/tests/rackunit/monad-test.rkt similarity index 98% rename from collects/tests/racunit/monad-test.rkt rename to collects/tests/rackunit/monad-test.rkt index 0672e87..5e43d4b 100644 --- a/collects/tests/racunit/monad-test.rkt +++ b/collects/tests/rackunit/monad-test.rkt @@ -29,8 +29,8 @@ #lang racket/base -(require racunit - racunit/private/monad) +(require rackunit + rackunit/private/monad) (provide monad-tests) diff --git a/collects/tests/racunit/result-test.rkt b/collects/tests/rackunit/result-test.rkt similarity index 95% rename from collects/tests/racunit/result-test.rkt rename to collects/tests/rackunit/result-test.rkt index a633fb4..f9bd3f8 100644 --- a/collects/tests/racunit/result-test.rkt +++ b/collects/tests/rackunit/result-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require racunit - racunit/private/result) +(require rackunit + rackunit/private/result) (provide result-tests) diff --git a/collects/tests/racunit/run-tests.rkt b/collects/tests/rackunit/run-tests.rkt similarity index 74% rename from collects/tests/racunit/run-tests.rkt rename to collects/tests/rackunit/run-tests.rkt index 45c8ccc..18553fc 100644 --- a/collects/tests/racunit/run-tests.rkt +++ b/collects/tests/rackunit/run-tests.rkt @@ -1,10 +1,10 @@ #lang racket/base -(require racunit - racunit/text-ui - "all-racunit-tests.rkt") +(require rackunit + rackunit/text-ui + "all-rackunit-tests.rkt") -(run-tests all-racunit-tests) +(run-tests all-rackunit-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/racunit/standalone-check-test.rkt b/collects/tests/rackunit/standalone-check-test.rkt similarity index 98% rename from collects/tests/racunit/standalone-check-test.rkt rename to collects/tests/rackunit/standalone-check-test.rkt index 454bfe9..6187e38 100644 --- a/collects/tests/racunit/standalone-check-test.rkt +++ b/collects/tests/rackunit/standalone-check-test.rkt @@ -31,7 +31,7 @@ #lang racket/base -(require racunit/private/check) +(require rackunit/private/check) ;; This check should succeed (check = 1 1 0.0) diff --git a/collects/tests/racunit/standalone-test-case-test.rkt b/collects/tests/rackunit/standalone-test-case-test.rkt similarity index 87% rename from collects/tests/racunit/standalone-test-case-test.rkt rename to collects/tests/rackunit/standalone-test-case-test.rkt index 018bd46..3398469 100644 --- a/collects/tests/racunit/standalone-test-case-test.rkt +++ b/collects/tests/rackunit/standalone-test-case-test.rkt @@ -4,8 +4,8 @@ #lang racket/base -(require racunit/private/check - racunit/private/test-case) +(require rackunit/private/check + rackunit/private/test-case) ;; These tests should succeeds (test-begin (check-eq? 1 1)) diff --git a/collects/tests/racunit/test-case-test.rkt b/collects/tests/rackunit/test-case-test.rkt similarity index 85% rename from collects/tests/racunit/test-case-test.rkt rename to collects/tests/rackunit/test-case-test.rkt index 07ca05f..695ce35 100644 --- a/collects/tests/racunit/test-case-test.rkt +++ b/collects/tests/rackunit/test-case-test.rkt @@ -1,10 +1,10 @@ #lang racket/base -(require racunit/private/base - racunit/private/check - racunit/private/test-case - racunit/private/test-suite - racunit/private/result) +(require rackunit/private/base + rackunit/private/check + rackunit/private/test-case + rackunit/private/test-suite + rackunit/private/result) (provide test-case-tests) diff --git a/collects/tests/racunit/test-suite-test.rkt b/collects/tests/rackunit/test-suite-test.rkt similarity index 97% rename from collects/tests/racunit/test-suite-test.rkt rename to collects/tests/rackunit/test-suite-test.rkt index 0d1ed9d..62a4798 100644 --- a/collects/tests/racunit/test-suite-test.rkt +++ b/collects/tests/rackunit/test-suite-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require racunit - racunit/private/check) +(require rackunit + rackunit/private/check) (define run? #f) diff --git a/collects/tests/racunit/test-test.rkt b/collects/tests/rackunit/test-test.rkt similarity index 98% rename from collects/tests/racunit/test-test.rkt rename to collects/tests/rackunit/test-test.rkt index 148a685..c7058ee 100644 --- a/collects/tests/racunit/test-test.rkt +++ b/collects/tests/rackunit/test-test.rkt @@ -4,9 +4,9 @@ racket/runtime-path srfi/1 srfi/13 - racunit - racunit/private/util - racunit/private/location) + rackunit + rackunit/private/util + rackunit/private/location) (provide test-tests) @@ -43,7 +43,7 @@ (let ((destns (make-base-namespace)) (cns (current-namespace))) (parameterize ((current-namespace destns)) - (namespace-require 'racunit) + (namespace-require 'rackunit) (check-exn (lambda (e) (check-pred exn:fail:syntax? e) (check string-contains (exn-message e) msg)) diff --git a/collects/tests/racunit/text-ui-test.rkt b/collects/tests/rackunit/text-ui-test.rkt similarity index 99% rename from collects/tests/racunit/text-ui-test.rkt rename to collects/tests/rackunit/text-ui-test.rkt index 11ee469..8716bc2 100644 --- a/collects/tests/racunit/text-ui-test.rkt +++ b/collects/tests/rackunit/text-ui-test.rkt @@ -33,8 +33,8 @@ racket/port srfi/1 srfi/13 - racunit - racunit/text-ui) + rackunit + rackunit/text-ui) (provide text-ui-tests) diff --git a/collects/tests/racunit/text-ui-util-test.rkt b/collects/tests/rackunit/text-ui-util-test.rkt similarity index 96% rename from collects/tests/racunit/text-ui-util-test.rkt rename to collects/tests/rackunit/text-ui-util-test.rkt index 931845f..901f6ee 100644 --- a/collects/tests/racunit/text-ui-util-test.rkt +++ b/collects/tests/rackunit/text-ui-util-test.rkt @@ -27,8 +27,8 @@ ;; Commentary: #lang racket/base -(require racunit - racunit/private/text-ui-util) +(require rackunit + rackunit/private/text-ui-util) (provide text-ui-util-tests) diff --git a/collects/tests/racunit/util-test.rkt b/collects/tests/rackunit/util-test.rkt similarity index 93% rename from collects/tests/racunit/util-test.rkt rename to collects/tests/rackunit/util-test.rkt index bc054cc..eefedb7 100644 --- a/collects/tests/racunit/util-test.rkt +++ b/collects/tests/rackunit/util-test.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require racunit - racunit/private/util) +(require rackunit + rackunit/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 racunit-test-case? + (check-pred rackunit-test-case? (delay-test (make-failure-test "foo" string?))))) (test-case