From 7b14a1f585d368bca8967072fbf3530d568e1391 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 17 May 2010 11:04:55 -0400 Subject: [PATCH] "Racunit" -> "Rackunit" --- collects/2htdp/tests/batch-io.rkt | 2 +- collects/2htdp/tests/test-image.rkt | 2 +- collects/meta/dist-specs.rkt | 8 ++-- collects/meta/props | 26 +++++------ .../parser-tools/private-lex/error-tests.rkt | 2 +- collects/{racunit => rackunit}/gui.rkt | 2 +- collects/{racunit => rackunit}/info.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/gvector.rkt | 0 .../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/running-tests.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/main.rkt | 4 +- collects/schemeunit/text-ui.rkt | 4 +- .../guide/contracts-examples/1-test.rkt | 2 +- .../guide/contracts-examples/2-test.rkt | 2 +- .../guide/contracts-examples/3-test.rkt | 2 +- .../guide/contracts-examples/5-test.rkt | 2 +- collects/tests/deinprogramm/contract.rkt | 2 +- collects/tests/deinprogramm/image.rkt | 2 +- .../tests/deinprogramm/run-contract-tests.rkt | 2 +- .../tests/deinprogramm/run-image-test.rkt | 2 +- collects/tests/future/future.rkt | 2 +- collects/tests/html/test.rkt | 4 +- collects/tests/info.rkt | 2 +- collects/tests/macro-debugger/all-tests.rkt | 4 +- collects/tests/macro-debugger/gentests.rkt | 2 +- .../tests/macro-debugger/tests/collects.rkt | 4 +- .../tests/macro-debugger/tests/hiding.rkt | 2 +- .../tests/macro-debugger/tests/policy.rkt | 2 +- .../tests/macro-debugger/tests/regression.rkt | 2 +- collects/tests/match/examples.rkt | 2 +- collects/tests/match/match-tests.rkt | 2 +- collects/tests/match/other-plt-tests.rkt | 2 +- collects/tests/match/other-tests.rkt | 2 +- collects/tests/match/plt-match-tests.rkt | 2 +- collects/tests/plai/test-random-mutator.rkt | 2 +- collects/tests/racket/contract-opt-tests.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 +-- collects/tests/raclog/bible.rkt | 2 +- collects/tests/raclog/england.rkt | 2 +- collects/tests/raclog/games.rkt | 2 +- collects/tests/srfi/1/alist-test.rkt | 2 +- collects/tests/srfi/1/all-1-tests.rkt | 2 +- collects/tests/srfi/1/cons-test.rkt | 2 +- collects/tests/srfi/1/delete-test.rkt | 2 +- collects/tests/srfi/1/filter-test.rkt | 2 +- collects/tests/srfi/1/fold-test.rkt | 2 +- collects/tests/srfi/1/lset-test.rkt | 2 +- collects/tests/srfi/1/misc-test.rkt | 2 +- collects/tests/srfi/1/predicate-test.rkt | 2 +- collects/tests/srfi/1/run-tests.rktl | 4 +- collects/tests/srfi/1/search-test.rkt | 2 +- collects/tests/srfi/1/selector-test.rkt | 2 +- collects/tests/srfi/13/string-test.rkt | 2 +- collects/tests/srfi/14/char-set-test.rkt | 2 +- collects/tests/srfi/19/tests.rkt | 4 +- collects/tests/srfi/2/and-let-test.rkt | 2 +- collects/tests/srfi/26/cut-test.rkt | 2 +- collects/tests/srfi/4/srfi-4-test.rkt | 4 +- collects/tests/srfi/40/all-srfi-40-tests.rkt | 2 +- collects/tests/srfi/40/run-tests.rktl | 4 +- collects/tests/srfi/43/all-srfi-43-tests.rkt | 2 +- collects/tests/srfi/43/constructor-tests.rkt | 2 +- collects/tests/srfi/43/conversion-tests.rkt | 2 +- collects/tests/srfi/43/iteration-tests.rkt | 2 +- collects/tests/srfi/43/mutator-tests.rkt | 2 +- collects/tests/srfi/43/predicate-tests.rkt | 2 +- collects/tests/srfi/43/run-tests.rktl | 4 +- collects/tests/srfi/43/searching-tests.rkt | 2 +- collects/tests/srfi/69/hash-tests.rkt | 2 +- collects/tests/srfi/all-srfi-tests.rkt | 2 +- collects/tests/srfi/run-tests.rkt | 4 +- collects/tests/stxparse/more-tests.rkt | 2 +- collects/tests/stxparse/select.rkt | 2 +- collects/tests/stxparse/stxclass.rkt | 2 +- collects/tests/stxparse/test.rkt | 2 +- collects/tests/typed-scheme/main.rkt | 2 +- .../succeed/{racunit.ss => rackunit.ss} | 2 +- .../typed-scheme/unit-tests/all-tests.rkt | 4 +- .../unit-tests/contract-tests.rkt | 2 +- .../typed-scheme/unit-tests/infer-tests.rkt | 2 +- .../typed-scheme/unit-tests/module-tests.rkt | 2 +- .../unit-tests/parse-type-tests.rkt | 2 +- .../unit-tests/planet-requires.rkt | 8 ++-- .../unit-tests/remove-intersect-tests.rkt | 2 +- .../typed-scheme/unit-tests/subst-tests.rkt | 2 +- .../typed-scheme/unit-tests/subtype-tests.rkt | 2 +- .../typed-scheme/unit-tests/test-utils.rkt | 6 +-- .../unit-tests/type-annotation-test.rkt | 2 +- .../unit-tests/type-equal-tests.rkt | 2 +- .../unit-tests/typecheck-tests.rkt | 2 +- .../tests/web-server/all-web-server-tests.rkt | 2 +- .../configuration/all-configuration-tests.rkt | 2 +- .../configuration-table-test.rkt | 2 +- collects/tests/web-server/dispatch-test.rkt | 4 +- .../dispatchers/all-dispatchers-tests.rkt | 2 +- .../dispatchers/dispatch-files-test.rkt | 4 +- .../dispatchers/dispatch-host-test.rkt | 2 +- .../dispatchers/dispatch-lang-test.rkt | 4 +- .../dispatchers/dispatch-passwords-test.rkt | 2 +- .../dispatchers/dispatch-servlets-test.rkt | 2 +- .../dispatchers/filesystem-map-test.rkt | 2 +- .../dispatchers/servlet-test-util.rkt | 2 +- collects/tests/web-server/formlets-test.rkt | 4 +- .../tests/web-server/http/all-http-tests.rkt | 2 +- .../tests/web-server/http/cookies-test.rkt | 4 +- .../web-server/http/digest-auth-test.rkt | 2 +- collects/tests/web-server/lang-test.rkt | 2 +- .../web-server/lang/abort-resume-test.rkt | 4 +- .../tests/web-server/lang/all-lang-tests.rkt | 2 +- .../tests/web-server/lang/anormal-test.rkt | 2 +- collects/tests/web-server/lang/defun-test.rkt | 2 +- .../tests/web-server/lang/file-box-test.rkt | 2 +- .../tests/web-server/lang/labels-test.rkt | 2 +- .../tests/web-server/lang/stuff-url-test.rkt | 2 +- .../tests/web-server/lang/web-param-test.rkt | 2 +- .../managers/all-managers-tests.rkt | 2 +- .../web-server/private/all-private-tests.rkt | 2 +- .../web-server/private/cache-table-test.rkt | 4 +- .../private/connection-manager-test.rkt | 2 +- .../private/define-closure-test.rkt | 2 +- .../tests/web-server/private/gzip-test.rkt | 2 +- .../web-server/private/mime-types-test.rkt | 2 +- .../tests/web-server/private/mod-map-test.rkt | 2 +- .../tests/web-server/private/request-test.rkt | 2 +- .../web-server/private/response-test.rkt | 2 +- .../web-server/private/url-param-test.rkt | 2 +- .../tests/web-server/private/util-test.rkt | 2 +- collects/tests/web-server/run-all-tests.rkt | 2 +- .../tests/web-server/servlet-env-test.rkt | 2 +- .../web-server/servlet/all-servlet-tests.rkt | 2 +- .../web-server/servlet/basic-auth-test.rkt | 2 +- .../web-server/servlet/bindings-test.rkt | 2 +- .../tests/web-server/servlet/helpers-test.rkt | 4 +- .../tests/web-server/servlet/web-test.rkt | 2 +- collects/tests/web-server/stuffers-test.rkt | 4 +- collects/tests/xml/test-clark.rkt | 4 +- collects/tests/xml/test.rkt | 4 +- collects/typed/rackunit.rkt | 3 ++ collects/typed/{racunit => rackunit}/gui.rkt | 4 +- collects/typed/{racunit => rackunit}/main.rkt | 42 +++++++++--------- .../typed/{racunit => rackunit}/text-ui.rkt | 6 +-- .../{racunit => rackunit}/type-env-ext.rkt | 8 ++-- collects/typed/racunit.rkt | 3 -- 206 files changed, 349 insertions(+), 347 deletions(-) rename collects/{racunit => rackunit}/gui.rkt (83%) rename collects/{racunit => rackunit}/info.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/gvector.rkt (100%) 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/running-tests.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%) rename collects/tests/typed-scheme/succeed/{racunit.ss => rackunit.ss} (93%) create mode 100644 collects/typed/rackunit.rkt rename collects/typed/{racunit => rackunit}/gui.rkt (79%) rename collects/typed/{racunit => rackunit}/main.rkt (84%) rename collects/typed/{racunit => rackunit}/text-ui.rkt (77%) rename collects/typed/{racunit => rackunit}/type-env-ext.rkt (74%) delete mode 100644 collects/typed/racunit.rkt diff --git a/collects/2htdp/tests/batch-io.rkt b/collects/2htdp/tests/batch-io.rkt index a44e391b89..6e87fb4643 100644 --- a/collects/2htdp/tests/batch-io.rkt +++ b/collects/2htdp/tests/batch-io.rkt @@ -1,6 +1,6 @@ #lang scheme/load -(require racunit) +(require rackunit) (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 e53be1f265..0ab737ff2f 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 - racunit + rackunit (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 b94fcc6d87..a37e08bf31 100644 --- a/collects/meta/dist-specs.rkt +++ b/collects/meta/dist-specs.rkt @@ -618,8 +618,8 @@ dr-extras :+= (package: "typed-scheme/" ; used in drracket #:docs "ts-{reference|guide}/") (- (collects: "typed/") (cond (not plt) => (collects: "typed/test-engine/") - (collects: "typed/racunit/") - (srcfile: "typed/racunit.rkt"))) + (collects: "typed/rackunit/") + (srcfile: "typed/rackunit.rkt"))) ;; -------------------- gui-debugger plt-extras :+= (collects: "gui-debugger/") @@ -669,9 +669,11 @@ mz-extras :+= (- (package: "unstable") ;; -------------------- plai plt-extras :+= (package: "plai/") -plt-extras :+= (package: "racunit/") +;; -------------------- rackunit & older schemeunit compatibility +plt-extras :+= (package: "rackunit/") plt-extras :+= (package: "schemeunit/") +;; -------------------- raclog (aka schelog) plt-extras :+= (package: "raclog/") ;; ============================================================================ diff --git a/collects/meta/props b/collects/meta/props index c8074f70aa..b578d821bf 100755 --- a/collects/meta/props +++ b/collects/meta/props @@ -1157,16 +1157,16 @@ path/s is either such a string or a list of them. "collects/raco" responsible (mflatt) "collects/raco/main.rkt" drdr:command-line #f "collects/raco/raco.rkt" drdr:command-line #f -"collects/racunit" responsible (jay noel ryanc) -"collects/racunit/gui.rkt" responsible (ryanc) drdr:command-line (gracket-text "-t" *) -"collects/racunit/private/gui" responsible (ryanc) -"collects/racunit/private/gui/config.rkt" drdr:command-line (gracket-text "-t" *) -"collects/racunit/private/gui/controller.rkt" drdr:command-line (gracket-text "-t" *) -"collects/racunit/private/gui/gui.rkt" drdr:command-line (gracket-text "-t" *) -"collects/racunit/private/gui/model2rml.rkt" drdr:command-line (gracket-text "-t" *) -"collects/racunit/private/gui/rml.rkt" drdr:command-line (gracket-text "-t" *) -"collects/racunit/private/gui/view.rkt" drdr:command-line (gracket-text "-t" *) -"collects/racunit/tool.rkt" responsible (ryanc) drdr:command-line (gracket-text "-t" *) +"collects/rackunit" responsible (jay noel ryanc) +"collects/rackunit/gui.rkt" responsible (ryanc) drdr:command-line (gracket-text "-t" *) +"collects/rackunit/private/gui" responsible (ryanc) +"collects/rackunit/private/gui/config.rkt" drdr:command-line (gracket-text "-t" *) +"collects/rackunit/private/gui/controller.rkt" drdr:command-line (gracket-text "-t" *) +"collects/rackunit/private/gui/gui.rkt" drdr:command-line (gracket-text "-t" *) +"collects/rackunit/private/gui/model2rml.rkt" drdr:command-line (gracket-text "-t" *) +"collects/rackunit/private/gui/rml.rkt" drdr:command-line (gracket-text "-t" *) +"collects/rackunit/private/gui/view.rkt" drdr:command-line (gracket-text "-t" *) +"collects/rackunit/tool.rkt" responsible (ryanc) drdr:command-line (gracket-text "-t" *) "collects/reader" responsible (mflatt) "collects/readline" responsible (mflatt) "collects/redex" responsible (clklein) @@ -1675,7 +1675,7 @@ path/s is either such a string or a list of them. "collects/tests/racket/zo-marshal.rktl" drdr:command-line #f "collects/tests/racket/ztest.rktl" drdr:command-line #f "collects/tests/raclog" responsible (jay) -"collects/tests/racunit" responsible (jay noel) +"collects/tests/rackunit" responsible (jay noel) "collects/tests/run-automated-tests.rkt" drdr:command-line (mzc "-k" *) drdr:timeout 600 "collects/tests/scribble" responsible (eli mflatt) "collects/tests/slatex" responsible (jay sstrickl) @@ -1773,8 +1773,8 @@ path/s is either such a string or a list of them. "collects/typed/framework/framework.rkt" drdr:command-line (gracket-text "-t" *) "collects/typed/framework/prefs-contract.rkt" drdr:command-line (gracket-text "-t" *) "collects/typed/mred/mred.rkt" drdr:command-line (gracket-text "-t" *) -"collects/typed/racunit" responsible (jay) -"collects/typed/racunit/gui.rkt" drdr:command-line (gracket "-t" *) +"collects/typed/rackunit" responsible (jay) +"collects/typed/rackunit/gui.rkt" drdr:command-line (gracket "-t" *) "collects/typed-scheme" responsible (samth) "collects/unstable" responsible (jay samth cce ryanc) "collects/unstable/debug.rkt" responsible (samth) diff --git a/collects/parser-tools/private-lex/error-tests.rkt b/collects/parser-tools/private-lex/error-tests.rkt index 92307f8633..0c976601c0 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" - racunit) + rackunit) (define-syntax (catch-syn-error stx) (syntax-case stx () 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 8daff1a5a4..4238316dd3 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/info.rkt b/collects/rackunit/info.rkt similarity index 83% rename from collects/racunit/info.rkt rename to collects/rackunit/info.rkt index a12d54d758..00330f9169 100644 --- a/collects/racunit/info.rkt +++ b/collects/rackunit/info.rkt @@ -5,7 +5,7 @@ (define blurb '((p "RacUnit is a unit testing framework based on the " " Extreme Programming unit test frameworks"))) -(define scribblings '(("scribblings/racunit.scrbl" (multi-page) (tool)))) +(define scribblings '(("scribblings/rackunit.scrbl" (multi-page) (tool)))) (define tools '[("tool.rkt")]) (define tool-names '["RacUnit DrRacket integration"]) 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 6809635198..4570be0b7f 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 de98d71bf2..f518b5e3ec 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 1d843d9a79..de80e95e9c 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 46a08349b3..5e62687b02 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 e5a5c4178c..a987036a8b 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/gvector.rkt b/collects/rackunit/private/gui/gvector.rkt similarity index 100% rename from collects/racunit/private/gui/gvector.rkt rename to collects/rackunit/private/gui/gvector.rkt 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 1b2b65b875..596f028864 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 e3ab4357c3..4cead96370 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 208b39d191..fc5309ab66 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 4b3aa1d5b1..38a2c70750 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 9c9c7dd6a7..0d6b4e2ae7 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 f99db734c4..ea3467d88f 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 1fc6e255b0..2f6d278163 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 ce3df2728c..9490f87e19 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 64bd792094..f3cdf3bf35 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 af4dc31e7c..a7088ed85a 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/running-tests.scrbl b/collects/rackunit/scribblings/running-tests.scrbl similarity index 100% rename from collects/racunit/scribblings/running-tests.scrbl rename to collects/rackunit/scribblings/running-tests.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 460965d870..3015f1d8d0 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 d725be0ee8..20bfd5ecac 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 bd856a0e35..c0352c651e 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/main.rkt b/collects/schemeunit/main.rkt index 89c8f2ce32..cf3685c786 100644 --- a/collects/schemeunit/main.rkt +++ b/collects/schemeunit/main.rkt @@ -1,3 +1,3 @@ #lang racket -(require racunit) -(provide (all-from-out racunit)) +(require rackunit) +(provide (all-from-out rackunit)) diff --git a/collects/schemeunit/text-ui.rkt b/collects/schemeunit/text-ui.rkt index 619faa294a..d99ee6fffd 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/scribblings/guide/contracts-examples/1-test.rkt b/collects/scribblings/guide/contracts-examples/1-test.rkt index 8e1fe62059..e244da8322 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 racunit racunit/text-ui "1.ss" "1b.ss") +(require rackunit rackunit/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 68b5379e97..684722a1be 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 racunit racunit/text-ui "2.ss") +(require rackunit rackunit/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 65752e94fe..e357f8d76a 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 racunit racunit/text-ui "3.ss") +(require rackunit rackunit/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 8498c7696a..d903372040 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 racunit racunit/text-ui "5.ss") +(require rackunit rackunit/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 95519fba1b..7712672b8d 100644 --- a/collects/tests/deinprogramm/contract.rkt +++ b/collects/tests/deinprogramm/contract.rkt @@ -2,7 +2,7 @@ (provide all-contract-tests) -(require racunit +(require rackunit 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 86cd7cea68..4bb2cc43b5 100644 --- a/collects/tests/deinprogramm/image.rkt +++ b/collects/tests/deinprogramm/image.rkt @@ -2,7 +2,7 @@ (provide all-image-tests) -(require racunit +(require rackunit 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 bae75000fc..a03fd712c0 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 racunit/text-ui) +(require rackunit/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 d2d75a6c7d..ae342bf41e 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 racunit/text-ui) +(require rackunit/text-ui) (require tests/deinprogramm/image) (run-tests all-image-tests) diff --git a/collects/tests/future/future.rkt b/collects/tests/future/future.rkt index aabc41015d..443bab692f 100644 --- a/collects/tests/future/future.rkt +++ b/collects/tests/future/future.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/future - racunit) + rackunit) #|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 4981462c61..b2d937f4fd 100644 --- a/collects/tests/html/test.rkt +++ b/collects/tests/html/test.rkt @@ -1,6 +1,6 @@ #lang racket -(require racunit - racunit/text-ui +(require rackunit + rackunit/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 88b8f23193..06301d095f 100644 --- a/collects/tests/info.rkt +++ b/collects/tests/info.rkt @@ -21,7 +21,7 @@ "plot" "profj" "r6rs" - "racunit" + "rackunit" "srfi" "srpersist" "stepper" diff --git a/collects/tests/macro-debugger/all-tests.rkt b/collects/tests/macro-debugger/all-tests.rkt index 577eb8d5e7..ec20b784ed 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 racunit - racunit/gui) +(require rackunit + rackunit/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 55c6e24d2a..5d4e1c13db 100644 --- a/collects/tests/macro-debugger/gentests.rkt +++ b/collects/tests/macro-debugger/gentests.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require racunit) +(require rackunit) (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 fff6426ea2..d4f6531193 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 racunit - racunit/gui) +(require rackunit + rackunit/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 941c093320..376bbfa2f0 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 racunit) +(require rackunit) (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 757de46997..2abc459904 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 racunit) +(require rackunit) (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 c4c92366b3..7e0883770d 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 racunit) +(require rackunit) (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 f8ce7d8c07..c26f811a67 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) - racunit) + rackunit) (define-syntax (comp stx) (syntax-case stx () diff --git a/collects/tests/match/match-tests.rkt b/collects/tests/match/match-tests.rkt index 67ac65e00b..8eb873dc3c 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 racunit) + (require mzlib/match rackunit) (provide match-tests) diff --git a/collects/tests/match/other-plt-tests.rkt b/collects/tests/match/other-plt-tests.rkt index 1407614be4..8ca39c2723 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 racunit net/uri-codec mzlib/pregexp mzlib/plt-match + (require rackunit 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 174b957ccb..f32005ae5e 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 racunit) + (require mzlib/match rackunit) (provide other-tests) diff --git a/collects/tests/match/plt-match-tests.rkt b/collects/tests/match/plt-match-tests.rkt index e707ada4ec..a8b9b14657 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" - racunit racunit/text-ui) + rackunit rackunit/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 988d3603d3..ec74cfad89 100644 --- a/collects/tests/plai/test-random-mutator.rkt +++ b/collects/tests/plai/test-random-mutator.rkt @@ -1,5 +1,5 @@ #lang scheme -(require racunit +(require rackunit 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 892e90b0ac..98aadb8cba 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 - racunit - racunit/text-ui) + rackunit + rackunit/text-ui) (define (exn:fail:contract-violation? exn) (if (regexp-match #rx"broke" (exn-message exn)) #t #f)) 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 2151ae40a8..2cb4b033b5 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 fe7b256add..78fbce689e 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 9b0ff44d9b..a95ffe6ca4 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 1ca69fc04a..53fe998609 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 2d32f79838..6dd58e2855 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 6adc10a8b9..27bae183ee 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 63268021cd..05779623d0 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 35740c696b..47fdc7295f 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 0672e878c6..5e43d4ba84 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 a633fb40d9..f9bd3f8e46 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 45c8ccc74e..18553fc405 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 454bfe9bf9..6187e38d8e 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 018bd46ece..339846919c 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 07ca05fd6e..695ce35c12 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 0d1ed9d446..62a47983f2 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 148a6856bc..c7058eeb9c 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 11ee469ef9..8716bc2ec6 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 931845fd6b..901f6eecf7 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 bc054ccb13..eefedb7804 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 diff --git a/collects/tests/raclog/bible.rkt b/collects/tests/raclog/bible.rkt index c971222e51..c017804ba1 100644 --- a/collects/tests/raclog/bible.rkt +++ b/collects/tests/raclog/bible.rkt @@ -1,7 +1,7 @@ #lang racket (require raclog - racunit) + rackunit) ;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 3babf4bbff..9b0569c1da 100644 --- a/collects/tests/raclog/england.rkt +++ b/collects/tests/raclog/england.rkt @@ -1,7 +1,7 @@ #lang racket (require raclog - racunit) + rackunit) ;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 989448057a..f5ab8dc78c 100644 --- a/collects/tests/raclog/games.rkt +++ b/collects/tests/raclog/games.rkt @@ -2,7 +2,7 @@ (require raclog "./puzzle.rkt" - racunit) + rackunit) ;;This example is from Sterling & Shapiro, p. 214. ;; diff --git a/collects/tests/srfi/1/alist-test.rkt b/collects/tests/srfi/1/alist-test.rkt index bf9fb7aaca..a2b87d8586 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 racunit) + (require rackunit) (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 509b3357f4..31a3daf77b 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 racunit) + (require rackunit) (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 9ae15fec74..61aa2a3ac0 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 racunit) + (require rackunit) (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 afc6e59a23..90297e8a69 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 racunit) + (require rackunit) (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 452b875096..c7eff01d01 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 racunit) + (require rackunit) (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 bf174570b7..1b277f3d4d 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 racunit) + (require rackunit) (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 6f1a014386..75592ba274 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 racunit) + (require rackunit) (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 66ca346e70..427ac4503d 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 racunit) + (require rackunit) (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 72337f658b..e85fa12e65 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 racunit) + (require rackunit) (require srfi/1/predicate srfi/1/cons) diff --git a/collects/tests/srfi/1/run-tests.rktl b/collects/tests/srfi/1/run-tests.rktl index a5e4d5169d..27fb94d580 100644 --- a/collects/tests/srfi/1/run-tests.rktl +++ b/collects/tests/srfi/1/run-tests.rktl @@ -1,5 +1,5 @@ -(require racunit) -(require racunit/text-ui) +(require rackunit) +(require rackunit/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 a5af271f30..6eec8905a3 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 racunit) + (require rackunit) (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 a9d05e107b..bf4e3fcb41 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 racunit) + (require rackunit) (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 3bf0d94e36..4e6e77078b 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 racunit) + (require rackunit) (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 861f777caf..f04abd813c 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 racunit) + (require rackunit) (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 1e3ddf8767..a6d3a6c27b 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 racunit - racunit/text-ui) +(require rackunit + rackunit/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 ecc9c711c2..89c8df5868 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 racunit) + (require rackunit) (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 c482795886..551448df60 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 racunit) + (require rackunit) (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 5e2b4311b3..396b3fb74e 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 racunit) - (require racunit/text-ui + (require rackunit) + (require rackunit/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 2e24ecd136..0efc798847 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 racunit) + (require rackunit) (require srfi/40) (provide all-srfi-40-tests) diff --git a/collects/tests/srfi/40/run-tests.rktl b/collects/tests/srfi/40/run-tests.rktl index abea2dceec..2e101f46a5 100644 --- a/collects/tests/srfi/40/run-tests.rktl +++ b/collects/tests/srfi/40/run-tests.rktl @@ -1,5 +1,5 @@ -(require racunit) -(require racunit/text-ui) +(require rackunit) +(require rackunit/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 eacd083544..e32ffd1f10 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 racunit) + (require rackunit) (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 2a2b1d595d..fdcb6c4068 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 racunit) + (require rackunit) (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 c0aac37f3e..52565771e0 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 racunit) + (require rackunit) (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 d2d09c28bf..8055ad96e0 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 racunit) + (require rackunit) (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 d5c750add4..d730f5a7b3 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 racunit) + (require rackunit) (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 412b9f29fa..6f8bf7b82a 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 racunit) + (require rackunit) (require srfi/43/vector-lib) (provide predicate-tests) diff --git a/collects/tests/srfi/43/run-tests.rktl b/collects/tests/srfi/43/run-tests.rktl index 9891ab3900..e704042d59 100644 --- a/collects/tests/srfi/43/run-tests.rktl +++ b/collects/tests/srfi/43/run-tests.rktl @@ -1,5 +1,5 @@ -(require racunit) -(require racunit/text-ui) +(require rackunit) +(require rackunit/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 96093804e7..93719f72b7 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 racunit) + (require rackunit) (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 797aca6485..25f9850e4b 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 racunit) + (require rackunit) (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 ab589733dc..104ccd1e3f 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 racunit) + (require rackunit) (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 050d4e6850..6d2feb1110 100644 --- a/collects/tests/srfi/run-tests.rkt +++ b/collects/tests/srfi/run-tests.rkt @@ -1,7 +1,7 @@ #lang scheme/base -(require racunit) -(require racunit/text-ui) +(require rackunit) +(require rackunit/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 1410671a45..6af2f73fbb 100644 --- a/collects/tests/stxparse/more-tests.rkt +++ b/collects/tests/stxparse/more-tests.rkt @@ -1,6 +1,6 @@ #lang scheme (require syntax/parse - racunit) + rackunit) (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 df03b2b468..e4598fb063 100644 --- a/collects/tests/stxparse/select.rkt +++ b/collects/tests/stxparse/select.rkt @@ -1,5 +1,5 @@ #lang scheme -(require racunit +(require rackunit 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 0b6a32df13..0b0fdb40f3 100644 --- a/collects/tests/stxparse/stxclass.rkt +++ b/collects/tests/stxparse/stxclass.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require racunit +(require rackunit syntax/parse (for-syntax scheme/base syntax/parse)) diff --git a/collects/tests/stxparse/test.rkt b/collects/tests/stxparse/test.rkt index c2663108cd..4409ccec00 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 racunit) +(require rackunit) ;; tok = test pattern ok (define-syntax tok diff --git a/collects/tests/typed-scheme/main.rkt b/collects/tests/typed-scheme/main.rkt index 41edab6848..96fb394ba2 100644 --- a/collects/tests/typed-scheme/main.rkt +++ b/collects/tests/typed-scheme/main.rkt @@ -2,7 +2,7 @@ (provide go go/text) -(require racunit racunit/text-ui +(require rackunit rackunit/text-ui mzlib/etc scheme/port compiler/compiler scheme/match diff --git a/collects/tests/typed-scheme/succeed/racunit.ss b/collects/tests/typed-scheme/succeed/rackunit.ss similarity index 93% rename from collects/tests/typed-scheme/succeed/racunit.ss rename to collects/tests/typed-scheme/succeed/rackunit.ss index 9fe72f2c4d..8f41a82ada 100644 --- a/collects/tests/typed-scheme/succeed/racunit.ss +++ b/collects/tests/typed-scheme/succeed/rackunit.ss @@ -1,6 +1,6 @@ #lang typed/scheme/base -(require typed/racunit) +(require typed/rackunit) (: my-+ : Integer Integer -> Integer) (define (my-+ a b) (if (zero? a) diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.rkt b/collects/tests/typed-scheme/unit-tests/all-tests.rkt index 1877481039..5543a15223 100644 --- a/collects/tests/typed-scheme/unit-tests/all-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/all-tests.rkt @@ -15,8 +15,8 @@ "module-tests.ss" ;; pass "contract-tests.ss" - (r:infer infer infer-dummy) - racunit racunit/text-ui) + (r:infer infer infer-dummy) + rackunit rackunit/text-ui) (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 d83173fc8b..5a30c09fc6 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) - racunit) + rackunit) (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 011e66ae71..7f573f8a3f 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) - racunit) + rackunit) diff --git a/collects/tests/typed-scheme/unit-tests/module-tests.rkt b/collects/tests/typed-scheme/unit-tests/module-tests.rkt index f4b00aef77..2292f2f8c8 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" racunit) +(require "test-utils.ss" rackunit) (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 5252e603b2..7de981d300 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) - racunit) + rackunit) (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 1ec61ab5f0..a328206c01 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 racunit) +(provide rackunit) ;; why is this neccessary? (provide planet/multiple) -(define-module racunit - (planet/multiple ("schematics" "racunit.plt" 2 11) +(define-module rackunit + (planet/multiple ("schematics" "rackunit.plt" 2 11) "test.ss" ;"graphical-ui.ss" "text-ui.ss" @@ -44,4 +44,4 @@ #; (planet/multiple ("cce" "fasttest.plt" 1 2) "random.ss" - "racunit.ss")) + "rackunit.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 a0cb778a3e..83fb038140 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) - racunit) + rackunit) (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 61ee5c02f5..6bb8593c88 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) - racunit) + rackunit) (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 d6f285703c..6248771a04 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) - racunit + rackunit (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 d3a487219f..b80dd17411 100644 --- a/collects/tests/typed-scheme/unit-tests/test-utils.rkt +++ b/collects/tests/typed-scheme/unit-tests/test-utils.rkt @@ -6,8 +6,8 @@ scheme/gui/dynamic typed-scheme/utils/utils (for-syntax scheme/base) - (types comparison utils) - racunit racunit/text-ui) + (types comparison utils) + rackunit rackunit/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 'racunit/private/gui/gui 'make-gui-runner)) + (((dynamic-require 'rackunit/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 0f8c3d1db2..5acdeb0b18 100644 --- a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt @@ -7,7 +7,7 @@ (env type-environments init-envs) (utils tc-utils) (rep type-rep filter-rep object-rep) - racunit) + rackunit) (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 f66af265d9..eaaa193971 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) - racunit) + rackunit) (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 c17cd38e89..32e59d5684 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -18,7 +18,7 @@ (utils tc-utils utils) unstable/mutated-vars (env type-name-env type-environments init-envs) - racunit racunit/text-ui + rackunit rackunit/text-ui 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 8b90ea90f2..2a27866ec0 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 racunit +(require rackunit "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 bd7703f4c7..c078eb9b83 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 racunit +(require rackunit "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 cd602c87ad..3e18e3a991 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 racunit +(require rackunit (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 3ed75947eb..0a8c1cfc59 100644 --- a/collects/tests/web-server/dispatch-test.rkt +++ b/collects/tests/web-server/dispatch-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require racunit +(require rackunit web-server/http web-server/dispatchers/dispatch net/url @@ -458,5 +458,5 @@ #;(test-serve/dispatch) -(require racunit/text-ui) +(require rackunit/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 4f5c36e0e2..b0582687b3 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 racunit +(require rackunit "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 4fb373a65b..4b4569c220 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 racunit +(require rackunit (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/racunit:3/text-ui)) +#;(require (planet schematics/rackunit: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 c79d6a4e9a..756eccbc1e 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 racunit +(require rackunit (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 b473e4591e..3cca138426 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 racunit +(require rackunit mzlib/etc mzlib/list web-server/dispatchers/dispatch @@ -164,6 +164,6 @@ )) #| -(require racunit/text-ui) +(require rackunit/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 33347211b7..b3c9678a87 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 racunit +(require rackunit (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 e7e9ec2490..d9a5b2e97a 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 racunit +(require rackunit mzlib/etc mzlib/list xml diff --git a/collects/tests/web-server/dispatchers/filesystem-map-test.rkt b/collects/tests/web-server/dispatchers/filesystem-map-test.rkt index 061f706222..4942e5f697 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 racunit +(require rackunit 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 3ac0782dbf..924d9019fe 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 racunit +(require rackunit 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 be71f9bd58..06ad124622 100644 --- a/collects/tests/web-server/formlets-test.rkt +++ b/collects/tests/web-server/formlets-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require racunit +(require rackunit net/url web-server/http web-server/formlets @@ -370,5 +370,5 @@ )) -(require racunit/text-ui) +(require rackunit/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 a722c882ab..a9563f7794 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 racunit +(require rackunit "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 b359fdf1d2..5eeadfc964 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 racunit +(require rackunit net/url web-server/http/request-structs web-server/http/response-structs @@ -159,5 +159,5 @@ __utmz=165257760.1272597702.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none)\r\ ))) -(require racunit/text-ui) +(require rackunit/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 1bc7263f9b..321b755d4a 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 racunit +(require rackunit 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 3da169df89..1f825d9dde 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 racunit +(require rackunit "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 f166cab69f..900190119e 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 racunit +(require rackunit web-server/lang/abort-resume) (require/expose web-server/lang/abort-resume (web-prompt)) (provide abort-resume-tests) @@ -306,6 +306,6 @@ )) #| -(require racunit/text-ui) +(require rackunit/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 ba06886206..df938c158b 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 racunit +(require rackunit "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 cacede5139..1f3e75c144 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 racunit +(require rackunit 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 93abc043ec..bd9a268aa8 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 racunit +(require rackunit 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 5388373a08..87e8457e7d 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 racunit +(require rackunit 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 74aae31f54..5b70555950 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 racunit +(require rackunit 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 adbade62bc..4a3edae366 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 - racunit + rackunit 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 011a5033c0..80aa12e74f 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 racunit +(require rackunit "../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 c587719b5f..b0de222eea 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 racunit) +(require rackunit) (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 d483c50c3c..a90bf32253 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 racunit +(require rackunit "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 9777f18d4d..afe1835b3a 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 racunit +(require rackunit web-server/private/cache-table) (provide cache-table-tests) @@ -37,6 +37,6 @@ (cache-table-lookup! ct 'foo (lambda () #f))))))) #| -(require (planet schematics/racunit:3/text-ui)) +(require (planet schematics/rackunit: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 b0dbb90f35..167efa7c13 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 racunit +(require rackunit 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 a764b78fdd..ce52c6b7b7 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 racunit +(require rackunit 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 3746170516..69a4741876 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 racunit +(require rackunit 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 ca31d96b83..91566d0152 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 racunit +(require rackunit (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 7a15c4235a..60a24f6e42 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 racunit +(require rackunit 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 840e53b463..8a3684b0e1 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 racunit +(require rackunit 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 19e5a7d015..a012017a93 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 racunit +(require rackunit 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 baaa7e0c9a..6f3a62e892 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 racunit +(require rackunit 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 ad6903a60a..397a44bf18 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 racunit +(require rackunit 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 c643297e7e..7dd7146521 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 racunit/text-ui +(require rackunit/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 4d20cd5786..a2272eb958 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 racunit +(require rackunit 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 677eb4b3db..631447b9cd 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 racunit +(require rackunit "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 2f41b84962..1ac0dd8b4f 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 racunit +(require rackunit 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 77be8cc969..2e246547bd 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 racunit +(require rackunit 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 78688c6303..56718f57f6 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 racunit +(require rackunit 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/racunit:3/text-ui)) +;(require (planet schematics/rackunit: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 bbee9492d2..a8a3b74402 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 racunit +(require rackunit 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 a34a738d40..5c93e4fa2b 100644 --- a/collects/tests/web-server/stuffers-test.rkt +++ b/collects/tests/web-server/stuffers-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require racunit +(require rackunit 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/racunit:3/text-ui)) +(require (planet schematics/rackunit: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 ecad0fc909..43089c3e1f 100644 --- a/collects/tests/xml/test-clark.rkt +++ b/collects/tests/xml/test-clark.rkt @@ -1,6 +1,6 @@ #lang racket -(require racunit - racunit/text-ui +(require rackunit + rackunit/text-ui xml racket/runtime-path) diff --git a/collects/tests/xml/test.rkt b/collects/tests/xml/test.rkt index d2b0c26dda..b5465ca204 100644 --- a/collects/tests/xml/test.rkt +++ b/collects/tests/xml/test.rkt @@ -1,6 +1,6 @@ #lang racket -(require racunit - racunit/text-ui +(require rackunit + rackunit/text-ui xml xml/plist mzlib/etc diff --git a/collects/typed/rackunit.rkt b/collects/typed/rackunit.rkt new file mode 100644 index 0000000000..54e18f1f3b --- /dev/null +++ b/collects/typed/rackunit.rkt @@ -0,0 +1,3 @@ +#lang racket +(require typed/rackunit/main) +(provide (all-from-out typed/rackunit/main)) diff --git a/collects/typed/racunit/gui.rkt b/collects/typed/rackunit/gui.rkt similarity index 79% rename from collects/typed/racunit/gui.rkt rename to collects/typed/rackunit/gui.rkt index 333ad3970c..9e11fb7a4b 100644 --- a/collects/typed/racunit/gui.rkt +++ b/collects/typed/rackunit/gui.rkt @@ -1,9 +1,9 @@ #lang typed/scheme -(require typed/racunit +(require typed/rackunit typed/private/utils) (require/typed/provide - racunit/gui + rackunit/gui [test/gui (Test * -> Any)] [make-gui-runner diff --git a/collects/typed/racunit/main.rkt b/collects/typed/rackunit/main.rkt similarity index 84% rename from collects/typed/racunit/main.rkt rename to collects/typed/rackunit/main.rkt index 2c4f7a7678..69d6565ab6 100644 --- a/collects/typed/racunit/main.rkt +++ b/collects/typed/rackunit/main.rkt @@ -12,7 +12,7 @@ ; 3.2 (require/typed/provide - racunit + rackunit [check (All (A B C) (case-lambda ((A B -> C) A B -> C) @@ -62,11 +62,11 @@ ; 3.2.1 (require-typed-struct check-info ([name : Symbol] [value : Any]) - racunit) + rackunit) (define-type CheckInfo check-info) (provide (struct-out check-info) CheckInfo) (require/typed/provide - racunit + rackunit [make-check-name (String -> CheckInfo)] [make-check-params ((Listof Any) -> CheckInfo)] [make-check-location ((List Any (Option Number) (Option Number) (Option Number) (Option Number)) -> CheckInfo)] @@ -75,23 +75,23 @@ [make-check-actual (Any -> CheckInfo)] [make-check-expected (Any -> CheckInfo)] [with-check-info* (All (A) ((Listof CheckInfo) (Thunk A) -> A))]) -(require (only-in racunit with-check-info)) +(require (only-in rackunit with-check-info)) (provide with-check-info) ; 3.2.2 -(require (only-in racunit define-simple-check define-binary-check define-check fail-check)) +(require (only-in rackunit define-simple-check define-binary-check define-check fail-check)) (provide define-simple-check define-binary-check define-check fail-check) ; 3.2.3 (require/typed/provide - racunit + rackunit [current-check-handler (Parameter (Any -> Any))] [current-check-around (Parameter ((Thunk Any) -> Any))]) ; 3.3 -(require (prefix-in t: (except-in racunit struct:check-info struct:exn:test struct:exn:test:check struct:test-result struct:test-failure +(require (prefix-in t: (except-in rackunit struct:check-info struct:exn:test struct:exn:test:check struct:test-result struct:test-failure struct:test-error struct:test-success))) (define-rewriter t:test-begin test-begin [t:current-test-case-around current-test-case-around] @@ -105,49 +105,49 @@ [t:current-check-around current-check-around]) (provide test-begin test-case) -(require/opaque-type TestCase test-case? racunit) +(require/opaque-type TestCase test-case? rackunit) (provide TestCase test-case?) -(require (only-in racunit test-suite)) +(require (only-in rackunit test-suite)) (provide test-suite) -(require/opaque-type TestSuite test-suite? racunit) +(require/opaque-type TestSuite test-suite? rackunit) (provide TestSuite test-suite?) (define-type Test (U TestCase TestSuite)) (provide Test) (require/typed/provide - racunit + rackunit [make-test-suite (case-lambda (String (Listof Test) -> TestSuite) ; XXX #:before #:after )]) -(require (only-in racunit define-test-suite define/provide-test-suite)) +(require (only-in rackunit define-test-suite define/provide-test-suite)) (provide define-test-suite define/provide-test-suite) (require/typed/provide - racunit + rackunit [current-test-name (Parameter (Option String))] [current-test-case-around (Parameter ((Thunk Any) -> Any))] [test-suite-test-case-around ((Thunk Any) -> Any)] [test-suite-check-around ((Thunk Any) -> Any)]) ; 3.4 -(require (only-in racunit before after around delay-test)) +(require (only-in rackunit before after around delay-test)) (provide before after around delay-test) ; 3.5 ; XXX require/expose seems WRONG for typed/scheme ; 3.7 -(require-typed-struct (exn:test exn) () racunit) -(require-typed-struct (exn:test:check exn:test) ([stack : (Listof CheckInfo)]) racunit) -(require-typed-struct test-result ([test-case-name : (Option String)]) racunit) -(require-typed-struct (test-failure test-result) ([result : Any]) racunit) -(require-typed-struct (test-error test-result) ([result : Any]) racunit) -(require-typed-struct (test-success test-result) ([result : Any]) racunit) +(require-typed-struct (exn:test exn) () rackunit) +(require-typed-struct (exn:test:check exn:test) ([stack : (Listof CheckInfo)]) rackunit) +(require-typed-struct test-result ([test-case-name : (Option String)]) rackunit) +(require-typed-struct (test-failure test-result) ([result : Any]) rackunit) +(require-typed-struct (test-error test-result) ([result : Any]) rackunit) +(require-typed-struct (test-success test-result) ([result : Any]) rackunit) (provide (struct-out exn:test) (struct-out exn:test:check) (struct-out test-result) (struct-out test-failure) (struct-out test-error) (struct-out test-success)) @@ -157,7 +157,7 @@ (Listof (U A The-Tree)))) (require/typed/provide - racunit + rackunit [run-test-case ((Option String) (Thunk Any) -> test-result)] [run-test diff --git a/collects/typed/racunit/text-ui.rkt b/collects/typed/rackunit/text-ui.rkt similarity index 77% rename from collects/typed/racunit/text-ui.rkt rename to collects/typed/rackunit/text-ui.rkt index 16fa4bd14a..4a24dbb3d7 100644 --- a/collects/typed/racunit/text-ui.rkt +++ b/collects/typed/rackunit/text-ui.rkt @@ -1,14 +1,14 @@ #lang typed/scheme -(require typed/racunit +(require typed/rackunit typed/private/utils) (define-type Verbosity (U 'quiet 'normal 'verbose)) (require/typed/provide - racunit/text-ui + rackunit/text-ui [run-tests (case-lambda (Test -> Natural) (Test Verbosity -> Natural))]) -(provide Verbosity) \ No newline at end of file +(provide Verbosity) diff --git a/collects/typed/racunit/type-env-ext.rkt b/collects/typed/rackunit/type-env-ext.rkt similarity index 74% rename from collects/typed/racunit/type-env-ext.rkt rename to collects/typed/rackunit/type-env-ext.rkt index 02777a75df..c73b6b4cd0 100644 --- a/collects/typed/racunit/type-env-ext.rkt +++ b/collects/typed/rackunit/type-env-ext.rkt @@ -1,17 +1,17 @@ #lang scheme/base (require typed-scheme/utils/utils - (prefix-in ru: (combine-in racunit racunit/private/test-case racunit/private/check)) + (prefix-in ru: (combine-in rackunit rackunit/private/test-case rackunit/private/check)) (for-syntax scheme/base syntax/parse (utils tc-utils) - (env init-envs) + (env init-envs) (except-in (rep filter-rep object-rep type-rep) make-arr) (types convenience union) (only-in (types convenience) [make-arr* make-arr]))) (define-for-syntax unit-env - (make-env + (make-env [ru:check-around (-poly (a) (-> (-> a) a))] ;; current-test-case-around @@ -20,4 +20,4 @@ [(_ _ . _) #'ctca]) (-poly (a) (-> (-> a) a))])) -(begin-for-syntax (initialize-type-env unit-env)) \ No newline at end of file +(begin-for-syntax (initialize-type-env unit-env)) diff --git a/collects/typed/racunit.rkt b/collects/typed/racunit.rkt deleted file mode 100644 index b04bc18122..0000000000 --- a/collects/typed/racunit.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang racket -(require typed/racunit/main) -(provide (all-from-out typed/racunit/main)) \ No newline at end of file