From f70ffca75665f86a380c3df846c8a63b1e941b8b Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 29 Apr 2010 15:00:02 -0600 Subject: [PATCH] Renaming schemeunit to rktunit and adding compat layer --- collects/2htdp/tests/batch-io.rkt | 2 +- collects/2htdp/tests/test-image.rkt | 2 +- collects/meta/dist-specs.rkt | 1 + collects/meta/drdr/pkgs.bak | 40 +-- collects/meta/props | 23 +- .../parser-tools/private-lex/error-tests.rkt | 2 +- collects/rktunit/gui.rkt | 18 ++ collects/rktunit/info.rkt | 13 + collects/rktunit/main.rkt | 31 ++ .../{schemeunit => rktunit}/private/base.rkt | 16 +- .../private/check-info.rkt | 4 +- .../{schemeunit => rktunit}/private/check.rkt | 14 +- .../private/counter.rkt | 8 +- .../private/format.rkt | 6 +- .../private/gui/cache-box.rkt | 4 +- .../private/gui/config.rkt | 16 +- .../private/gui/controller.rkt | 20 +- .../private/gui/drracket-link.rkt} | 4 +- .../private/gui/drracket-ui.rkt} | 10 +- .../private/gui/gui.rkt | 26 +- .../private/gui/gvector.rkt | 6 +- .../private/gui/interfaces.rkt | 4 +- .../private/gui/model.rkt | 14 +- .../private/gui/model2rml.rkt | 22 +- .../private/gui/output-icon.png | Bin .../private/gui/rml.rkt | 20 +- .../private/gui/view.rkt | 22 +- .../private/hash-monad.rkt | 4 +- .../private/location.rkt | 4 +- .../{schemeunit => rktunit}/private/monad.rkt | 2 +- .../private/name-collector.rkt | 8 +- .../private/result.rkt | 14 +- .../private/test-case.rkt | 12 +- .../private/test-suite.rkt | 42 +-- .../{schemeunit => rktunit}/private/test.rkt | 28 +- .../private/text-ui-util.rkt | 2 +- .../{schemeunit => rktunit}/private/util.rkt | 12 +- .../scribblings/acknowledgements.scrbl | 14 +- .../scribblings/api.scrbl | 8 +- .../scribblings/base.rkt | 12 +- .../scribblings/check.scrbl | 144 +++++----- .../scribblings/compound-testing.scrbl | 62 ++-- .../scribblings/control-flow.scrbl | 24 +- .../scribblings/file-test.rkt} | 4 +- .../file.scm => rktunit/scribblings/file.rkt} | 0 collects/rktunit/scribblings/misc.scrbl | 21 ++ .../scribblings/overview.scrbl | 6 +- .../scribblings/philosophy.scrbl | 44 +-- .../scribblings/quick-start.scrbl | 70 ++--- .../scribblings/release-notes.scrbl | 8 +- .../scribblings/rktunit.scrbl} | 8 +- .../scribblings/running-tests.scrbl | 40 +-- .../scribblings/ui.scrbl | 30 +- collects/rktunit/text-ui.rkt | 267 +++++++++++++++++ collects/{schemeunit => rktunit}/tool.rkt | 18 +- collects/schemeunit/gui.rkt | 21 +- collects/schemeunit/info.rkt | 12 +- collects/schemeunit/main.rkt | 34 +-- collects/schemeunit/scribblings/misc.scrbl | 21 -- collects/schemeunit/text-ui.rkt | 270 +----------------- .../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/eli-tester.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 +- collects/tests/raclog/bible.rkt | 4 +- collects/tests/raclog/england.rkt | 2 +- collects/tests/raclog/games.rkt | 2 +- .../all-rktunit-tests.rkt} | 40 +-- .../{schemeunit => rktunit}/base-test.rkt | 24 +- .../check-info-test.rkt | 16 +- .../{schemeunit => rktunit}/check-test.rkt | 16 +- .../{schemeunit => rktunit}/counter-test.rkt | 12 +- .../{schemeunit => rktunit}/format-test.rkt | 8 +- .../hash-monad-test.rkt | 8 +- .../{schemeunit => rktunit}/location-test.rkt | 32 +-- .../{schemeunit => rktunit}/monad-test.rkt | 6 +- .../{schemeunit => rktunit}/result-test.rkt | 6 +- .../{schemeunit => rktunit}/run-tests.rkt | 10 +- .../standalone-check-test.rkt | 4 +- .../standalone-test-case-test.rkt | 6 +- .../test-case-test.rkt | 12 +- .../test-suite-test.rkt | 6 +- .../{schemeunit => rktunit}/test-test.rkt | 18 +- .../{schemeunit => rktunit}/text-ui-test.rkt | 26 +- .../text-ui-util-test.rkt | 14 +- .../{schemeunit => rktunit}/util-test.rkt | 12 +- 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.rkt | 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.rkt | 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.rkt | 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 +- .../tests/typed-scheme/succeed/fixnum.rkt | 2 +- .../tests/typed-scheme/succeed/flonum.rkt | 2 +- .../tests/typed-scheme/succeed/flvector.rkt | 4 +- .../typed-scheme/unit-tests/all-tests.rkt | 2 +- .../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 | 4 +- .../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 | 4 +- .../dispatchers/filesystem-map-test.rkt | 2 +- .../dispatchers/servlet-test-util.rkt | 2 +- collects/tests/web-server/formlets-test.rkt | 6 +- .../tests/web-server/http/all-http-tests.rkt | 2 +- .../tests/web-server/http/cookies-test.rkt | 6 +- .../web-server/http/digest-auth-test.rkt | 2 +- collects/tests/web-server/lang-test.rkt | 8 +- .../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 +- 206 files changed, 1112 insertions(+), 1098 deletions(-) create mode 100644 collects/rktunit/gui.rkt create mode 100644 collects/rktunit/info.rkt create mode 100644 collects/rktunit/main.rkt rename collects/{schemeunit => rktunit}/private/base.rkt (76%) rename collects/{schemeunit => rktunit}/private/check-info.rkt (96%) rename collects/{schemeunit => rktunit}/private/check.rkt (97%) rename collects/{schemeunit => rktunit}/private/counter.rkt (96%) rename collects/{schemeunit => rktunit}/private/format.rkt (96%) rename collects/{schemeunit => rktunit}/private/gui/cache-box.rkt (96%) rename collects/{schemeunit => rktunit}/private/gui/config.rkt (70%) rename collects/{schemeunit => rktunit}/private/gui/controller.rkt (79%) rename collects/{schemeunit/private/gui/drscheme-link.rkt => rktunit/private/gui/drracket-link.rkt} (76%) rename collects/{schemeunit/private/gui/drscheme-ui.rkt => rktunit/private/gui/drracket-ui.rkt} (94%) rename collects/{schemeunit => rktunit}/private/gui/gui.rkt (90%) rename collects/{schemeunit => rktunit}/private/gui/gvector.rkt (98%) rename collects/{schemeunit => rktunit}/private/gui/interfaces.rkt (96%) rename collects/{schemeunit => rktunit}/private/gui/model.rkt (96%) rename collects/{schemeunit => rktunit}/private/gui/model2rml.rkt (98%) rename collects/{schemeunit => rktunit}/private/gui/output-icon.png (100%) rename collects/{schemeunit => rktunit}/private/gui/rml.rkt (95%) rename collects/{schemeunit => rktunit}/private/gui/view.rkt (96%) rename collects/{schemeunit => rktunit}/private/hash-monad.rkt (97%) rename collects/{schemeunit => rktunit}/private/location.rkt (96%) rename collects/{schemeunit => rktunit}/private/monad.rkt (99%) rename collects/{schemeunit => rktunit}/private/name-collector.rkt (95%) rename collects/{schemeunit => rktunit}/private/result.rkt (94%) rename collects/{schemeunit => rktunit}/private/test-case.rkt (95%) rename collects/{schemeunit => rktunit}/private/test-suite.rkt (83%) rename collects/{schemeunit => rktunit}/private/test.rkt (87%) rename collects/{schemeunit => rktunit}/private/text-ui-util.rkt (98%) rename collects/{schemeunit => rktunit}/private/util.rkt (92%) rename collects/{schemeunit => rktunit}/scribblings/acknowledgements.scrbl (73%) rename collects/{schemeunit => rktunit}/scribblings/api.scrbl (71%) rename collects/{schemeunit => rktunit}/scribblings/base.rkt (55%) rename collects/{schemeunit => rktunit}/scribblings/check.scrbl (68%) rename collects/{schemeunit => rktunit}/scribblings/compound-testing.scrbl (74%) rename collects/{schemeunit => rktunit}/scribblings/control-flow.scrbl (60%) rename collects/{schemeunit/scribblings/file-test.scm => rktunit/scribblings/file-test.rkt} (90%) rename collects/{schemeunit/scribblings/file.scm => rktunit/scribblings/file.rkt} (100%) create mode 100644 collects/rktunit/scribblings/misc.scrbl rename collects/{schemeunit => rktunit}/scribblings/overview.scrbl (78%) rename collects/{schemeunit => rktunit}/scribblings/philosophy.scrbl (76%) rename collects/{schemeunit => rktunit}/scribblings/quick-start.scrbl (67%) rename collects/{schemeunit => rktunit}/scribblings/release-notes.scrbl (87%) rename collects/{schemeunit/scribblings/schemeunit.scrbl => rktunit/scribblings/rktunit.scrbl} (67%) rename collects/{schemeunit => rktunit}/scribblings/running-tests.scrbl (84%) rename collects/{schemeunit => rktunit}/scribblings/ui.scrbl (51%) create mode 100644 collects/rktunit/text-ui.rkt rename collects/{schemeunit => rktunit}/tool.rkt (86%) delete mode 100644 collects/schemeunit/scribblings/misc.scrbl rename collects/tests/{schemeunit/all-schemeunit-tests.rkt => rktunit/all-rktunit-tests.rkt} (57%) rename collects/tests/{schemeunit => rktunit}/base-test.rkt (78%) rename collects/tests/{schemeunit => rktunit}/check-info-test.rkt (88%) rename collects/tests/{schemeunit => rktunit}/check-test.rkt (97%) rename collects/tests/{schemeunit => rktunit}/counter-test.rkt (90%) rename collects/tests/{schemeunit => rktunit}/format-test.rkt (83%) rename collects/tests/{schemeunit => rktunit}/hash-monad-test.rkt (94%) rename collects/tests/{schemeunit => rktunit}/location-test.rkt (77%) rename collects/tests/{schemeunit => rktunit}/monad-test.rkt (98%) rename collects/tests/{schemeunit => rktunit}/result-test.rkt (92%) rename collects/tests/{schemeunit => rktunit}/run-tests.rkt (68%) rename collects/tests/{schemeunit => rktunit}/standalone-check-test.rkt (96%) rename collects/tests/{schemeunit => rktunit}/standalone-test-case-test.rkt (83%) rename collects/tests/{schemeunit => rktunit}/test-case-test.rkt (83%) rename collects/tests/{schemeunit => rktunit}/test-suite-test.rkt (95%) rename collects/tests/{schemeunit => rktunit}/test-test.rkt (96%) rename collects/tests/{schemeunit => rktunit}/text-ui-test.rkt (93%) rename collects/tests/{schemeunit => rktunit}/text-ui-util-test.rkt (85%) rename collects/tests/{schemeunit => rktunit}/util-test.rkt (84%) diff --git a/collects/2htdp/tests/batch-io.rkt b/collects/2htdp/tests/batch-io.rkt index c3e002c4af..cbabba4e3c 100644 --- a/collects/2htdp/tests/batch-io.rkt +++ b/collects/2htdp/tests/batch-io.rkt @@ -1,6 +1,6 @@ #lang scheme/load -(require schemeunit) +(require rktunit) (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 2db4c687f7..b8f8ff5451 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 - schemeunit + rktunit (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 2b406def7e..869ab4223f 100644 --- a/collects/meta/dist-specs.rkt +++ b/collects/meta/dist-specs.rkt @@ -662,6 +662,7 @@ mz-extras :+= (- (package: "unstable") ;; -------------------- plai plt-extras :+= (package: "plai/") +plt-extras :+= (package: "rktunit/") plt-extras :+= (package: "schemeunit/") ;; ============================================================================ diff --git a/collects/meta/drdr/pkgs.bak b/collects/meta/drdr/pkgs.bak index 28ada5da4a..66c34ab0f1 100644 --- a/collects/meta/drdr/pkgs.bak +++ b/collects/meta/drdr/pkgs.bak @@ -615,26 +615,26 @@ ("schematics" "port.plt" 1 0 #f) ("schematics" "random.plt" 1 0 #f) ("schematics" "sake.plt" 1 0 "4.0") - ("schematics" "schemeunit.plt" 3 4 "4.0") - ("schematics" "schemeunit.plt" 3 3 "4.0") - ("schematics" "schemeunit.plt" 3 2 "4.0") - ("schematics" "schemeunit.plt" 3 1 "4.0") - ("schematics" "schemeunit.plt" 3 0 "4.0") - ("schematics" "schemeunit.plt" 2 11 "4.1.0.3") - ("schematics" "schemeunit.plt" 2 10 "369.1") - ("schematics" "schemeunit.plt" 2 9 "369.1") - ("schematics" "schemeunit.plt" 2 8 "369.1") - ("schematics" "schemeunit.plt" 2 7 "369.1") - ("schematics" "schemeunit.plt" 2 6 "369.1") - ("schematics" "schemeunit.plt" 2 5 "369.1") - ("schematics" "schemeunit.plt" 2 4 "369.1") - ("schematics" "schemeunit.plt" 2 3 #f) - ("schematics" "schemeunit.plt" 2 2 #f) - ("schematics" "schemeunit.plt" 2 1 #f) - ("schematics" "schemeunit.plt" 2 0 #f) - ("schematics" "schemeunit.plt" 1 2 #f) - ("schematics" "schemeunit.plt" 1 1 #f) - ("schematics" "schemeunit.plt" 1 0 #f) + ("schematics" "rktunit.plt" 3 4 "4.0") + ("schematics" "rktunit.plt" 3 3 "4.0") + ("schematics" "rktunit.plt" 3 2 "4.0") + ("schematics" "rktunit.plt" 3 1 "4.0") + ("schematics" "rktunit.plt" 3 0 "4.0") + ("schematics" "rktunit.plt" 2 11 "4.1.0.3") + ("schematics" "rktunit.plt" 2 10 "369.1") + ("schematics" "rktunit.plt" 2 9 "369.1") + ("schematics" "rktunit.plt" 2 8 "369.1") + ("schematics" "rktunit.plt" 2 7 "369.1") + ("schematics" "rktunit.plt" 2 6 "369.1") + ("schematics" "rktunit.plt" 2 5 "369.1") + ("schematics" "rktunit.plt" 2 4 "369.1") + ("schematics" "rktunit.plt" 2 3 #f) + ("schematics" "rktunit.plt" 2 2 #f) + ("schematics" "rktunit.plt" 2 1 #f) + ("schematics" "rktunit.plt" 2 0 #f) + ("schematics" "rktunit.plt" 1 2 #f) + ("schematics" "rktunit.plt" 1 1 #f) + ("schematics" "rktunit.plt" 1 0 #f) ("schematics" "si.plt" 1 0 #f) ("schematics" "spgsql.plt" 2 3 "371.3") ("schematics" "spgsql.plt" 2 2 "371.3") diff --git a/collects/meta/props b/collects/meta/props index 2eb785cb7d..a59643d0d9 100644 --- a/collects/meta/props +++ b/collects/meta/props @@ -1126,16 +1126,17 @@ path/s is either such a string or a list of them. "collects/scheme/gui.rkt" drdr:command-line "mred-text -t ~s" "collects/scheme/match" responsible (samth) "collects/scheme/match.rkt" responsible (samth) -"collects/schemeunit" responsible (noel ryanc) -"collects/schemeunit/gui.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" -"collects/schemeunit/private/gui" responsible (ryanc) -"collects/schemeunit/private/gui/config.rkt" drdr:command-line "mred-text -t ~s" -"collects/schemeunit/private/gui/controller.rkt" drdr:command-line "mred-text -t ~s" -"collects/schemeunit/private/gui/gui.rkt" drdr:command-line "mred-text -t ~s" -"collects/schemeunit/private/gui/model2rml.rkt" drdr:command-line "mred-text -t ~s" -"collects/schemeunit/private/gui/rml.rkt" drdr:command-line "mred-text -t ~s" -"collects/schemeunit/private/gui/view.rkt" drdr:command-line "mred-text -t ~s" -"collects/schemeunit/tool.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" +"collects/rktunit" responsible (jay noel ryanc) +"collects/schemeunit" responsible (jay) +"collects/rktunit/gui.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" +"collects/rktunit/private/gui" responsible (ryanc) +"collects/rktunit/private/gui/config.rkt" drdr:command-line "mred-text -t ~s" +"collects/rktunit/private/gui/controller.rkt" drdr:command-line "mred-text -t ~s" +"collects/rktunit/private/gui/gui.rkt" drdr:command-line "mred-text -t ~s" +"collects/rktunit/private/gui/model2rml.rkt" drdr:command-line "mred-text -t ~s" +"collects/rktunit/private/gui/rml.rkt" drdr:command-line "mred-text -t ~s" +"collects/rktunit/private/gui/view.rkt" drdr:command-line "mred-text -t ~s" +"collects/rktunit/tool.rkt" responsible (ryanc) drdr:command-line "mred-text -t ~s" "collects/scribble/run.rkt" drdr:command-line "mzc ~s" "collects/scribble/tools/drscheme-buttons.rkt" drdr:command-line "mred-text ~s" "collects/scribble/tools/private/mk-drs-bitmaps.rkt" drdr:command-line "mred-text ~s" drdr:timeout 240 @@ -1582,7 +1583,7 @@ path/s is either such a string or a list of them. "collects/tests/planet/examples/dummy-module.rkt" drdr:command-line "" "collects/tests/plot/run-tests.rkt" drdr:command-line "mred-text -t ~s" "collects/tests/run-automated-tests.rkt" drdr:command-line "mzc -k ~s" drdr:timeout 600 -"collects/tests/schemeunit" responsible (noel) +"collects/tests/rktunit" responsible (jay noel) "collects/tests/srfi/1/run-tests.rkt" drdr:command-line "mzscheme -f ~s" "collects/tests/srfi/40/run-tests.rkt" drdr:command-line "mzscheme -f ~s" "collects/tests/srfi/43/run-tests.rkt" drdr:command-line "mzscheme -f ~s" diff --git a/collects/parser-tools/private-lex/error-tests.rkt b/collects/parser-tools/private-lex/error-tests.rkt index 337e41e700..88876985aa 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" - schemeunit) + rktunit) (define-syntax (catch-syn-error stx) (syntax-case stx () diff --git a/collects/rktunit/gui.rkt b/collects/rktunit/gui.rkt new file mode 100644 index 0000000000..0b57fd641e --- /dev/null +++ b/collects/rktunit/gui.rkt @@ -0,0 +1,18 @@ +#lang racket/base +(require racket/contract + (rename-in "private/base.rkt") + "private/gui/gui.rkt") + +(define (test/gui . tests) + (apply (make-gui-runner) tests)) + +(define test/c (or/c rktunit-test-case? rktunit-test-suite?)) + +(provide/contract + [test/gui + (->* () () #:rest (listof test/c) + any)] + [make-gui-runner + (-> + (->* () () #:rest (listof test/c) + any))]) diff --git a/collects/rktunit/info.rkt b/collects/rktunit/info.rkt new file mode 100644 index 0000000000..3b9fbfce4a --- /dev/null +++ b/collects/rktunit/info.rkt @@ -0,0 +1,13 @@ +#lang setup/infotab + +(define name "RktUnit") + +(define blurb '((p "RktUnit is a unit testing framework based on the " + " Extreme Programming unit test frameworks"))) + +(define scribblings '(("scribblings/rktunit.scrbl" (multi-page) (tool)))) +(define tools '[("tool.rkt")]) +(define tool-names '["RktUnit DrRacket integration"]) + +(define homepage "http://schematics.sourceforge.net/") +(define url "http://schematics.sourceforge.net/") diff --git a/collects/rktunit/main.rkt b/collects/rktunit/main.rkt new file mode 100644 index 0000000000..5eaa42c10b --- /dev/null +++ b/collects/rktunit/main.rkt @@ -0,0 +1,31 @@ +;;; +;;; Time-stamp: <2008-07-30 10:46:00 nhw> +;;; +;;; Copyright (C) by Noel Welsh. +;;; + +;;; This library is free software; you can redistribute it +;;; and/or modify it under the terms of the GNU Lesser +;;; General Public License as published by the Free Software +;;; Foundation; either version 2.1 of the License, or (at +;;; your option) any later version. + +;;; This library is distributed in the hope that it will be +;;; useful, but WITHOUT ANY WARRANTY; without even the +;;; implied warranty of MERCHANTABILITY or FITNESS FOR A +;;; PARTICULAR PURPOSE. See the GNU Lesser General Public +;;; License for more details. + +;;; You should have received a copy of the GNU Lesser +;;; General Public License along with this library; if not, +;;; write to the Free Software Foundation, Inc., 59 Temple +;;; Place, Suite 330, Boston, MA 02111-1307 USA + +;;; Author: Noel Welsh +;; +;; +;; Commentary: + +#lang racket/base +(require "private/test.rkt") +(provide (all-from-out "private/test.rkt")) diff --git a/collects/schemeunit/private/base.rkt b/collects/rktunit/private/base.rkt similarity index 76% rename from collects/schemeunit/private/base.rkt rename to collects/rktunit/private/base.rkt index 0d52744190..bb87c10134 100644 --- a/collects/schemeunit/private/base.rkt +++ b/collects/rktunit/private/base.rkt @@ -1,13 +1,13 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract) +(require racket/contract) ;; struct test : (define-struct test ()) -;; struct (schemeunit-test-case test) : (U string #f) thunk -(define-struct (schemeunit-test-case test) (name action) #:transparent) -;; struct (schemeunit-test-suite test) : string (fdown fup fhere seed -> (listof test-result)) thunk thunk -(define-struct (schemeunit-test-suite test) (name tests before after) #:transparent) +;; struct (rktunit-test-case test) : (U string #f) thunk +(define-struct (rktunit-test-case test) (name action) #:transparent) +;; struct (rktunit-test-suite test) : string (fdown fup fhere seed -> (listof test-result)) thunk thunk +(define-struct (rktunit-test-suite test) (name tests before after) #:transparent) ;; struct exn:test exn : () ;; @@ -33,10 +33,10 @@ (define-struct (test-success test-result) (result)) (provide/contract - (struct (schemeunit-test-case test) + (struct (rktunit-test-case test) ((name (or/c string? false/c)) (action (-> any)))) - (struct (schemeunit-test-suite test) + (struct (rktunit-test-suite test) ((name string?) (tests procedure?) (before (-> any)) diff --git a/collects/schemeunit/private/check-info.rkt b/collects/rktunit/private/check-info.rkt similarity index 96% rename from collects/schemeunit/private/check-info.rkt rename to collects/rktunit/private/check-info.rkt index efea4e9a26..3b3ec4e1a5 100644 --- a/collects/schemeunit/private/check-info.rkt +++ b/collects/rktunit/private/check-info.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide (all-defined-out)) @@ -11,7 +11,7 @@ ;; Infrastructure ---------------------------------------------- ;; The continuation mark under which all check-info is keyed -(define check-info-mark (gensym 'schemeunit)) +(define check-info-mark (gensym 'rktunit)) ;; (continuation-mark-set -> (listof check-info)) (define (check-info-stack marks) diff --git a/collects/schemeunit/private/check.rkt b/collects/rktunit/private/check.rkt similarity index 97% rename from collects/schemeunit/private/check.rkt rename to collects/rktunit/private/check.rkt index a9fddae8e2..f478a336fc 100644 --- a/collects/schemeunit/private/check.rkt +++ b/collects/rktunit/private/check.rkt @@ -1,12 +1,12 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base - "location.ss") +(require (for-syntax racket/base + "location.rkt") srfi/1 - "base.ss" - "check-info.ss" - "format.ss" - "location.ss") + "base.rkt" + "check-info.rkt" + "format.rkt" + "location.rkt") (provide current-check-handler check-around diff --git a/collects/schemeunit/private/counter.rkt b/collects/rktunit/private/counter.rkt similarity index 96% rename from collects/schemeunit/private/counter.rkt rename to collects/rktunit/private/counter.rkt index 208d599b77..265fb58cff 100644 --- a/collects/schemeunit/private/counter.rkt +++ b/collects/rktunit/private/counter.rkt @@ -26,11 +26,11 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require "base.ss" - "monad.ss" - "hash-monad.ss") +(require "base.rkt" + "monad.rkt" + "hash-monad.rkt") (provide display-counter update-counter! diff --git a/collects/schemeunit/private/format.rkt b/collects/rktunit/private/format.rkt similarity index 96% rename from collects/schemeunit/private/format.rkt rename to collects/rktunit/private/format.rkt index 0e4fd5dbd0..6645914257 100644 --- a/collects/schemeunit/private/format.rkt +++ b/collects/rktunit/private/format.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require scheme/match +(require racket/match srfi/13 - "check-info.ss") + "check-info.rkt") (provide display-check-info-name-value display-check-info diff --git a/collects/schemeunit/private/gui/cache-box.rkt b/collects/rktunit/private/gui/cache-box.rkt similarity index 96% rename from collects/schemeunit/private/gui/cache-box.rkt rename to collects/rktunit/private/gui/cache-box.rkt index 6d5230a5be..f3fce40a91 100644 --- a/collects/schemeunit/private/gui/cache-box.rkt +++ b/collects/rktunit/private/gui/cache-box.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/contract) +#lang racket/base +(require racket/contract) ;; Add a new kind of promise instead? diff --git a/collects/schemeunit/private/gui/config.rkt b/collects/rktunit/private/gui/config.rkt similarity index 70% rename from collects/schemeunit/private/gui/config.rkt rename to collects/rktunit/private/gui/config.rkt index 3c2c899160..c0123eecab 100644 --- a/collects/schemeunit/private/gui/config.rkt +++ b/collects/rktunit/private/gui/config.rkt @@ -1,24 +1,24 @@ -#lang scheme/base +#lang racket/base (require framework unstable/gui/prefs) (provide (all-defined-out)) ;; Frame size preferences -(preferences:set-default 'schemeunit:frame:width 400 exact-positive-integer?) -(preferences:set-default 'schemeunit:frame:height 400 exact-positive-integer?) -(define pref:width (pref:get/set 'schemeunit:frame:width)) -(define pref:height (pref:get/set 'schemeunit:frame:height)) +(preferences:set-default 'rktunit:frame:width 400 exact-positive-integer?) +(preferences:set-default 'rktunit:frame:height 400 exact-positive-integer?) +(define pref:width (pref:get/set 'rktunit:frame:width)) +(define pref:height (pref:get/set 'rktunit:frame:height)) ;; CONSTANTS ;; Some of these are obsolete, given the preferences above. (define DETAILS-CANVAS-INIT-WIDTH 400) -(define FRAME-LABEL "SchemeUnit") +(define FRAME-LABEL "RktUnit") (define FRAME-INIT-HEIGHT 400) (define TREE-INIT-WIDTH 240) (define TREE-COLORIZE-CASES #t) -(define DIALOG-ERROR-TITLE "SchemeUnit: Error") +(define DIALOG-ERROR-TITLE "RktUnit: Error") (define STATUS-SUCCESS 'success) (define STATUS-FAILURE 'failure) (define STATUS-ERROR 'error) @@ -28,7 +28,7 @@ (list (/ TREE-INIT-WIDTH total) (/ DETAILS-CANVAS-INIT-WIDTH total)))) ;; Conventional assertion-info keys. -;; These must be kept in sync with assert-base.ss. +;; These must be kept in sync with assert-base.rkt. (define prop:failure-assertion 'name) (define prop:failure-parameters 'params) (define prop:failure-location 'location) diff --git a/collects/schemeunit/private/gui/controller.rkt b/collects/rktunit/private/gui/controller.rkt similarity index 79% rename from collects/schemeunit/private/gui/controller.rkt rename to collects/rktunit/private/gui/controller.rkt index c89d3d9e9e..edcd4be075 100644 --- a/collects/schemeunit/private/gui/controller.rkt +++ b/collects/rktunit/private/gui/controller.rkt @@ -1,11 +1,11 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop unstable/gui/notify - "../base.ss" - "interfaces.ss" - "model.ss" - "view.ss") + "../base.rkt" + "interfaces.rkt" + "model.rkt" + "view.rkt") (provide controller%) (define controller% @@ -25,18 +25,18 @@ ;; create-model : test suite<%>/#f -> result<%> (define/public (create-model test parent) (define result - (cond [(schemeunit-test-case? test) + (cond [(rktunit-test-case? test) (new case-result% (controller this) (test test) - (name (or (schemeunit-test-case-name test) + (name (or (rktunit-test-case-name test) "")) (parent parent))] - [(schemeunit-test-suite? test) + [(rktunit-test-suite? test) (new suite-result% (controller this) (test test) - (name (or (schemeunit-test-suite-name test) + (name (or (rktunit-test-suite-name test) "")) (parent parent))])) (send/i view view<%> create-view-link result parent) diff --git a/collects/schemeunit/private/gui/drscheme-link.rkt b/collects/rktunit/private/gui/drracket-link.rkt similarity index 76% rename from collects/schemeunit/private/gui/drscheme-link.rkt rename to collects/rktunit/private/gui/drracket-link.rkt index ecdc54579b..e247e9af6f 100644 --- a/collects/schemeunit/private/gui/drscheme-link.rkt +++ b/collects/rktunit/private/gui/drracket-link.rkt @@ -1,7 +1,7 @@ ;; Written in #%kernel to avoid adding any module-attachment -;; dependencies. Initialized by the DrScheme integration tool. +;; dependencies. Initialized by the DrRacket integration tool. -(module drscheme-link '#%kernel +(module drracket-link '#%kernel (#%provide link) #| diff --git a/collects/schemeunit/private/gui/drscheme-ui.rkt b/collects/rktunit/private/gui/drracket-ui.rkt similarity index 94% rename from collects/schemeunit/private/gui/drscheme-ui.rkt rename to collects/rktunit/private/gui/drracket-ui.rkt index 92ab07313c..d6dd57b4d2 100644 --- a/collects/schemeunit/private/gui/drscheme-ui.rkt +++ b/collects/rktunit/private/gui/drracket-ui.rkt @@ -1,10 +1,10 @@ -#lang scheme/base -(require scheme/list - scheme/string +#lang racket/base +(require racket/list + racket/string mzlib/etc - "drscheme-link.ss") + "drracket-link.rkt") -;; Procedures which *may* be overridden by DrScheme to do useful things. +;; Procedures which *may* be overridden by DrRacket to do useful things. ;; Or they may not be. (provide has-backtrace? diff --git a/collects/schemeunit/private/gui/gui.rkt b/collects/rktunit/private/gui/gui.rkt similarity index 90% rename from collects/schemeunit/private/gui/gui.rkt rename to collects/rktunit/private/gui/gui.rkt index efb4289c46..782875f0e1 100644 --- a/collects/schemeunit/private/gui/gui.rkt +++ b/collects/rktunit/private/gui/gui.rkt @@ -1,13 +1,13 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop - scheme/gui - "../base.ss" - "../result.ss" - "../check-info.ss" - "interfaces.ss" - "controller.ss" - "view.ss") + racket/gui + "../base.rkt" + "../result.rkt" + "../check-info.rkt" + "interfaces.rkt" + "controller.rkt" + "view.rkt") (provide make-gui-runner) (define (make-gui-runner) @@ -48,8 +48,8 @@ #| (define/public (run) (let ([custodian (make-custodian)] - [before (schemeunit-test-suite-before test)] - [after (schemeunit-test-suite-after test)]) + [before (rktunit-test-suite-before test)] + [after (rktunit-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 (schemeunit-test-case-name test) - (schemeunit-test-case-action test)))))]) + (list (rktunit-test-case-name test) + (rktunit-test-case-action test)))))]) (values (car results) (list cputime realtime gctime)))) (define (make-output-ports) diff --git a/collects/schemeunit/private/gui/gvector.rkt b/collects/rktunit/private/gui/gvector.rkt similarity index 98% rename from collects/schemeunit/private/gui/gvector.rkt rename to collects/rktunit/private/gui/gvector.rkt index cf3c3433ac..c5eadfedb7 100644 --- a/collects/schemeunit/private/gui/gvector.rkt +++ b/collects/rktunit/private/gui/gvector.rkt @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/contract - scheme/dict) +#lang racket/base +(require racket/contract + racket/dict) (define (make-gvector* #:capacity [capacity 10]) (make-gvector (make-vector capacity #f) 0)) diff --git a/collects/schemeunit/private/gui/interfaces.rkt b/collects/rktunit/private/gui/interfaces.rkt similarity index 96% rename from collects/schemeunit/private/gui/interfaces.rkt rename to collects/rktunit/private/gui/interfaces.rkt index b48007a9c7..5aa08506c2 100644 --- a/collects/schemeunit/private/gui/interfaces.rkt +++ b/collects/rktunit/private/gui/interfaces.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop) (provide (all-defined-out)) diff --git a/collects/schemeunit/private/gui/model.rkt b/collects/rktunit/private/gui/model.rkt similarity index 96% rename from collects/schemeunit/private/gui/model.rkt rename to collects/rktunit/private/gui/model.rkt index aaee04c5a3..110efadbdb 100644 --- a/collects/schemeunit/private/gui/model.rkt +++ b/collects/rktunit/private/gui/model.rkt @@ -1,11 +1,11 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop - scheme/list - "gvector.ss" - "../base.ss" - "interfaces.ss" - "cache-box.ss") + racket/list + "gvector.rkt" + "../base.rkt" + "interfaces.rkt" + "cache-box.rkt") (provide case-result% suite-result%) diff --git a/collects/schemeunit/private/gui/model2rml.rkt b/collects/rktunit/private/gui/model2rml.rkt similarity index 98% rename from collects/schemeunit/private/gui/model2rml.rkt rename to collects/rktunit/private/gui/model2rml.rkt index c9f48fe4b6..fb10840a08 100644 --- a/collects/schemeunit/private/gui/model2rml.rkt +++ b/collects/rktunit/private/gui/model2rml.rkt @@ -1,14 +1,14 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop - scheme/list - scheme/gui - scheme/match - scheme/file + racket/list + racket/gui + racket/match + racket/file mrlib/include-bitmap - (prefix-in drlink: "drscheme-ui.ss") - "interfaces.ss" - "config.ss") + (prefix-in drlink: "drracket-ui.rkt") + "interfaces.rkt" + "config.rkt") (provide model-renderer% output-icon) @@ -404,12 +404,12 @@ (put '() " ") (put+click '(clickback) (lambda _ (drlink:show-errortrace-backtrace exn)) - "[from DrScheme]")) + "[from DrRacket]")) (when (drlink:has-primitive-backtrace? exn) (put '() " ") (put+click '(clickback) (lambda _ (drlink:show-primitive-backtrace exn)) - "[from mzscheme]"))) + "[from racket]"))) (define/private (render-output model) (let [(output (send/i model case<%> get-output))] diff --git a/collects/schemeunit/private/gui/output-icon.png b/collects/rktunit/private/gui/output-icon.png similarity index 100% rename from collects/schemeunit/private/gui/output-icon.png rename to collects/rktunit/private/gui/output-icon.png diff --git a/collects/schemeunit/private/gui/rml.rkt b/collects/rktunit/private/gui/rml.rkt similarity index 95% rename from collects/schemeunit/private/gui/rml.rkt rename to collects/rktunit/private/gui/rml.rkt index 1e44c7f49a..885958b307 100644 --- a/collects/schemeunit/private/gui/rml.rkt +++ b/collects/rktunit/private/gui/rml.rkt @@ -1,13 +1,13 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop - scheme/gui + racket/gui framework - "interfaces.ss") + "interfaces.rkt") (provide insert-text ext:text% - schemeunit-style-map) + rktunit-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 schemeunit-style-map)) + (init-field (style-map rktunit-style-map)) (inherit last-position change-style set-clickback @@ -139,7 +139,7 @@ [error . ,style:red] [value . ,style:darkblue])) -(define schemeunit-styles +(define rktunit-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)) -;; schemeunit-style-map : style-map<%> -(define schemeunit-style-map +;; rktunit-style-map : style-map<%> +(define rktunit-style-map (extend-style-map basic-style-map - schemeunit-styles)) + rktunit-styles)) diff --git a/collects/schemeunit/private/gui/view.rkt b/collects/rktunit/private/gui/view.rkt similarity index 96% rename from collects/schemeunit/private/gui/view.rkt rename to collects/rktunit/private/gui/view.rkt index fdb7175f7b..0b840db5f5 100644 --- a/collects/schemeunit/private/gui/view.rkt +++ b/collects/rktunit/private/gui/view.rkt @@ -1,19 +1,19 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class unstable/class-iop - scheme/list - scheme/gui + racket/list + racket/gui framework mrlib/hierlist - "interfaces.ss" - "config.ss" - "model2rml.ss" - "rml.ss") + "interfaces.rkt" + "config.rkt" + "model2rml.rkt" + "rml.rkt") (provide make-view-frame view%) -(define style-map schemeunit-style-map) +(define style-map rktunit-style-map) #| @@ -50,7 +50,7 @@ still be there, just not visible? controller) (super-new) - (define editor (new ext:text% (style-map schemeunit-style-map))) + (define editor (new ext:text% (style-map rktunit-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 'schemeunit-gui + (error 'rktunit-gui "internal error: no progress waiting for view-link")) (do-model-update model)]))) diff --git a/collects/schemeunit/private/hash-monad.rkt b/collects/rktunit/private/hash-monad.rkt similarity index 97% rename from collects/schemeunit/private/hash-monad.rkt rename to collects/rktunit/private/hash-monad.rkt index cada8c6b14..1cfa803e50 100644 --- a/collects/schemeunit/private/hash-monad.rkt +++ b/collects/rktunit/private/hash-monad.rkt @@ -26,9 +26,9 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require "monad.ss") +(require "monad.rkt") (provide (all-defined-out)) diff --git a/collects/schemeunit/private/location.rkt b/collects/rktunit/private/location.rkt similarity index 96% rename from collects/schemeunit/private/location.rkt rename to collects/rktunit/private/location.rkt index 28b4414c43..2a9fa1b480 100644 --- a/collects/schemeunit/private/location.rkt +++ b/collects/rktunit/private/location.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/list) +(require racket/list) (provide location-source location-line diff --git a/collects/schemeunit/private/monad.rkt b/collects/rktunit/private/monad.rkt similarity index 99% rename from collects/schemeunit/private/monad.rkt rename to collects/rktunit/private/monad.rkt index 6bde98ccb6..aa847ad55a 100644 --- a/collects/schemeunit/private/monad.rkt +++ b/collects/rktunit/private/monad.rkt @@ -26,7 +26,7 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base (provide (all-defined-out)) diff --git a/collects/schemeunit/private/name-collector.rkt b/collects/rktunit/private/name-collector.rkt similarity index 95% rename from collects/schemeunit/private/name-collector.rkt rename to collects/rktunit/private/name-collector.rkt index cc14dbdecf..bcd89735fe 100644 --- a/collects/schemeunit/private/name-collector.rkt +++ b/collects/rktunit/private/name-collector.rkt @@ -26,11 +26,11 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require "base.ss" - "monad.ss" - "hash-monad.ss" +(require "base.rkt" + "monad.rkt" + "hash-monad.rkt" srfi/1) (provide display-test-case-name diff --git a/collects/schemeunit/private/result.rkt b/collects/rktunit/private/result.rkt similarity index 94% rename from collects/schemeunit/private/result.rkt rename to collects/rktunit/private/result.rkt index 915b1f0d1d..61a553ffa4 100644 --- a/collects/schemeunit/private/result.rkt +++ b/collects/rktunit/private/result.rkt @@ -26,10 +26,10 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require "base.ss" - "test-suite.ss") +(require "base.rkt" + "test-suite.rkt") (provide (all-defined-out)) @@ -51,12 +51,12 @@ ;; data so FP is a bit ugly]. (define (foldts fdown fup fhere seed test) (cond - ((schemeunit-test-case? test) + ((rktunit-test-case? test) (fhere test - (schemeunit-test-case-name test) - (schemeunit-test-case-action test) + (rktunit-test-case-name test) + (rktunit-test-case-action test) seed)) - ((schemeunit-test-suite? test) + ((rktunit-test-suite? test) (apply-test-suite test fdown fup fhere seed)) (else (raise diff --git a/collects/schemeunit/private/test-case.rkt b/collects/rktunit/private/test-case.rkt similarity index 95% rename from collects/schemeunit/private/test-case.rkt rename to collects/rktunit/private/test-case.rkt index 08921661b2..3d4618856c 100644 --- a/collects/schemeunit/private/test-case.rkt +++ b/collects/rktunit/private/test-case.rkt @@ -1,10 +1,10 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - "base.ss" - "format.ss" - "check-info.ss" - "check.ss") +(require (for-syntax racket/base) + "base.rkt" + "format.rkt" + "check-info.rkt" + "check.rkt") (provide current-test-name current-test-case-around diff --git a/collects/schemeunit/private/test-suite.rkt b/collects/rktunit/private/test-suite.rkt similarity index 83% rename from collects/schemeunit/private/test-suite.rkt rename to collects/rktunit/private/test-suite.rkt index aa586d749c..d59ef78e38 100644 --- a/collects/schemeunit/private/test-suite.rkt +++ b/collects/rktunit/private/test-suite.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - "base.ss" - "test-case.ss" - "check.ss") +(require (for-syntax racket/base) + "base.rkt" + "test-case.rkt" + "check.rkt") (provide test-suite test-suite-test-case-around @@ -27,14 +27,14 @@ (define (test-suite-test-case-around fhere) (lambda (thunk) (let* ([name (current-test-name)] - [test (make-schemeunit-test-case name thunk)] + [test (make-rktunit-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-schemeunit-test-case name thunk)] + [test (make-rktunit-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-schemeunit-test-case name thunk)))) + (make-rktunit-test-case name thunk)))) (define delayed-check-around (lambda (thunk) (let ([name #f]) - (make-schemeunit-test-case name thunk)))) + (make-rktunit-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 (schemeunit-test-suite-name suite)] - [tests (schemeunit-test-suite-tests suite)] - [before (schemeunit-test-suite-before suite)] - [after (schemeunit-test-suite-after suite)] + (let* ([name (rktunit-test-suite-name suite)] + [tests (rktunit-test-suite-tests suite)] + [before (rktunit-test-suite-before suite)] + [after (rktunit-test-suite-after suite)] [kid-seed (fdown suite name before after seed)] - [kid-seed ((schemeunit-test-suite-tests suite) fdown fup fhere kid-seed)]) + [kid-seed ((rktunit-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 [(schemeunit-test-suite? x) + (cond [(rktunit-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-schemeunit-test-suite + (make-rktunit-test-suite the-name the-tests before-thunk @@ -138,13 +138,13 @@ (for-each (lambda (t) (cond - [(schemeunit-test-suite? t) + [(rktunit-test-suite? t) (current-seed (apply-test-suite t fdown fup fhere (current-seed)))] - [(schemeunit-test-case? t) + [(rktunit-test-case? t) (current-seed (fhere t - (schemeunit-test-case-name t) - (schemeunit-test-case-action t) + (rktunit-test-case-name t) + (rktunit-test-case-action t) (current-seed)))] [else (raise @@ -158,7 +158,7 @@ ;; ;; Construct a test suite from a list of tests (define (make-test-suite name #:before [before void-thunk] #:after [after void-thunk] tests) - (make-schemeunit-test-suite name + (make-rktunit-test-suite name (tests->test-suite-action tests) before after)) diff --git a/collects/schemeunit/private/test.rkt b/collects/rktunit/private/test.rkt similarity index 87% rename from collects/schemeunit/private/test.rkt rename to collects/rktunit/private/test.rkt index 47001dcd16..f6ad6fec2d 100644 --- a/collects/schemeunit/private/test.rkt +++ b/collects/rktunit/private/test.rkt @@ -1,13 +1,13 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - "base.ss" - "check.ss" - "check-info.ss" - "result.ss" - "test-case.ss" - "test-suite.ss" - "util.ss") +(require (for-syntax racket/base) + "base.rkt" + "check.rkt" + "check-info.rkt" + "result.rkt" + "test-case.rkt" + "test-suite.rkt" + "util.rkt") (provide (struct-out exn:test:check) (struct-out check-info) @@ -15,8 +15,8 @@ (struct-out test-failure) (struct-out test-error) (struct-out test-success) - (struct-out schemeunit-test-case) - (struct-out schemeunit-test-suite) + (struct-out rktunit-test-case) + (struct-out rktunit-test-suite) with-check-info with-check-info* @@ -42,9 +42,9 @@ test-suite make-test-suite delay-test - (rename-out [make-schemeunit-test-case make-test-case] - [schemeunit-test-case? test-case?] - [schemeunit-test-suite? test-suite?]) + (rename-out [make-rktunit-test-case make-test-case] + [rktunit-test-case? test-case?] + [rktunit-test-suite? test-suite?]) define-test-suite define/provide-test-suite diff --git a/collects/schemeunit/private/text-ui-util.rkt b/collects/rktunit/private/text-ui-util.rkt similarity index 98% rename from collects/schemeunit/private/text-ui-util.rkt rename to collects/rktunit/private/text-ui-util.rkt index b84f90067d..affc9ca7b2 100644 --- a/collects/schemeunit/private/text-ui-util.rkt +++ b/collects/rktunit/private/text-ui-util.rkt @@ -26,7 +26,7 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base (require (only-in srfi/13 string-contains string-drop)) diff --git a/collects/schemeunit/private/util.rkt b/collects/rktunit/private/util.rkt similarity index 92% rename from collects/schemeunit/private/util.rkt rename to collects/rktunit/private/util.rkt index e37ea67814..6a471d5d48 100644 --- a/collects/schemeunit/private/util.rkt +++ b/collects/rktunit/private/util.rkt @@ -26,13 +26,13 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) +(require (for-syntax racket/base) mzlib/etc - "check.ss" - "test-suite.ss" - "test-case.ss") + "check.rkt" + "test-suite.rkt" + "test-case.rkt") (provide require/expose test-suite* @@ -41,7 +41,7 @@ ;; Requires a module and exposes some of its unprovided ;; (non-syntax!) identifiers. ;; USAGE: (require/expose MODULE-NAME (IDS ...)) -;; where MODULE-NAME is as in the MzScheme manual (i.e., +;; where MODULE-NAME is as in the MzRacket manual (i.e., ;; a standard module spec) and IDS are the un-provided ;; identifiers that you wish to expose in the current ;; module. diff --git a/collects/schemeunit/scribblings/acknowledgements.scrbl b/collects/rktunit/scribblings/acknowledgements.scrbl similarity index 73% rename from collects/schemeunit/scribblings/acknowledgements.scrbl rename to collects/rktunit/scribblings/acknowledgements.scrbl index 44c1cdb2db..147afc0b73 100644 --- a/collects/schemeunit/scribblings/acknowledgements.scrbl +++ b/collects/rktunit/scribblings/acknowledgements.scrbl @@ -1,18 +1,18 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title{Acknowlegements} -The following people have contributed to SchemeUnit: +The following people have contributed to RktUnit: @itemize[ @item{Robby Findler pushed me to release version 3} @item{Matt Jadud and his students at Olin College - suggested renaming @scheme[test/text-ui]} + suggested renaming @racket[test/text-ui]} @item{Dave Gurnell reported a bug in check-not-exn and - suggested improvements to SchemeUnit} + suggested improvements to RktUnit} @item{Danny Yoo reported a bug in and provided a fix for trim-current-directory} @@ -30,15 +30,15 @@ The following people have contributed to SchemeUnit: @item{Jose A. Ortega Ruiz alerted me a problem in the packaging system and helped fix it.} - @item{Sebastian H. Seidel provided help packaging SchemeUnit + @item{Sebastian H. Seidel provided help packaging RktUnit into a .plt} @item{Don Blaheta provided the method for grabbing line number and file name in checks} - @item{Patrick Logan ported example.ss to version 1.3} + @item{Patrick Logan ported example.rkt to version 1.3} - @item{The PLT team made PLT Scheme} + @item{The PLT team made Racket} @item{The Extreme Programming community started the whole testing framework thing} diff --git a/collects/schemeunit/scribblings/api.scrbl b/collects/rktunit/scribblings/api.scrbl similarity index 71% rename from collects/schemeunit/scribblings/api.scrbl rename to collects/rktunit/scribblings/api.scrbl index fda010b35c..33ef4912a8 100644 --- a/collects/schemeunit/scribblings/api.scrbl +++ b/collects/rktunit/scribblings/api.scrbl @@ -1,10 +1,10 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") -@title[#:tag "api"]{SchemeUnit API} +@title[#:tag "api"]{RktUnit API} -@defmodule[schemeunit - #:use-sources (schemeunit)] +@defmodule[rktunit + #:use-sources (rktunit)] @include-section["overview.scrbl"] @include-section["check.scrbl"] diff --git a/collects/schemeunit/scribblings/base.rkt b/collects/rktunit/scribblings/base.rkt similarity index 55% rename from collects/schemeunit/scribblings/base.rkt rename to collects/rktunit/scribblings/base.rkt index d78402873e..8189c12769 100644 --- a/collects/schemeunit/scribblings/base.rkt +++ b/collects/rktunit/scribblings/base.rkt @@ -6,15 +6,15 @@ (for-label scheme/base scheme/contract - schemeunit - schemeunit/text-ui - schemeunit/gui)) + rktunit + rktunit/text-ui + rktunit/gui)) (provide (all-from-out scribble/eval scribble/manual) (for-label (all-from-out scheme/base scheme/contract - schemeunit - schemeunit/text-ui - schemeunit/gui))) + rktunit + rktunit/text-ui + rktunit/gui))) diff --git a/collects/schemeunit/scribblings/check.scrbl b/collects/rktunit/scribblings/check.scrbl similarity index 68% rename from collects/schemeunit/scribblings/check.scrbl rename to collects/rktunit/scribblings/check.scrbl index 165f123e7b..80de0ae33b 100644 --- a/collects/schemeunit/scribblings/check.scrbl +++ b/collects/rktunit/scribblings/check.scrbl @@ -1,12 +1,12 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title{Checks} -Checks are the basic building block of SchemeUnit. A check +Checks are the basic building block of RktUnit. A check checks some condition. If the condition holds the check -evaluates to @scheme[#t]. If the condition doesn't hold the -check raises an instance of @scheme[exn:test:check] with +evaluates to @racket[#t]. If the condition doesn't hold the +check raises an instance of @racket[exn:test:check] with information detailing the failure. Although checks are implemented as macros, which is @@ -16,8 +16,8 @@ their arguments. You can use check as first class functions, though you will lose precision in the reported source locations if you do so. -The following are the basic checks SchemeUnit provides. You -can create your own checks using @scheme[define-check]. +The following are the basic checks RktUnit provides. You +can create your own checks using @racket[define-check]. @defproc[(check (op (-> any any any)) (v1 any) @@ -25,11 +25,11 @@ can create your own checks using @scheme[define-check]. (message string? "")) any]{ -The simplest check. Succeeds if @scheme[op] applied to @scheme[v1] and @scheme[v2] is not @scheme[#f], otherwise raises an exception of type @scheme[exn:test:check]. The optional @scheme[message] is included in the output if the check fails. If the check succeeds, the value returned by @scheme[op] is the value returned by the check.} +The simplest check. Succeeds if @racket[op] applied to @racket[v1] and @racket[v2] is not @racket[#f], otherwise raises an exception of type @racket[exn:test:check]. The optional @racket[message] is included in the output if the check fails. If the check succeeds, the value returned by @racket[op] is the value returned by the check.} For example, the following check succeeds: -@schemeblock[ +@racketblock[ (check < 2 3) ] @@ -39,14 +39,14 @@ For example, the following check succeeds: [(check-equal? (v1 any) (v2 any) (message string? "")) #t] [(check-not-equal? (v1 any) (v2 any) (message string? "")) #t])]{ -Checks that @scheme[v1] is (not) @scheme[eq?], -@scheme[eqv?], or @scheme[equal?] to @scheme[v2]. The -optional @scheme[message] is included in the output if the +Checks that @racket[v1] is (not) @racket[eq?], +@racket[eqv?], or @racket[equal?] to @racket[v2]. The +optional @racket[message] is included in the output if the check fails.} For example, the following checks all fail: -@schemeblock[ +@racketblock[ (check-eq? (list 1) (list 1) "allocated data not eq?") (check-not-eq? 1 1 "integers are eq?") (check-eqv? 1 1.0 "not eqv?") @@ -55,11 +55,11 @@ For example, the following checks all fail: ] @defproc[(check-pred (pred (-> any any)) (v any) (message string? "")) - #t]{Checks that @scheme[pred] returns a value that is not @scheme[#f] when applied to @scheme[v]. The optional @scheme[message] is included in the output if the check fails. The value returned by a successful check is the value returned by @scheme[pred].} + #t]{Checks that @racket[pred] returns a value that is not @racket[#f] when applied to @racket[v]. The optional @racket[message] is included in the output if the check fails. The value returned by a successful check is the value returned by @racket[pred].} Here's an example that passes and an example that fails: -@schemeblock[ +@racketblock[ (check-pred string? "I work") (check-pred number? "I fail") ] @@ -67,14 +67,14 @@ Here's an example that passes and an example that fails: @defproc[(check-= (v1 any) (v2 any) (epsilon number?) (message string? "")) #t]{ -Checks that @scheme[v1] and @scheme[v2] are within -@scheme[epsilon] of one another. The optional -@scheme[message] is included in the output if the check +Checks that @racket[v1] and @racket[v2] are within +@racket[epsilon] of one another. The optional +@racket[message] is included in the output if the check fails.} Here's an example that passes and an example that fails: -@schemeblock[ +@racketblock[ (check-= 1.0 1.01 0.01 "I work") (check-= 1.0 1.01 0.005 "I fail") ] @@ -83,13 +83,13 @@ Here's an example that passes and an example that fails: [(check-false (v any) (message string? "")) #t] [(check-not-false (v any) (message string? "")) #t])]{ -Checks that @scheme[v] is @scheme[#t], @scheme[#f], or not -@scheme[#f] as appropriate. The optional @scheme[message] +Checks that @racket[v] is @racket[#t], @racket[#f], or not +@racket[#f] as appropriate. The optional @racket[message] is included in the output if the check fails.} For example, the following checks all fail: -@schemeblock[ +@racketblock[ (check-true 1) (check-false 1) (check-not-false #f) @@ -99,16 +99,16 @@ For example, the following checks all fail: @defproc[(check-exn (exn-predicate (-> any (or/c #t #f))) (thunk (-> any)) (message string? "")) #t]{ -Checks that @scheme[thunk] raises an exception for which -@scheme[exn-predicate] returns @scheme[#t]. The optional -@scheme[message] is included in the output if the check +Checks that @racket[thunk] raises an exception for which +@racket[exn-predicate] returns @racket[#t]. The optional +@racket[message] is included in the output if the check fails. A common error is to use an expression instead of a -function of no arguments for @scheme[thunk]. Remember that +function of no arguments for @racket[thunk]. Remember that checks are conceptually functions.} Here are two example, one showing a test that succeeds, and one showing a common error: -@schemeblock[ +@racketblock[ (check-exn exn? (lambda () (raise (make-exn "Hi there" @@ -121,22 +121,22 @@ Here are two example, one showing a test that succeeds, and one showing a common @defproc[(check-not-exn (thunk (-> any)) (message string? "")) #t]{ -Checks that @scheme[thunk] does not raise any exceptions. -The optional @scheme[message] is included in the output if +Checks that @racket[thunk] does not raise any exceptions. +The optional @racket[message] is included in the output if the check fails.} -@defproc[(fail (message string? "")) #t]{This checks fails unconditionally. Good for creating test stubs that youintend to fill out later. The optional @scheme[message] is included in the output if the check fails.} +@defproc[(fail (message string? "")) #t]{This checks fails unconditionally. Good for creating test stubs that youintend to fill out later. The optional @racket[message] is included in the output if the check fails.} -@defproc[(check-regexp-match (regexp regexp?) (string string?)) #t]{Checks that @scheme[regexp] matches the @scheme[string].} +@defproc[(check-regexp-match (regexp regexp?) (string string?)) #t]{Checks that @racket[regexp] matches the @racket[string].} The following check will succeed: -@schemeblock[(check-regexp-match "a+bba" "aaaaaabba")] +@racketblock[(check-regexp-match "a+bba" "aaaaaabba")] This check will fail: -@schemeblock[(check-regexp-match "a+bba" "aaaabbba")] +@racketblock[(check-regexp-match "a+bba" "aaaabbba")] @@ -146,8 +146,8 @@ When an check fails it stores information including the name of the check, the location and message (if available), the expression the check is called with, and the parameters to the check. Additional information can be stored by using -the @scheme[with-check-info*] function, and the -@scheme[with-check-info] macro. +the @racket[with-check-info*] function, and the +@racket[with-check-info] macro. @defstruct[check-info ([name symbol?] [value any])]{ @@ -170,13 +170,13 @@ misspelling errors: @defproc[(with-check-info* (info (listof check-info?)) (thunk (-> any))) any]{ -Stores the given @scheme[info] on the check-info stack for +Stores the given @racket[info] on the check-info stack for the duration (the dynamic extent) of the execution of -@scheme[thunk]} +@racket[thunk]} Example: -@schemeblock[ +@racketblock[ (with-check-info* (list (make-check-info 'time (current-seconds))) (lambda () (check = 1 2))) @@ -191,14 +191,14 @@ check failure. @defform[(with-check-info ((name val) ...) body ...)]{ -The @scheme[with-check-info] macro stores the given +The @racket[with-check-info] macro stores the given information in the check information stack for the duration -of the execution of the body expressions. @scheme[Name] is -a quoted symbol and @scheme[val] is any value.} +of the execution of the body expressions. @racket[Name] is +a quoted symbol and @racket[val] is any value.} Example: -@schemeblock[ +@racketblock[ (for-each (lambda (elt) (with-check-info @@ -218,7 +218,7 @@ check failure. @section{Custom Checks} -Custom checks can be defined using @scheme[define-check] and +Custom checks can be defined using @racket[define-check] and its variants. To effectively use these macros it is useful to understand a few details about a check's evaluation model. @@ -229,17 +229,17 @@ always evaluate their arguments exactly once before executing any expressions in the body of the checks. Hence if you wish to write checks that evalute user defined code that code must be wrapped in a thunk (a function of no -arguments) by the user. The predefined @scheme[check-exn] +arguments) by the user. The predefined @racket[check-exn] is an example of this type of check. It is also useful to understand how the check information stack operates. The stack is stored in a parameter and the -@scheme[with-check-info] forms evaluate to calls to -@scheme[parameterize]. Hence check information has lexical +@racket[with-check-info] forms evaluate to calls to +@racket[parameterize]. Hence check information has lexical scope. For this reason simple checks (see below) cannot -usefully contain calls to @scheme[with-check-info] to report +usefully contain calls to @racket[with-check-info] to report additional information. All checks created using -@scheme[define-simple-check] or @scheme[define-check] grab +@racket[define-simple-check] or @racket[define-check] grab some information by default: the name of the checks and the values of the parameters. Additionally the macro forms of checks grab location information and the expressions passed @@ -247,26 +247,26 @@ as parameters. @defform[(define-simple-check (name param ...) expr ...)]{ -The @scheme[define-simple-check] macro constructs a check -called @scheme[name] that takes the params and an optional -message as arguments and evaluates the @scheme[expr]s. The -check fails if the result of the @scheme[expr]s is -@scheme[#f]. Otherwise the check succeeds. Note that +The @racket[define-simple-check] macro constructs a check +called @racket[name] that takes the params and an optional +message as arguments and evaluates the @racket[expr]s. The +check fails if the result of the @racket[expr]s is +@racket[#f]. Otherwise the check succeeds. Note that simple checks cannot report extra information using -@scheme[with-check-info].} +@racket[with-check-info].} Example: -To define a check @scheme[check-odd?] +To define a check @racket[check-odd?] -@schemeblock[ +@racketblock[ (define-simple-check (check-odd? number) (odd? number)) ] We can use these checks in the usual way: -@schemeblock[ +@racketblock[ (check-odd? 3) (code:comment "Success") (check-odd? 2) (code:comment "Failure") ] @@ -274,12 +274,12 @@ We can use these checks in the usual way: @defform*[[(define-binary-check (name pred actual expected)) (define-binary-check (name actual expected) expr ...)]]{ -The @scheme[define-binary-check] macro constructs a check +The @racket[define-binary-check] macro constructs a check that tests a binary predicate. It's benefit over -@scheme[define-simple-check] is in better reporting on check +@racket[define-simple-check] is in better reporting on check failure. The first form of the macro accepts a binary predicate and tests if the predicate holds for the given -values. The second form tests if @scheme[expr] non-false. +values. The second form tests if @racket[expr] non-false. } Examples: @@ -287,13 +287,13 @@ Examples: Here's the first form, where we use a predefined predicate to construct a binary check: -@schemeblock[ +@racketblock[ (define-binary-check (check-char=? char=? actual expected)) ] In use: -@schemeblock[ +@racketblock[ (check-char=? (read-char a-port) #\a) ] @@ -301,7 +301,7 @@ If the expression is more complicated the second form should be used. For example, below we define a binary check that tests a number if within 0.01 of the expected value: -@schemeblock[ +@racketblock[ (define-binary-check (check-in-tolerance actual expected) (< (abs (- actual expected)) 0.01)) ] @@ -309,22 +309,22 @@ tests a number if within 0.01 of the expected value: @defform[(define-check (name param ...) expr ...)]{ -The @scheme[define-check] macro acts in exactly the same way -as @scheme[define-simple-check], except the check only fails -if the macro @scheme[fail-check] is called in the body of +The @racket[define-check] macro acts in exactly the same way +as @racket[define-simple-check], except the check only fails +if the macro @racket[fail-check] is called in the body of the check. This allows more flexible checks, and in particular more flexible reporting options.} -@defform[(fail-check)]{The @scheme[fail-check] macro raises an @scheme[exn:test:check] with +@defform[(fail-check)]{The @racket[fail-check] macro raises an @racket[exn:test:check] with the contents of the check information stack.} @section{The Check Evaluation Context} The semantics of checks are determined by the parameters -@scheme[current-check-around] and -@scheme[current-check-handler]. Other testing form such as -@scheme[test-begin] and @scheme[test-suite] change the value +@racket[current-check-around] and +@racket[current-check-handler]. Other testing form such as +@racket[test-begin] and @racket[test-suite] change the value of these parameters. @defparam[current-check-handler handler (-> any/c any/c)]{ @@ -338,8 +338,8 @@ trace. } Parameter containing the function that handles the execution of checks. The default value wraps the evaluation of -@scheme[thunk] in a @scheme[with-handlers] call that calls -@scheme[current-check-handler] if an exception is raised and then +@racket[thunk] in a @racket[with-handlers] call that calls +@racket[current-check-handler] if an exception is raised and then (when an exception is not raised) discards the result, returning -@scheme[(void)]. +@racket[(void)]. } diff --git a/collects/schemeunit/scribblings/compound-testing.scrbl b/collects/rktunit/scribblings/compound-testing.scrbl similarity index 74% rename from collects/schemeunit/scribblings/compound-testing.scrbl rename to collects/rktunit/scribblings/compound-testing.scrbl index 74011e4f68..1879fe71ea 100644 --- a/collects/schemeunit/scribblings/compound-testing.scrbl +++ b/collects/rktunit/scribblings/compound-testing.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title{Compound Testing Forms} @@ -15,14 +15,14 @@ will not be evaluated. @defform[(test-begin expr ...)]{ -A @scheme[test-begin] form groups the @scheme[expr]s into a -single unit. If any @scheme[expr] fails the following ones +A @racket[test-begin] form groups the @racket[expr]s into a +single unit. If any @racket[expr] fails the following ones are not evaluated. } For example, in the following code the world is not destroyed as the preceding check fails: -@schemeblock[ +@racketblock[ (test-begin (check-eq? 'a 'b) (code:comment "This line won't be run") @@ -31,14 +31,14 @@ destroyed as the preceding check fails: @defform[(test-case name expr ...)]{ -Like a @scheme[test-begin] except a name is associated with -the group of @scheme[expr]s. The name will be reported if +Like a @racket[test-begin] except a name is associated with +the group of @racket[expr]s. The name will be reported if the test fails. } -Here's the above example rewritten to use @scheme[test-case] +Here's the above example rewritten to use @racket[test-case] so the test can be named. -@schemeblock[ +@racketblock[ (test-case "Example test" (check-eq? 'a 'b) @@ -48,7 +48,7 @@ so the test can be named. @defproc[(test-case? (obj any)) boolean?]{ - True if @scheme[obj] is a test case, and false otherwise + True if @racket[obj] is a test case, and false otherwise } @@ -69,10 +69,10 @@ run. Instead use one of the functions described in #:contracts ([name-expr string?])]{ Constructs a test suite with the given name and tests. The -tests may be test cases, constructed using @scheme[test-begin] or -@scheme[test-case], or other test suites. +tests may be test cases, constructed using @racket[test-begin] or +@racket[test-case], or other test suites. -The @scheme[before-thunk] and @scheme[after-thunk] are +The @racket[before-thunk] and @racket[after-thunk] are optional thunks (functions with no argument). They are run before and after the tests are run, respectively. @@ -84,7 +84,7 @@ For example, here is a test suite that displays @tt{Before} before any tests are run, and @tt{After} when the tests have finished. -@schemeblock[ +@racketblock[ (test-suite "An example suite" #:before (lambda () (display "Before")) @@ -103,13 +103,13 @@ finished. [#:after after-thunk (-> any) void]) test-suite?]{ -Constructs a test suite with the given @scheme[name] containing the -given @scheme[tests]. Unlike the @scheme[test-suite] form, the tests +Constructs a test suite with the given @racket[name] containing the +given @racket[tests]. Unlike the @racket[test-suite] form, the tests are represented as a list of test values. } @defproc[(test-suite? (obj any)) boolean?]{ True if -@scheme[obj] is a test suite, and false otherwise} +@racket[obj] is a test suite, and false otherwise} @@ -119,25 +119,25 @@ There are some macros that simplify the common cases of defining test suites: @defform[(define-test-suite name test ...)]{ The -@scheme[define-test-suite] form creates a test suite with +@racket[define-test-suite] form creates a test suite with the given name (converted to a string) and tests, and binds it to the same name.} For example, this code creates a binding for the name -@scheme[example-suite] as well as creating a test suite with -the name @scheme["example-suite"]: +@racket[example-suite] as well as creating a test suite with +the name @racket["example-suite"]: -@schemeblock[ +@racketblock[ (define-test-suite example-suite (check = 1 1)) ] @defform[(define/provide-test-suite name test ...)]{ This -for is just like @scheme[define-test-suite], and in addition -it @scheme[provide]s the test suite.} +for is just like @racket[define-test-suite], and in addition +it @racket[provide]s the test suite.} @;{ -Finally, there is the @scheme[test-suite*] macro, which +Finally, there is the @racket[test-suite*] macro, which defines a test suite and test cases using a shorthand syntax: @@ -147,7 +147,7 @@ creates test cases within the suite, with the given names and body expressions. As far I know no-one uses this macro, so it might disappear -in future versions of SchemeUnit.} +in future versions of RktUnit.} } @@ -159,8 +159,8 @@ control the semantics of compound testing forms. @defparam[current-test-name name (or/c string? false/c)]{ This parameter stores the name of the current test case. A -value of @scheme[#f] indicates a test case with no name, -such as one constructed by @scheme[test-begin]. } +value of @racket[#f] indicates a test case with no name, +such as one constructed by @racket[test-begin]. } @defparam[current-test-case-around handler (-> (-> any/c) any/c)]{ @@ -168,20 +168,20 @@ This parameter handles evaluation of test cases. The value of the parameter is a function that is passed a thunk (a function of no arguments). The function, when applied, evaluates the expressions within a test case. The default -value of the @scheme[current-test-case-around] parameters +value of the @racket[current-test-case-around] parameters evaluates the thunk in a context that catches exceptions and prints an appropriate message indicating test case failure.} @defproc[(test-suite-test-case-around [thunk (-> any/c)]) any/c]{ -The @scheme[current-test-case-around] parameter is +The @racket[current-test-case-around] parameter is parameterized to this value within the scope of a -@scheme[test-suite]. This function creates a test case +@racket[test-suite]. This function creates a test case structure instead of immediately evaluating the thunk.} @defproc[(test-suite-check-around [thunk (-> any/c)]) any/c]{ -The @scheme[current-check-around] parameter is parameterized -to this value within the scope of a @scheme[test-suite]. +The @racket[current-check-around] parameter is parameterized +to this value within the scope of a @racket[test-suite]. This function creates a test case structure instead of immediately evaluating a check.} diff --git a/collects/schemeunit/scribblings/control-flow.scrbl b/collects/rktunit/scribblings/control-flow.scrbl similarity index 60% rename from collects/schemeunit/scribblings/control-flow.scrbl rename to collects/rktunit/scribblings/control-flow.scrbl index 08a650694a..68f64cab66 100644 --- a/collects/schemeunit/scribblings/control-flow.scrbl +++ b/collects/rktunit/scribblings/control-flow.scrbl @@ -1,28 +1,28 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title{Test Control Flow} -The @scheme[before], @scheme[after], and @scheme[around] +The @racket[before], @racket[after], and @racket[around] macros allow you to specify code that is always run before, after, or around expressions in a test case. @defform[(before before-expr expr1 expr2 ...)]{ -Whenever control enters the scope execute the @scheme[before-expr] -before executing @scheme[expr-1], and @scheme[expr-2 ...]} +Whenever control enters the scope execute the @racket[before-expr] +before executing @racket[expr-1], and @racket[expr-2 ...]} @defform[(after expr-1 expr-2 ... after-expr)]{ -Whenever control exits the scope execute the @scheme[after-expr] -after executing @scheme[expr-1], and @scheme[expr-2 ...] The @scheme[after-expr] is +Whenever control exits the scope execute the @racket[after-expr] +after executing @racket[expr-1], and @racket[expr-2 ...] The @racket[after-expr] is executed even if control exits via an exception or other means.} @defform[(around before-expr expr-1 expr-2 ... after-expr)]{ Whenever control enters the scope execute the -@scheme[before-expr] before executing @scheme[expr-1 expr-2 -...], and execute @scheme[after-expr] whenever control +@racket[before-expr] before executing @racket[expr-1 expr-2 +...], and execute @racket[after-expr] whenever control leaves the scope.} Example: @@ -31,7 +31,7 @@ The test below checks that the file @tt{test.dat} contains the string @tt{"foo"}. The before action writes to this file. The after action deletes it. -@schemeblock[ +@racketblock[ (around (with-output-to-file "test.dat" (lambda () @@ -46,7 +46,7 @@ file. The after action deletes it. @defform[(delay-test test1 test2 ...)]{ This somewhat curious macro evaluates the given tests in a -context where @scheme[current-test-case-around] is -parameterized to @scheme[test-suite-test-case-around]. This -has been useful in testing SchemeUnit. It might be useful +context where @racket[current-test-case-around] is +parameterized to @racket[test-suite-test-case-around]. This +has been useful in testing RktUnit. It might be useful for you if you create test cases that create test cases.} diff --git a/collects/schemeunit/scribblings/file-test.scm b/collects/rktunit/scribblings/file-test.rkt similarity index 90% rename from collects/schemeunit/scribblings/file-test.scm rename to collects/rktunit/scribblings/file-test.rkt index f67ef480db..18413644d1 100644 --- a/collects/schemeunit/scribblings/file-test.scm +++ b/collects/rktunit/scribblings/file-test.rkt @@ -1,7 +1,7 @@ #lang scheme/base -(require schemeunit - "file.scm") +(require rktunit + "file.rkt") (check-equal? (my-+ 1 1) 2) (check-equal? (my-* 1 2) 2) diff --git a/collects/schemeunit/scribblings/file.scm b/collects/rktunit/scribblings/file.rkt similarity index 100% rename from collects/schemeunit/scribblings/file.scm rename to collects/rktunit/scribblings/file.rkt diff --git a/collects/rktunit/scribblings/misc.scrbl b/collects/rktunit/scribblings/misc.scrbl new file mode 100644 index 0000000000..264abdf849 --- /dev/null +++ b/collects/rktunit/scribblings/misc.scrbl @@ -0,0 +1,21 @@ +#lang scribble/doc +@(require "base.rkt") + +@title{Miscellaneous Utilities} + +The @racket[require/expose] macro allows you to access +bindings that a module does not provide. It is useful for +testing the private functions of modules. + +@defform[(require/expose module (id ...))]{ +Requires @racket[id] from @racket[module] into the current module. It doesn't matter if the source module provides the bindings or not; @racket[require/expose] can still get at them. + +Note that @racket[require/expose] can be a bit fragile, +especially when mixed with compiled code. Use at your own risk! +} + +This example gets @racket[make-failure-test], which is defined in a RktUnit test: + +@racketblock[ +(require/expose rktunit/private/check-test (make-failure-test)) +] diff --git a/collects/schemeunit/scribblings/overview.scrbl b/collects/rktunit/scribblings/overview.scrbl similarity index 78% rename from collects/schemeunit/scribblings/overview.scrbl rename to collects/rktunit/scribblings/overview.scrbl index 0cf7555d55..3d1efa629a 100644 --- a/collects/schemeunit/scribblings/overview.scrbl +++ b/collects/rktunit/scribblings/overview.scrbl @@ -1,9 +1,9 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") -@title{Overview of SchemeUnit} +@title{Overview of RktUnit} -There are three basic data types in SchemeUnit: +There are three basic data types in RktUnit: @itemize[ diff --git a/collects/schemeunit/scribblings/philosophy.scrbl b/collects/rktunit/scribblings/philosophy.scrbl similarity index 76% rename from collects/schemeunit/scribblings/philosophy.scrbl rename to collects/rktunit/scribblings/philosophy.scrbl index 9095c9039a..359e90ed96 100644 --- a/collects/schemeunit/scribblings/philosophy.scrbl +++ b/collects/rktunit/scribblings/philosophy.scrbl @@ -1,10 +1,10 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") -@title[#:tag "philosophy"]{The Philosophy of SchemeUnit} +@title[#:tag "philosophy"]{The Philosophy of RktUnit} -SchemeUnit is designed to allow tests to evolve in step with -the evolution of the program under testing. SchemeUnit +RktUnit is designed to allow tests to evolve in step with +the evolution of the program under testing. RktUnit scales from the unstructed checks suitable for simple programs to the complex structure necessary for large projects. @@ -19,23 +19,23 @@ For example, a HtDP student may be writing simple list functions such as length, and the properties they are checking are of the form: -@schemeblock[ +@racketblock[ (equal? (length null) 0) (equal? (length '(a)) 1) (equal? (length '(a b)) 2) ] -SchemeUnit directly supports this style of testing. A check +RktUnit directly supports this style of testing. A check on its own is a valid test. So the above examples may be -written in SchemeUnit as: +written in RktUnit as: -@schemeblock[ +@racketblock[ (check-equal? (length null) 0) (check-equal? (length '(a)) 1) (check-equal? (length '(a b)) 2) ] -Simple programs now get all the benefits of SchemeUnit with +Simple programs now get all the benefits of RktUnit with very little overhead. There are limitations to this style of testing that more @@ -45,31 +45,31 @@ it does not make sense to evaluate some expressions if earlier ones have failed. This type of program needs a way to group expressions so that a failure in one group causes evaluation of that group to stop and immediately proceed to -the next group. In SchemeUnit all that is required is to -wrap a @scheme[test-begin] expression around a group of +the next group. In RktUnit all that is required is to +wrap a @racket[test-begin] expression around a group of expressions: -@schemeblock[ +@racketblock[ (test-begin (setup-some-state!) (check-equal? (foo! 1) 'expected-value-1) (check-equal? (foo! 2) 'expected-value-2)) ] -Now if any expression within the @scheme[test-begin] +Now if any expression within the @racket[test-begin] expression fails no further expressions in that group will be evaluated. Notice that all the previous tests written in the simple style are still valid. Introducing grouping is a local -change only. This is a key feature of SchemeUnit's support +change only. This is a key feature of RktUnit's support for the evolution of the program. The programmer may wish to name a group of tests. This is -done using the @scheme[test-case] expression, a simple +done using the @racket[test-case] expression, a simple variant on test-begin: -@schemeblock[ +@racketblock[ (test-case "The name" ... test expressions ...) @@ -79,7 +79,7 @@ Most programs will stick with this style. However, programmers writing very complex programs may wish to maintain separate groups of tests for different parts of the program, or run their tests in different ways to the normal -SchemeUnit manner (for example, test results may be logged +RktUnit manner (for example, test results may be logged for the purpose of improving software quality, or they may be displayed on a website to indicate service quality). For these programmers it is necessary to delay the execution of @@ -87,7 +87,7 @@ tests so they can processed in the programmer's chosen manner. To do this, the programmer simply wraps a test-suite around their tests: -@schemeblock[ +@racketblock[ (test-suite "Suite name" (check ...) @@ -104,15 +104,15 @@ outside the suite continue to evaluate as before. @section{Historical Context} Most testing frameworks, including earlier versions of -SchemeUnit, support only the final form of testing. This is +RktUnit, support only the final form of testing. This is likely due to the influence of the SUnit testing framework, -which is the ancestor of SchemeUnit and the most widely used +which is the ancestor of RktUnit and the most widely used frameworks in Java, .Net, Python, and Ruby, and many other languages. That this is insufficient for all users is apparent if one considers the proliferation of ``simpler'' -testing frameworks in Scheme such as SRFI-78, or the +testing frameworks in Racket such as SRFI-78, or the practice of beginner programmers. Unfortunately these simpler methods are inadequate for testing larger -systems. To the best of my knowledge SchemeUnit is the only +systems. To the best of my knowledge RktUnit is the only testing framework that makes a conscious effort to support the testing style of all levels of programmer. diff --git a/collects/schemeunit/scribblings/quick-start.scrbl b/collects/rktunit/scribblings/quick-start.scrbl similarity index 67% rename from collects/schemeunit/scribblings/quick-start.scrbl rename to collects/rktunit/scribblings/quick-start.scrbl index 61f8de1a4a..2e0bea8cf6 100644 --- a/collects/schemeunit/scribblings/quick-start.scrbl +++ b/collects/rktunit/scribblings/quick-start.scrbl @@ -1,14 +1,14 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") -@title[#:tag "quick-start"]{Quick Start Guide for SchemeUnit} +@title[#:tag "quick-start"]{Quick Start Guide for RktUnit} -Suppose we have code contained in @tt{file.scm}, which -implements buggy versions of @scheme[+] and @scheme[-] -called @scheme[my-+] and @scheme[my--]: +Suppose we have code contained in @tt{file.rkt}, which +implements buggy versions of @racket[+] and @racket[-] +called @racket[my-+] and @racket[my--]: -@schememod[ -scheme/base +@racketmod[ +racket/base (define (my-+ a b) (if (zero? a) @@ -24,26 +24,26 @@ scheme/base my-*) ] -We want to test this code with SchemeUnit. We start by -creating a file called @tt{file-test.scm} to contain our -tests. At the top of @tt{file-test.scm} we import -SchemeUnit and @tt{file.scm}: +We want to test this code with RktUnit. We start by +creating a file called @tt{file-test.rkt} to contain our +tests. At the top of @tt{file-test.rkt} we import +RktUnit and @tt{file.rkt}: -@schememod[ -scheme/base +@racketmod[ +racket/base -(require schemeunit - "file.scm") +(require rktunit + "file.rkt") ] Now we add some tests to check our library: -@schemeblock[ +@racketblock[ (check-equal? (my-+ 1 1) 2 "Simple addition") (check-equal? (my-* 1 2) 2 "Simple multiplication") ] -This is all it takes to define tests in SchemeUnit. Now +This is all it takes to define tests in RktUnit. Now evaluate this file and see if the library is correct. Here's the result I get: @@ -52,7 +52,7 @@ Here's the result I get: -------------------- FAILURE name: check-equal? -location: (file-test.scm 7 0 117 27) +location: (file-test.rkt 7 0 117 27) expression: (check-equal? (my-* 1 2) 2) params: (4 2) actual: 4 @@ -60,21 +60,21 @@ expected: 2 --------------------} -The first @scheme[#t] indicates the first test passed. The +The first @racket[#t] indicates the first test passed. The second test failed, as shown by the message. -Requiring SchemeUnit and writing checks is all you need to +Requiring RktUnit and writing checks is all you need to get started testing, but let's take a little bit more time to look at some features beyond the essentials. Let's say we want to check that a number of properties hold. How do we do this? So far we've only seen checks of a -single expression. In SchemeUnit a check is always a single +single expression. In RktUnit a check is always a single expression, but we can group checks into units called test cases. Here's a simple test case written using the -@scheme[test-begin] form: +@racket[test-begin] form: -@schemeblock[ +@racketblock[ (test-begin (let ((lst (list 2 4 6 9))) (check = (length lst) 4) @@ -91,24 +91,24 @@ 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) -------------------- } -This tells us that the expression @scheme[(check-pred even? +This tells us that the expression @racket[(check-pred even? elt)] failed. The arguments of this check were -@scheme[even?] and @scheme[9], and as 9 is not even the +@racket[even?] and @racket[9], and as 9 is not even the check failed. A test case fails as soon as any check within it fails, and no further checks are evaluated once this takes place. Naming our test cases if useful as it helps remind us what we're testing. We can give a test case a name with the -@scheme[test-case] form: +@racket[test-case] form: -@schemeblock[ +@racketblock[ (test-case "List has length 4 and all elements even" (let ((lst (list 2 4 6 9))) @@ -122,10 +122,10 @@ we're testing. We can give a test case a name with the Now if we want to structure our tests are bit more we can group them into a test suite: -@schemeblock[ +@racketblock[ (define file-tests (test-suite - "Tests for file.scm" + "Tests for file.rkt" (check-equal? (my-+ 1 1) 2 "Simple addition") @@ -147,13 +147,13 @@ tests, allowing you to choose how you run your tests. You might, for example, print the results to the screen or log them to a file. -Let's run our tests, using SchemeUnit's simple textual user +Let's run our tests, using RktUnit's simple textual user interface (there are fancier interfaces available but this -will do for our example). In @tt{file-test.scm} add the +will do for our example). In @tt{file-test.rkt} add the following lines: -@schemeblock[ - (require schemeunit/text-ui) +@racketblock[ + (require rktunit/text-ui) (run-tests file-tests) ] @@ -161,6 +161,6 @@ following lines: Now evaluate the file and you should see similar output again. -These are the basics of SchemeUnit. Refer to the +These are the basics of RktUnit. Refer to the documentation below for more advanced topics, such as defining your own checks. Have fun! diff --git a/collects/schemeunit/scribblings/release-notes.scrbl b/collects/rktunit/scribblings/release-notes.scrbl similarity index 87% rename from collects/schemeunit/scribblings/release-notes.scrbl rename to collects/rktunit/scribblings/release-notes.scrbl index 2c70f43c4f..af5b2d5b40 100644 --- a/collects/schemeunit/scribblings/release-notes.scrbl +++ b/collects/rktunit/scribblings/release-notes.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title{Release Notes} @@ -12,7 +12,7 @@ There are also miscellaneous Scribble fixes. @section{Version 3} -This version of SchemeUnit is largely backwards compatible +This version of RktUnit is largely backwards compatible with version 2 but there are significant changes to the underlying model, justifying incrementing the major version number. These changes are best explained in @@ -24,9 +24,9 @@ hopefully be corrected in later minor version releases: @itemize[ @item{There is no graphical UI, and in particular no -integration with DrScheme.} +integration with DrRacket.} -@item{The semantics of @scheme[test-suite] are not the +@item{The semantics of @racket[test-suite] are not the desired ones. In particular, only checks and test cases have their evaluation delayed by a test suite; other expressions will be evaluated before the suite is diff --git a/collects/schemeunit/scribblings/schemeunit.scrbl b/collects/rktunit/scribblings/rktunit.scrbl similarity index 67% rename from collects/schemeunit/scribblings/schemeunit.scrbl rename to collects/rktunit/scribblings/rktunit.scrbl index 59686a131c..0bb06f1332 100644 --- a/collects/schemeunit/scribblings/schemeunit.scrbl +++ b/collects/rktunit/scribblings/rktunit.scrbl @@ -1,13 +1,13 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") -@title{@bold{SchemeUnit}: Unit Testing for Scheme} +@title{@bold{RktUnit}: Unit Testing for Racket} @author[(author+email "Noel Welsh" "noelwelsh@gmail.com") (author+email "Ryan Culpepper" "ryan_sml@yahoo.com")] -SchemeUnit is a unit-testing framework for PLT Scheme. It -is designed to handle the needs of all Scheme programmers, +RktUnit is a unit-testing framework for Racket. It +is designed to handle the needs of all Racket programmers, from novices to experts. @table-of-contents[] diff --git a/collects/schemeunit/scribblings/running-tests.scrbl b/collects/rktunit/scribblings/running-tests.scrbl similarity index 84% rename from collects/schemeunit/scribblings/running-tests.scrbl rename to collects/rktunit/scribblings/running-tests.scrbl index 65e724fd30..d8d895abd6 100644 --- a/collects/schemeunit/scribblings/running-tests.scrbl +++ b/collects/rktunit/scribblings/running-tests.scrbl @@ -1,29 +1,29 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title[#:tag "running"]{Programmatically Running Tests and Inspecting Results} -SchemeUnit provides an API for running tests, from which +RktUnit provides an API for running tests, from which custom UIs can be created. @section{Result Types} @defstruct[(exn:test exn) ()]{ -The base structure for SchemeUnit exceptions. You should +The base structure for RktUnit exceptions. You should never catch instances of this type, only the subtypes documented below.} @defstruct[(exn:test:check exn:test) ([stack (listof check-info)])]{ -A @scheme[exn:test:check] is raised when an check fails, and +A @racket[exn:test:check] is raised when an check fails, and contains the contents of the check-info stack at the time of failure.} @defstruct[test-result ([test-case-name (or/c string #f)])]{ A test-result is the result of running the test with -the given name (with @scheme[#f] indicating no name is available).} +the given name (with @racket[#f] indicating no name is available).} @defstruct[(test-failure test-result) ([result any])]{ @@ -54,7 +54,7 @@ tree (list of lists) of results} Example: -@schemeblock[ +@racketblock[ (run-test (test-suite "Dummy" @@ -69,22 +69,22 @@ Example: [#:fup fup (string 'a . -> . 'a)]) 'a]{ -Fold @scheme[result-fn] pre-order left-to-right depth-first -over the results of @scheme[run]. By default @scheme[run] -is @scheme[run-test-case] and @scheme[fdown] and -@scheme[fup] just return the seed, so @scheme[result-fn] is +Fold @racket[result-fn] pre-order left-to-right depth-first +over the results of @racket[run]. By default @racket[run] +is @racket[run-test-case] and @racket[fdown] and +@racket[fup] just return the seed, so @racket[result-fn] is folded over the test results. This function is useful for writing custom folds (and hence UIs) over test results without you having to take care of all the expected setup and teardown. For example, -@scheme[fold-test-results] will run test suite before and +@racket[fold-test-results] will run test suite before and after actions for you. However it is still flexible enough, via its keyword arguments, to do almost anything that foldts can. Hence it should be used in preference to foldts. -@scheme[result-fn] is a function from the results of -@scheme[run] (defaults to a @scheme[test-result]) and the +@racket[result-fn] is a function from the results of +@racket[run] (defaults to a @racket[test-result]) and the seed to a new seed Seed is any value @@ -104,7 +104,7 @@ Examples: The following code counts the number of successes -@schemeblock[ +@racketblock[ (define (count-successes test) (fold-test-results (lambda (result seed) @@ -114,11 +114,11 @@ The following code counts the number of successes 0 test))] -The following code returns the symbol @scheme['burp] instead +The following code returns the symbol @racket['burp] instead of running test cases. Note how the result-fn receives the value of run. -@schemeblock[ +@racketblock[ (define (burp test) (fold-test-results (lambda (result seed) (cons result seed)) @@ -159,7 +159,7 @@ Example: Here's the implementation of fold-test-results in terms of foldts: -@schemeblock[ +@racketblock[ (define (fold-test-results suite-fn case-fn seed test) (foldts (lambda (suite name before after seed) @@ -187,9 +187,9 @@ recorded, and so on. To do so the functions that run the test cases need to know what type the test case has, and hence is is necessary to provide this information. -If you've made it this far you truly are a master SchemeUnit +If you've made it this far you truly are a master RktUnit hacker. As a bonus prize we'll just mention that the code -in hash-monad.ss and monad.ss might be of interest for +in hash-monad.rkt and monad.rkt might be of interest for constructing user interfaces. The API is still in flux, so isn't documented here. However, do look at the -implementation of @scheme[run-tests] for examples of use. +implementation of @racket[run-tests] for examples of use. diff --git a/collects/schemeunit/scribblings/ui.scrbl b/collects/rktunit/scribblings/ui.scrbl similarity index 51% rename from collects/schemeunit/scribblings/ui.scrbl rename to collects/rktunit/scribblings/ui.scrbl index 3b80a25e91..e070e66872 100644 --- a/collects/schemeunit/scribblings/ui.scrbl +++ b/collects/rktunit/scribblings/ui.scrbl @@ -1,47 +1,47 @@ #lang scribble/doc -@(require "base.ss") +@(require "base.rkt") @title[#:tag "ui"]{User Interfaces} -SchemeUnit provides a textual and a graphical user interface +RktUnit provides a textual and a graphical user interface @section{Textual User Interface} -@defmodule[schemeunit/text-ui] +@defmodule[rktunit/text-ui] -The textual UI is in the @schememodname[schemeunit/text-ui] module. -It is run via the @scheme[run-tests] function. +The textual UI is in the @racketmodname[rktunit/text-ui] module. +It is run via the @racket[run-tests] function. @defproc[(run-tests (test (or/c test-case? test-suite?)) (verbosity (symbols 'quiet 'normal 'verbose) 'normal)) natural-number/c]{ -The given @scheme[test] is run and the result of running it -output to the @scheme[current-output-port]. The output is +The given @racket[test] is run and the result of running it +output to the @racket[current-output-port]. The output is compatable with the (X)Emacs next-error command (as used, for example, by (X)Emacs's compile function) -The optional @scheme[verbosity] is one of @scheme['quiet], -@scheme['normal], or @scheme['verbose]. Quiet output +The optional @racket[verbosity] is one of @racket['quiet], +@racket['normal], or @racket['verbose]. Quiet output displays only the number of successes, failures, and errors. Normal reporting suppresses some extraneous check information (such as the expression). Verbose reports all information. -@scheme[run-tests] returns the number of unsuccessful tests.} +@racket[run-tests] returns the number of unsuccessful tests.} @section{Graphical User Interface} -@defmodule[schemeunit/gui] +@defmodule[rktunit/gui] -SchemeUnit also provides a GUI test runner, available from the -@schememodname[schemeunit/gui] module. +RktUnit also provides a GUI test runner, available from the +@racketmodname[rktunit/gui] module. @defproc[(test/gui [test (or/c test-case? test-suite?)] ...) any]{ -Creates a new SchemeUnit GUI window and runs each @scheme[test]. The +Creates a new RktUnit GUI window and runs each @racket[test]. The GUI is updated as tests complete. } @@ -49,7 +49,7 @@ GUI is updated as tests complete. @defproc[(make-gui-runner) (-> (or/c test-case? test-suite?) ... any)]{ -Creates a new SchemeUnit GUI window and returns a procedure that, when +Creates a new RktUnit GUI window and returns a procedure that, when applied, runs the given tests and displays the results in the GUI. } diff --git a/collects/rktunit/text-ui.rkt b/collects/rktunit/text-ui.rkt new file mode 100644 index 0000000000..4952b7a64a --- /dev/null +++ b/collects/rktunit/text-ui.rkt @@ -0,0 +1,267 @@ +;;; +;;; Time-stamp: <2009-06-11 17:11:22 noel> +;;; +;;; Copyright (C) 2005 by Noel Welsh. +;;; + +;;; This library is free software; you can redistribute it +;;; and/or modify it under the terms of the GNU Lesser +;;; General Public License as published by the Free Software +;;; Foundation; either version 2.1 of the License, or (at +;;; your option) any later version. + +;;; This library is distributed in the hope that it will be +;;; useful, but WITHOUT ANY WARRANTY; without even the +;;; implied warranty of MERCHANTABILITY or FITNESS FOR A +;;; PARTICULAR PURPOSE. See the GNU Lesser General Public +;;; License for more details. + +;;; You should have received a copy of the GNU Lesser +;;; General Public License along with this library; if not, +;;; write to the Free Software Foundation, Inc., 59 Temple +;;; Place, Suite 330, Boston, MA 02111-1307 USA + +;;; Author: Noel Welsh +;; +;; +;; Commentary: + +#lang racket/base + +(require racket/match + racket/pretty + srfi/13 + srfi/26 + "main.rkt" + "private/base.rkt" + "private/counter.rkt" + "private/format.rkt" + "private/location.rkt" + "private/result.rkt" + "private/check-info.rkt" + "private/monad.rkt" + "private/hash-monad.rkt" + "private/name-collector.rkt" + "private/text-ui-util.rkt") + +(provide run-tests + display-context + display-exn + display-summary+return + display-ticker + display-result) + + +;; display-ticker : test-result -> void +;; +;; Prints a summary of the test result +(define (display-ticker result) + (cond + ((test-error? result) + (display "!")) + ((test-failure? result) + (display "-")) + (else + (display ".")))) + +;; display-test-preamble : test-result -> (hash-monad-of void) +(define (display-test-preamble result) + (lambda (hash) + (if (test-success? result) + hash + (begin + (display-delimiter) + hash)))) + +;; display-test-postamble : test-result -> (hash-monad-of void) +(define (display-test-postamble result) + (lambda (hash) + (if (test-success? result) + hash + (begin + (display-delimiter) + hash)))) + + +;; display-result : test-result -> void +(define (display-result result) + (cond + ((test-error? result) + (display-test-name (test-result-test-case-name result)) + (display-error) + (newline)) + ((test-failure? result) + (display-test-name (test-result-test-case-name result)) + (display-failure) + (newline)) + (else + (void)))) + + +;; strip-redundant-parms : (list-of check-info) -> (list-of check-info) +;; +;; Strip any check-params? is there is an +;; actual/expected check-info in the same stack frame. A +;; stack frame is delimited by occurrence of a check-name? +(define (strip-redundant-params stack) + (define (binary-check-this-frame? stack) + (let loop ([stack stack]) + (cond + [(null? stack) #f] + [(check-name? (car stack)) #f] + [(check-actual? (car stack)) #t] + [else (loop (cdr stack))]))) + (let loop ([stack stack]) + (cond + [(null? stack) null] + [(check-params? (car stack)) + (if (binary-check-this-frame? stack) + (loop (cdr stack)) + (cons (car stack) (loop (cdr stack))))] + [else (cons (car stack) (loop (cdr stack)))]))) + + +;; display-context : test-result [(U #t #f)] -> void +(define (display-context result [verbose? #f]) + (cond + [(test-failure? result) + (let* ([exn (test-failure-result result)] + [stack (exn:test:check-stack exn)]) + (textui-display-check-info-stack stack verbose?))] + [(test-error? result) + (let ([exn (test-error-result result)]) + (textui-display-check-info-stack (check-info-stack (exn-continuation-marks exn))) + (display-exn exn))] + [else (void)])) + +(define (textui-display-check-info-stack stack [verbose? #f]) + (for-each + (lambda (info) + (cond + [(check-name? info) + (display-check-info info)] + [(check-location? info) + (display-check-info-name-value + 'location + (trim-current-directory + (location->string + (check-info-value info))) + display)] + [(check-params? info) + (display-check-info-name-value + 'params + (check-info-value info) + (lambda (v) (map pretty-print v)))] + [(check-actual? info) + (display-check-info-name-value + 'actual + (check-info-value info) + pretty-print)] + [(check-expected? info) + (display-check-info-name-value + 'expected + (check-info-value info) + pretty-print)] + [(and (check-expression? info) + (not verbose?)) + (void)] + [else + (display-check-info info)])) + (if verbose? + stack + (strip-redundant-params stack)))) + +;; display-verbose-check-info : test-result -> void +(define (display-verbose-check-info result) + (cond + ((test-failure? result) + (let* ((exn (test-failure-result result)) + (stack (exn:test:check-stack exn))) + (for-each + (lambda (info) + (cond + ((check-location? info) + (display "location: ") + (display (trim-current-directory + (location->string + (check-info-value info))))) + (else + (display (check-info-name info)) + (display ": ") + (write (check-info-value info)))) + (newline)) + stack))) + ((test-error? result) + (display-exn (test-error-result result))) + (else + (void)))) + +(define (std-test/text-ui display-context test) + (parameterize ([current-output-port (current-error-port)]) + (fold-test-results + (lambda (result seed) + ((sequence* (update-counter! result) + (display-test-preamble result) + (display-test-case-name result) + (lambda (hash) + (display-result result) + (display-context result) + hash) + (display-test-postamble result)) + seed)) + ((sequence + (put-initial-counter) + (put-initial-name)) + (make-empty-hash)) + test + #:fdown (lambda (name seed) ((push-suite-name! name) seed)) + #:fup (lambda (name kid-seed) ((pop-suite-name!) kid-seed))))) + +(define (display-summary+return monad) + (monad-value + ((compose + (sequence* + (display-counter*) + (counter->vector)) + (match-lambda + ((vector s f e) + (return-hash (+ f e))))) + monad))) + +(define (display-counter*) + (compose (counter->vector) + (match-lambda + [(vector s f e) + (if (and (zero? f) (zero? e)) + (display-counter) + (lambda args + (parameterize ([current-output-port (current-error-port)]) + (apply (display-counter) args))))]))) + +;; run-tests : test [(U 'quiet 'normal 'verbose)] -> integer +(define (run-tests test [mode 'normal]) + (monad-value + ((compose + (sequence* + (case mode + [(normal verbose) + (display-counter*)] + [(quiet) + (lambda (a) a)]) + (counter->vector)) + (match-lambda + ((vector s f e) + (return-hash (+ f e))))) + (case mode + ((quiet) + (fold-test-results + (lambda (result seed) + ((update-counter! result) seed)) + ((put-initial-counter) + (make-empty-hash)) + test)) + ((normal) (std-test/text-ui display-context test)) + ((verbose) (std-test/text-ui + (cut display-context <> #t) + test)))))) + diff --git a/collects/schemeunit/tool.rkt b/collects/rktunit/tool.rkt similarity index 86% rename from collects/schemeunit/tool.rkt rename to collects/rktunit/tool.rkt index 5b1c2eaf31..a48f63747e 100644 --- a/collects/schemeunit/tool.rkt +++ b/collects/rktunit/tool.rkt @@ -1,19 +1,19 @@ -#lang scheme/base -(require scheme/class - scheme/gui +#lang racket/base +(require racket/class + racket/gui framework drscheme/tool - scheme/unit - (prefix-in drlink: "private/gui/drscheme-link.ss")) + racket/unit + (prefix-in drlink: "private/gui/drracket-link.rkt")) (provide tool@) ;; CONSTANTS (define BACKTRACE-NO-MESSAGE "No message.") -(define LINK-MODULE-SPEC 'schemeunit/private/gui/drscheme-link) +(define LINK-MODULE-SPEC 'rktunit/private/gui/drracket-link) -(define-namespace-anchor drscheme-ns-anchor) +(define-namespace-anchor drracket-ns-anchor) ;; ---- @@ -71,7 +71,7 @@ show-backtrace show-source)) - (define drscheme-ns (namespace-anchor->namespace drscheme-ns-anchor)) + (define drracket-ns (namespace-anchor->namespace drracket-ns-anchor)) (define interactions-text-mixin (mixin ((class->interface drscheme:rep:text%)) () @@ -79,7 +79,7 @@ (super-new) (define/private (setup-helper-module) - (namespace-attach-module drscheme-ns + (namespace-attach-module drracket-ns LINK-MODULE-SPEC (get-user-namespace))) diff --git a/collects/schemeunit/gui.rkt b/collects/schemeunit/gui.rkt index 325b3d8949..5b3a672d92 100644 --- a/collects/schemeunit/gui.rkt +++ b/collects/schemeunit/gui.rkt @@ -1,18 +1,3 @@ -#lang scheme/base -(require scheme/contract - (rename-in "private/base.ss") - "private/gui/gui.ss") - -(define (test/gui . tests) - (apply (make-gui-runner) tests)) - -(define test/c (or/c schemeunit-test-case? schemeunit-test-suite?)) - -(provide/contract - [test/gui - (->* () () #:rest (listof test/c) - any)] - [make-gui-runner - (-> - (->* () () #:rest (listof test/c) - any))]) +#lang racket +(require rktunit/gui) +(provide (all-from-out rktunit/gui)) \ No newline at end of file diff --git a/collects/schemeunit/info.rkt b/collects/schemeunit/info.rkt index 24ded45f9d..d0230c5099 100644 --- a/collects/schemeunit/info.rkt +++ b/collects/schemeunit/info.rkt @@ -1,13 +1,3 @@ #lang setup/infotab -(define name "SchemeUnit") - -(define blurb '((p "SchemeUnit is a unit testing framework based on the " - " Extreme Programming unit test frameworks"))) - -(define scribblings '(("scribblings/schemeunit.scrbl" (multi-page) (tool)))) -(define tools '[("tool.ss")]) -(define tool-names '["SchemeUnit DrScheme integration"]) - -(define homepage "http://schematics.sourceforge.net/") -(define url "http://schematics.sourceforge.net/") +(define name "SchemeUnit") \ No newline at end of file diff --git a/collects/schemeunit/main.rkt b/collects/schemeunit/main.rkt index c0f7b440ed..969fa1a9be 100644 --- a/collects/schemeunit/main.rkt +++ b/collects/schemeunit/main.rkt @@ -1,31 +1,3 @@ -;;; -;;; Time-stamp: <2008-07-30 10:46:00 nhw> -;;; -;;; Copyright (C) by Noel Welsh. -;;; - -;;; This library is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU Lesser -;;; General Public License as published by the Free Software -;;; Foundation; either version 2.1 of the License, or (at -;;; your option) any later version. - -;;; This library is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU Lesser General Public -;;; License for more details. - -;;; You should have received a copy of the GNU Lesser -;;; General Public License along with this library; if not, -;;; write to the Free Software Foundation, Inc., 59 Temple -;;; Place, Suite 330, Boston, MA 02111-1307 USA - -;;; Author: Noel Welsh -;; -;; -;; Commentary: - -#lang scheme/base -(require "private/test.ss") -(provide (all-from-out "private/test.ss")) +#lang racket +(require rktunit) +(provide (all-from-out rktunit)) \ No newline at end of file diff --git a/collects/schemeunit/scribblings/misc.scrbl b/collects/schemeunit/scribblings/misc.scrbl deleted file mode 100644 index 51af0161c8..0000000000 --- a/collects/schemeunit/scribblings/misc.scrbl +++ /dev/null @@ -1,21 +0,0 @@ -#lang scribble/doc -@(require "base.ss") - -@title{Miscellaneous Utilities} - -The @scheme[require/expose] macro allows you to access -bindings that a module does not provide. It is useful for -testing the private functions of modules. - -@defform[(require/expose module (id ...))]{ -Requires @scheme[id] from @scheme[module] into the current module. It doesn't matter if the source module provides the bindings or not; @scheme[require/expose] can still get at them. - -Note that @scheme[require/expose] can be a bit fragile, -especially when mixed with compiled code. Use at your own risk! -} - -This example gets @scheme[make-failure-test], which is defined in a SchemeUnit test: - -@schemeblock[ -(require/expose schemeunit/private/check-test (make-failure-test)) -] diff --git a/collects/schemeunit/text-ui.rkt b/collects/schemeunit/text-ui.rkt index 0115b0130f..1ede14a3b2 100644 --- a/collects/schemeunit/text-ui.rkt +++ b/collects/schemeunit/text-ui.rkt @@ -1,267 +1,3 @@ -;;; -;;; Time-stamp: <2009-06-11 17:11:22 noel> -;;; -;;; Copyright (C) 2005 by Noel Welsh. -;;; - -;;; This library is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU Lesser -;;; General Public License as published by the Free Software -;;; Foundation; either version 2.1 of the License, or (at -;;; your option) any later version. - -;;; This library is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU Lesser General Public -;;; License for more details. - -;;; You should have received a copy of the GNU Lesser -;;; General Public License along with this library; if not, -;;; write to the Free Software Foundation, Inc., 59 Temple -;;; Place, Suite 330, Boston, MA 02111-1307 USA - -;;; Author: Noel Welsh -;; -;; -;; Commentary: - -#lang scheme/base - -(require scheme/match - scheme/pretty - srfi/13 - srfi/26 - "main.ss" - "private/base.ss" - "private/counter.ss" - "private/format.ss" - "private/location.ss" - "private/result.ss" - "private/check-info.ss" - "private/monad.ss" - "private/hash-monad.ss" - "private/name-collector.ss" - "private/text-ui-util.ss") - -(provide run-tests - display-context - display-exn - display-summary+return - display-ticker - display-result) - - -;; display-ticker : test-result -> void -;; -;; Prints a summary of the test result -(define (display-ticker result) - (cond - ((test-error? result) - (display "!")) - ((test-failure? result) - (display "-")) - (else - (display ".")))) - -;; display-test-preamble : test-result -> (hash-monad-of void) -(define (display-test-preamble result) - (lambda (hash) - (if (test-success? result) - hash - (begin - (display-delimiter) - hash)))) - -;; display-test-postamble : test-result -> (hash-monad-of void) -(define (display-test-postamble result) - (lambda (hash) - (if (test-success? result) - hash - (begin - (display-delimiter) - hash)))) - - -;; display-result : test-result -> void -(define (display-result result) - (cond - ((test-error? result) - (display-test-name (test-result-test-case-name result)) - (display-error) - (newline)) - ((test-failure? result) - (display-test-name (test-result-test-case-name result)) - (display-failure) - (newline)) - (else - (void)))) - - -;; strip-redundant-parms : (list-of check-info) -> (list-of check-info) -;; -;; Strip any check-params? is there is an -;; actual/expected check-info in the same stack frame. A -;; stack frame is delimited by occurrence of a check-name? -(define (strip-redundant-params stack) - (define (binary-check-this-frame? stack) - (let loop ([stack stack]) - (cond - [(null? stack) #f] - [(check-name? (car stack)) #f] - [(check-actual? (car stack)) #t] - [else (loop (cdr stack))]))) - (let loop ([stack stack]) - (cond - [(null? stack) null] - [(check-params? (car stack)) - (if (binary-check-this-frame? stack) - (loop (cdr stack)) - (cons (car stack) (loop (cdr stack))))] - [else (cons (car stack) (loop (cdr stack)))]))) - - -;; display-context : test-result [(U #t #f)] -> void -(define (display-context result [verbose? #f]) - (cond - [(test-failure? result) - (let* ([exn (test-failure-result result)] - [stack (exn:test:check-stack exn)]) - (textui-display-check-info-stack stack verbose?))] - [(test-error? result) - (let ([exn (test-error-result result)]) - (textui-display-check-info-stack (check-info-stack (exn-continuation-marks exn))) - (display-exn exn))] - [else (void)])) - -(define (textui-display-check-info-stack stack [verbose? #f]) - (for-each - (lambda (info) - (cond - [(check-name? info) - (display-check-info info)] - [(check-location? info) - (display-check-info-name-value - 'location - (trim-current-directory - (location->string - (check-info-value info))) - display)] - [(check-params? info) - (display-check-info-name-value - 'params - (check-info-value info) - (lambda (v) (map pretty-print v)))] - [(check-actual? info) - (display-check-info-name-value - 'actual - (check-info-value info) - pretty-print)] - [(check-expected? info) - (display-check-info-name-value - 'expected - (check-info-value info) - pretty-print)] - [(and (check-expression? info) - (not verbose?)) - (void)] - [else - (display-check-info info)])) - (if verbose? - stack - (strip-redundant-params stack)))) - -;; display-verbose-check-info : test-result -> void -(define (display-verbose-check-info result) - (cond - ((test-failure? result) - (let* ((exn (test-failure-result result)) - (stack (exn:test:check-stack exn))) - (for-each - (lambda (info) - (cond - ((check-location? info) - (display "location: ") - (display (trim-current-directory - (location->string - (check-info-value info))))) - (else - (display (check-info-name info)) - (display ": ") - (write (check-info-value info)))) - (newline)) - stack))) - ((test-error? result) - (display-exn (test-error-result result))) - (else - (void)))) - -(define (std-test/text-ui display-context test) - (parameterize ([current-output-port (current-error-port)]) - (fold-test-results - (lambda (result seed) - ((sequence* (update-counter! result) - (display-test-preamble result) - (display-test-case-name result) - (lambda (hash) - (display-result result) - (display-context result) - hash) - (display-test-postamble result)) - seed)) - ((sequence - (put-initial-counter) - (put-initial-name)) - (make-empty-hash)) - test - #:fdown (lambda (name seed) ((push-suite-name! name) seed)) - #:fup (lambda (name kid-seed) ((pop-suite-name!) kid-seed))))) - -(define (display-summary+return monad) - (monad-value - ((compose - (sequence* - (display-counter*) - (counter->vector)) - (match-lambda - ((vector s f e) - (return-hash (+ f e))))) - monad))) - -(define (display-counter*) - (compose (counter->vector) - (match-lambda - [(vector s f e) - (if (and (zero? f) (zero? e)) - (display-counter) - (lambda args - (parameterize ([current-output-port (current-error-port)]) - (apply (display-counter) args))))]))) - -;; run-tests : test [(U 'quiet 'normal 'verbose)] -> integer -(define (run-tests test [mode 'normal]) - (monad-value - ((compose - (sequence* - (case mode - [(normal verbose) - (display-counter*)] - [(quiet) - (lambda (a) a)]) - (counter->vector)) - (match-lambda - ((vector s f e) - (return-hash (+ f e))))) - (case mode - ((quiet) - (fold-test-results - (lambda (result seed) - ((update-counter! result) seed)) - ((put-initial-counter) - (make-empty-hash)) - test)) - ((normal) (std-test/text-ui display-context test)) - ((verbose) (std-test/text-ui - (cut display-context <> #t) - test)))))) - +#lang racket +(require rktunit/text-ui) +(provide (all-from-out rktunit/text-ui)) \ No newline at end of file diff --git a/collects/scribblings/guide/contracts-examples/1-test.rkt b/collects/scribblings/guide/contracts-examples/1-test.rkt index ffe7f34ba5..05d48e3df2 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 schemeunit schemeunit/text-ui "1.ss" "1b.ss") +(require rktunit rktunit/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 97c2736c62..b4e34f6d82 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 schemeunit schemeunit/text-ui "2.ss") +(require rktunit rktunit/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 1e164e2d05..6c19e34d87 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 schemeunit schemeunit/text-ui "3.ss") +(require rktunit rktunit/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 8bb8464d51..90e36a8fe1 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 schemeunit schemeunit/text-ui "5.ss") +(require rktunit rktunit/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 16739edb14..e763ce6222 100644 --- a/collects/tests/deinprogramm/contract.rkt +++ b/collects/tests/deinprogramm/contract.rkt @@ -2,7 +2,7 @@ (provide all-contract-tests) -(require schemeunit +(require rktunit 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 2dba02294e..13a6753ae4 100644 --- a/collects/tests/deinprogramm/image.rkt +++ b/collects/tests/deinprogramm/image.rkt @@ -2,7 +2,7 @@ (provide all-image-tests) -(require schemeunit +(require rktunit 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 bbb3a7bdb4..c4700c10da 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 schemeunit/text-ui) +(require rktunit/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 d0da6e74a3..333e7095f8 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 schemeunit/text-ui) +(require rktunit/text-ui) (require tests/deinprogramm/image) (run-tests all-image-tests) diff --git a/collects/tests/eli-tester.rkt b/collects/tests/eli-tester.rkt index 3e78d9627b..b8483977e4 100644 --- a/collects/tests/eli-tester.rkt +++ b/collects/tests/eli-tester.rkt @@ -216,7 +216,7 @@ => '(#"1 test passed\n" #"2 tests passed\n") ) -;; SchemeUnit stuff +;; RktUnit stuff ;; (examples that should fail modified to ones that shouldn't) #| diff --git a/collects/tests/future/future.rkt b/collects/tests/future/future.rkt index 69fd4463c5..3157c7dd6d 100644 --- a/collects/tests/future/future.rkt +++ b/collects/tests/future/future.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/future - schemeunit) + rktunit) #|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 9390caf502..0d6f444c41 100644 --- a/collects/tests/html/test.rkt +++ b/collects/tests/html/test.rkt @@ -1,6 +1,6 @@ #lang racket -(require schemeunit - schemeunit/text-ui +(require rktunit + rktunit/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 88109a113a..a9c9912080 100644 --- a/collects/tests/info.rkt +++ b/collects/tests/info.rkt @@ -21,7 +21,7 @@ "plot" "profj" "r6rs" - "schemeunit" + "rktunit" "srfi" "srpersist" "stepper" diff --git a/collects/tests/macro-debugger/all-tests.rkt b/collects/tests/macro-debugger/all-tests.rkt index 9dd0ec8908..0d2ece8a7b 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 schemeunit - schemeunit/gui) +(require rktunit + rktunit/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 760ba14f54..bcf9c2f47c 100644 --- a/collects/tests/macro-debugger/gentests.rkt +++ b/collects/tests/macro-debugger/gentests.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require schemeunit) +(require rktunit) (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 9e1c9487db..ee70b2650a 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 schemeunit - schemeunit/gui) +(require rktunit + rktunit/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 de6d130e50..b3f4a54a54 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 schemeunit) +(require rktunit) (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 0069e0aed5..57f6cab63c 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 schemeunit) +(require rktunit) (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 8c208391b7..fb0f9d9004 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 schemeunit) +(require rktunit) (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 bbb4f1643f..753011c9d6 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) - schemeunit) + rktunit) (define-syntax (comp stx) (syntax-case stx () diff --git a/collects/tests/match/match-tests.rkt b/collects/tests/match/match-tests.rkt index 0f480701ab..a575fb631f 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 schemeunit) + (require mzlib/match rktunit) (provide match-tests) diff --git a/collects/tests/match/other-plt-tests.rkt b/collects/tests/match/other-plt-tests.rkt index 5054c49d75..9026ce05f8 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 schemeunit net/uri-codec mzlib/pregexp mzlib/plt-match + (require rktunit 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 a1a1c857c2..27db39ff3a 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 schemeunit) + (require mzlib/match rktunit) (provide other-tests) diff --git a/collects/tests/match/plt-match-tests.rkt b/collects/tests/match/plt-match-tests.rkt index 64ed34e595..c1eb29f9f4 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" - schemeunit schemeunit/text-ui) + rktunit rktunit/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 cffbc7c2dc..f5fb8059bc 100644 --- a/collects/tests/plai/test-random-mutator.rkt +++ b/collects/tests/plai/test-random-mutator.rkt @@ -1,5 +1,5 @@ #lang scheme -(require schemeunit +(require rktunit 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 c6cf0de070..cdc45afb8f 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 - schemeunit - schemeunit/text-ui) + rktunit + rktunit/text-ui) (define (exn:fail:contract-violation? exn) (if (regexp-match #rx"broke" (exn-message exn)) #t #f)) diff --git a/collects/tests/raclog/bible.rkt b/collects/tests/raclog/bible.rkt index 6625f6cd58..b5ad0ba087 100644 --- a/collects/tests/raclog/bible.rkt +++ b/collects/tests/raclog/bible.rkt @@ -1,7 +1,7 @@ #lang racket (require raclog - schemeunit) + rktunit) ;The following is the "Biblical" database from "The Art of ;Prolog", Sterling & Shapiro, ch. 1. @@ -142,4 +142,4 @@ dad-kids))))) (check-equal? (dad-kids-test-5) - `((dad-kids . ((terach (abraham nachor haran)) (abraham (isaac)) (haran (lot milcah yiscah)))))) \ No newline at end of file + `((dad-kids . ((terach (abraham nachor haran)) (abraham (isaac)) (haran (lot milcah yiscah)))))) diff --git a/collects/tests/raclog/england.rkt b/collects/tests/raclog/england.rkt index 80a3aefc22..0480262a5c 100644 --- a/collects/tests/raclog/england.rkt +++ b/collects/tests/raclog/england.rkt @@ -1,7 +1,7 @@ #lang racket (require raclog - schemeunit) + rktunit) ;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 1e5f707510..179b53745a 100644 --- a/collects/tests/raclog/games.rkt +++ b/collects/tests/raclog/games.rkt @@ -2,7 +2,7 @@ (require raclog "./puzzle.rkt" - schemeunit) + rktunit) ;;This example is from Sterling & Shapiro, p. 214. ;; diff --git a/collects/tests/schemeunit/all-schemeunit-tests.rkt b/collects/tests/rktunit/all-rktunit-tests.rkt similarity index 57% rename from collects/tests/schemeunit/all-schemeunit-tests.rkt rename to collects/tests/rktunit/all-rktunit-tests.rkt index d943eaf8eb..baf8d3cb82 100644 --- a/collects/tests/schemeunit/all-schemeunit-tests.rkt +++ b/collects/tests/rktunit/all-rktunit-tests.rkt @@ -1,28 +1,28 @@ -#lang scheme/base +#lang racket/base -(require schemeunit - "check-test.ss" - "check-info-test.ss" - "format-test.ss" - "test-case-test.ss" - "test-suite-test.ss" - "base-test.ss" - "location-test.ss" - "result-test.ss" - "test-test.ss" - "util-test.ss" - "text-ui-test.ss" - "monad-test.ss" - "hash-monad-test.ss" - "counter-test.ss" - "text-ui-util-test.ss") +(require rktunit + "check-test.rkt" + "check-info-test.rkt" + "format-test.rkt" + "test-case-test.rkt" + "test-suite-test.rkt" + "base-test.rkt" + "location-test.rkt" + "result-test.rkt" + "test-test.rkt" + "util-test.rkt" + "text-ui-test.rkt" + "monad-test.rkt" + "hash-monad-test.rkt" + "counter-test.rkt" + "text-ui-util-test.rkt") -(provide all-schemeunit-tests +(provide all-rktunit-tests failure-tests) -(define all-schemeunit-tests +(define all-rktunit-tests (test-suite - "All SchemeUnit Tests" + "All RktUnit Tests" check-tests base-tests check-info-tests diff --git a/collects/tests/schemeunit/base-test.rkt b/collects/tests/rktunit/base-test.rkt similarity index 78% rename from collects/tests/schemeunit/base-test.rkt rename to collects/tests/rktunit/base-test.rkt index 8f3e9ffbd7..3c81db7019 100644 --- a/collects/tests/schemeunit/base-test.rkt +++ b/collects/tests/rktunit/base-test.rkt @@ -26,10 +26,10 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/base) +(require rktunit + rktunit/private/base) (provide base-tests) @@ -37,45 +37,45 @@ (test-suite "All tests for base" (test-case - "schemeunit-test-case structure has a contract on name" + "rktunit-test-case structure has a contract on name" (check-exn exn:fail? (lambda () - (make-schemeunit-test-case + (make-rktunit-test-case 'foo (lambda () #t))))) (test-case - "schemeunit-test-case structure has a contract on action" + "rktunit-test-case structure has a contract on action" (check-exn exn:fail? (lambda () - (make-schemeunit-test-case + (make-rktunit-test-case "Name" #f)))) (test-case - "schemeunit-test-suite has a contract on its fields" + "rktunit-test-suite has a contract on its fields" (check-exn exn:fail? (lambda () - (make-schemeunit-test-suite + (make-rktunit-test-suite #f (list) (lambda () 3) (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-schemeunit-test-suite + (make-rktunit-test-suite "Name" #f (lambda () 3) (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-schemeunit-test-suite + (make-rktunit-test-suite "Name" (list) #f (lambda () 2)))) (check-exn exn:fail? (lambda () - (make-schemeunit-test-suite + (make-rktunit-test-suite "Name" (list) (lambda () 3) diff --git a/collects/tests/schemeunit/check-info-test.rkt b/collects/tests/rktunit/check-info-test.rkt similarity index 88% rename from collects/tests/schemeunit/check-info-test.rkt rename to collects/tests/rktunit/check-info-test.rkt index 9d2b9f8917..6cb5a6d3ca 100644 --- a/collects/tests/schemeunit/check-info-test.rkt +++ b/collects/tests/rktunit/check-info-test.rkt @@ -1,23 +1,23 @@ ;;; -;;; ---- Tests for check-util +;;; ---- Tests for check-util ;;; Time-stamp: <2009-06-11 17:03:21 noel> ;;; ;;; Copyright (C) 2003 by Noel Welsh. ;;; -;;; This file is part of SchemeUnit. +;;; This file is part of RktUnit. -;;; SchemeUnit is free software; you can redistribute it and/or +;;; RktUnit is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Lesser General Public ;;; License as published by the Free Software Foundation; either ;;; version 2.1 of the License, or (at your option) any later version. -;;; SchemeUnitis distributed in the hope that it will be useful, +;;; RktUnitis distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;; Lesser General Public License for more details. ;;; You should have received a copy of the GNU Lesser General Public -;;; License along with SchemeUnit; if not, write to the Free Software +;;; License along with RktUnit; if not, write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ;;; Author: Noel Welsh @@ -25,10 +25,10 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/check-info) +(require rktunit + rktunit/private/check-info) (provide check-info-tests) diff --git a/collects/tests/schemeunit/check-test.rkt b/collects/tests/rktunit/check-test.rkt similarity index 97% rename from collects/tests/schemeunit/check-test.rkt rename to collects/tests/rktunit/check-test.rkt index 0e3b8a0331..fd2029c670 100644 --- a/collects/tests/schemeunit/check-test.rkt +++ b/collects/tests/rktunit/check-test.rkt @@ -26,14 +26,14 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require scheme/runtime-path +(require racket/runtime-path srfi/1 - schemeunit - schemeunit/private/check - schemeunit/private/result - schemeunit/private/test-suite) + rktunit + rktunit/private/check + rktunit/private/result + rktunit/private/test-suite) (provide check-tests) @@ -287,8 +287,8 @@ (let ((destns (make-base-namespace)) (cns (current-namespace))) (parameterize ((current-namespace destns)) - (namespace-require '(for-syntax scheme/base)) - (namespace-require 'schemeunit/private/check) + (namespace-require '(for-syntax racket/base)) + (namespace-require 'rktunit/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/schemeunit/counter-test.rkt b/collects/tests/rktunit/counter-test.rkt similarity index 90% rename from collects/tests/schemeunit/counter-test.rkt rename to collects/tests/rktunit/counter-test.rkt index 6ab8fbeeaa..516a3911df 100644 --- a/collects/tests/schemeunit/counter-test.rkt +++ b/collects/tests/rktunit/counter-test.rkt @@ -25,13 +25,13 @@ ;; ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require scheme/match - schemeunit - schemeunit/private/counter - schemeunit/private/monad - schemeunit/private/hash-monad) +(require racket/match + rktunit + rktunit/private/counter + rktunit/private/monad + rktunit/private/hash-monad) (provide counter-tests) diff --git a/collects/tests/schemeunit/format-test.rkt b/collects/tests/rktunit/format-test.rkt similarity index 83% rename from collects/tests/schemeunit/format-test.rkt rename to collects/tests/rktunit/format-test.rkt index 47b9da6dd7..9ac98b13c1 100644 --- a/collects/tests/schemeunit/format-test.rkt +++ b/collects/tests/rktunit/format-test.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/check-info - schemeunit/private/format) +(require rktunit + rktunit/private/check-info + rktunit/private/format) (provide format-tests) diff --git a/collects/tests/schemeunit/hash-monad-test.rkt b/collects/tests/rktunit/hash-monad-test.rkt similarity index 94% rename from collects/tests/schemeunit/hash-monad-test.rkt rename to collects/tests/rktunit/hash-monad-test.rkt index fd42b81853..cb9eecc1a1 100644 --- a/collects/tests/schemeunit/hash-monad-test.rkt +++ b/collects/tests/rktunit/hash-monad-test.rkt @@ -26,11 +26,11 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/monad - schemeunit/private/hash-monad) +(require rktunit + rktunit/private/monad + rktunit/private/hash-monad) (provide hash-monad-tests) diff --git a/collects/tests/schemeunit/location-test.rkt b/collects/tests/rktunit/location-test.rkt similarity index 77% rename from collects/tests/schemeunit/location-test.rkt rename to collects/tests/rktunit/location-test.rkt index 52a1881f58..22ebbc2500 100644 --- a/collects/tests/schemeunit/location-test.rkt +++ b/collects/tests/rktunit/location-test.rkt @@ -25,10 +25,10 @@ ;; ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/location) +(require rktunit + rktunit/private/location) (provide location-tests) @@ -43,10 +43,10 @@ (test-case "syntax->location ok" (around - (with-output-to-file "test-file.ss" - (lambda () (display "#lang scheme\n'foo\n"))) - (let* ([stx (read-syntax/lang (string->path "test-file.ss") - (open-input-file "test-file.ss"))] + (with-output-to-file "test-file.rkt" + (lambda () (display "#lang racket\n'foo\n"))) + (let* ([stx (read-syntax/lang (string->path "test-file.rkt") + (open-input-file "test-file.rkt"))] [rep (syntax->location stx)]) (check-equal? (location-source rep) (syntax-source stx)) @@ -54,7 +54,7 @@ (syntax-position stx)) (check-equal? (location-span rep) (syntax-span stx))) - (delete-file "test-file.ss"))) + (delete-file "test-file.rkt"))) (test-case "Emacs compatible location strings" @@ -63,15 +63,15 @@ (syntax->location (datum->syntax #f #f - (list "file.ss" 42 38 1240 2)))) - "file.ss:42:38") + (list "file.rkt" 42 38 1240 2)))) + "file.rkt:42:38") (check string=? (location->string (syntax->location (datum->syntax #f #f - (list (string->path "file.ss") 42 38 1240 2)))) - "file.ss:42:38") + (list (string->path "file.rkt") 42 38 1240 2)))) + "file.rkt:42:38") (check string=? (location->string (syntax->location @@ -84,14 +84,14 @@ (syntax->location (datum->syntax #f #f - (list 'foo.ss 42 38 1240 2)))) - "foo.ss:42:38") + (list 'foo.rkt 42 38 1240 2)))) + "foo.rkt:42:38") (check string=? (location->string (syntax->location (datum->syntax #f #f - (list "foo.ss" #f #f #f #f)))) - "foo.ss:?:?")) + (list "foo.rkt" #f #f #f #f)))) + "foo.rkt:?:?")) )) diff --git a/collects/tests/schemeunit/monad-test.rkt b/collects/tests/rktunit/monad-test.rkt similarity index 98% rename from collects/tests/schemeunit/monad-test.rkt rename to collects/tests/rktunit/monad-test.rkt index 92c089fc8f..7aeaa5b959 100644 --- a/collects/tests/schemeunit/monad-test.rkt +++ b/collects/tests/rktunit/monad-test.rkt @@ -27,10 +27,10 @@ ;; Commentary: -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/monad) +(require rktunit + rktunit/private/monad) (provide monad-tests) diff --git a/collects/tests/schemeunit/result-test.rkt b/collects/tests/rktunit/result-test.rkt similarity index 92% rename from collects/tests/schemeunit/result-test.rkt rename to collects/tests/rktunit/result-test.rkt index fd0ae973ca..a8534c1630 100644 --- a/collects/tests/schemeunit/result-test.rkt +++ b/collects/tests/rktunit/result-test.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/result) +(require rktunit + rktunit/private/result) (provide result-tests) diff --git a/collects/tests/schemeunit/run-tests.rkt b/collects/tests/rktunit/run-tests.rkt similarity index 68% rename from collects/tests/schemeunit/run-tests.rkt rename to collects/tests/rktunit/run-tests.rkt index 3852cb9dd3..66f89fd7e6 100644 --- a/collects/tests/schemeunit/run-tests.rkt +++ b/collects/tests/rktunit/run-tests.rkt @@ -1,10 +1,10 @@ -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/text-ui - "all-schemeunit-tests.ss") +(require rktunit + rktunit/text-ui + "all-rktunit-tests.rkt") -(run-tests all-schemeunit-tests) +(run-tests all-rktunit-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/schemeunit/standalone-check-test.rkt b/collects/tests/rktunit/standalone-check-test.rkt similarity index 96% rename from collects/tests/schemeunit/standalone-check-test.rkt rename to collects/tests/rktunit/standalone-check-test.rkt index 91d1daa716..9c6615a2d2 100644 --- a/collects/tests/schemeunit/standalone-check-test.rkt +++ b/collects/tests/rktunit/standalone-check-test.rkt @@ -29,9 +29,9 @@ ;; part of the standard test suite and must be run ;; separately. -#lang scheme/base +#lang racket/base -(require schemeunit/private/check) +(require rktunit/private/check) ;; This check should succeed (check = 1 1 0.0) diff --git a/collects/tests/schemeunit/standalone-test-case-test.rkt b/collects/tests/rktunit/standalone-test-case-test.rkt similarity index 83% rename from collects/tests/schemeunit/standalone-test-case-test.rkt rename to collects/tests/rktunit/standalone-test-case-test.rkt index 742bb033dc..816f082682 100644 --- a/collects/tests/schemeunit/standalone-test-case-test.rkt +++ b/collects/tests/rktunit/standalone-test-case-test.rkt @@ -2,10 +2,10 @@ ;; semantics of checks. These tests are not part of the ;; standard test suite and must be run separately. -#lang scheme/base +#lang racket/base -(require schemeunit/private/check - schemeunit/private/test-case) +(require rktunit/private/check + rktunit/private/test-case) ;; These tests should succeeds (test-begin (check-eq? 1 1)) diff --git a/collects/tests/schemeunit/test-case-test.rkt b/collects/tests/rktunit/test-case-test.rkt similarity index 83% rename from collects/tests/schemeunit/test-case-test.rkt rename to collects/tests/rktunit/test-case-test.rkt index 0f3ceac97d..66fed4c00b 100644 --- a/collects/tests/schemeunit/test-case-test.rkt +++ b/collects/tests/rktunit/test-case-test.rkt @@ -1,10 +1,10 @@ -#lang scheme/base +#lang racket/base -(require schemeunit/private/base - schemeunit/private/check - schemeunit/private/test-case - schemeunit/private/test-suite - schemeunit/private/result) +(require rktunit/private/base + rktunit/private/check + rktunit/private/test-case + rktunit/private/test-suite + rktunit/private/result) (provide test-case-tests) diff --git a/collects/tests/schemeunit/test-suite-test.rkt b/collects/tests/rktunit/test-suite-test.rkt similarity index 95% rename from collects/tests/schemeunit/test-suite-test.rkt rename to collects/tests/rktunit/test-suite-test.rkt index f8e4a1909b..de7dd5511a 100644 --- a/collects/tests/schemeunit/test-suite-test.rkt +++ b/collects/tests/rktunit/test-suite-test.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/check) +(require rktunit + rktunit/private/check) (define run? #f) diff --git a/collects/tests/schemeunit/test-test.rkt b/collects/tests/rktunit/test-test.rkt similarity index 96% rename from collects/tests/schemeunit/test-test.rkt rename to collects/tests/rktunit/test-test.rkt index cd3f237f26..f83dd15589 100644 --- a/collects/tests/schemeunit/test-test.rkt +++ b/collects/tests/rktunit/test-test.rkt @@ -1,12 +1,12 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - scheme/runtime-path +(require (for-syntax racket/base) + racket/runtime-path srfi/1 srfi/13 - schemeunit - schemeunit/private/util - schemeunit/private/location) + rktunit + rktunit/private/util + rktunit/private/location) (provide test-tests) @@ -43,7 +43,7 @@ (let ((destns (make-base-namespace)) (cns (current-namespace))) (parameterize ((current-namespace destns)) - (namespace-require 'schemeunit) + (namespace-require 'rktunit) (check-exn (lambda (e) (check-pred exn:fail:syntax? e) (check string-contains (exn-message e) msg)) @@ -260,7 +260,7 @@ (test-failure-result failure))] [loc (check-info-value (car (filter check-location? stack)))]) - (check-regexp-match #rx"test-test\\.ss" (location->string loc))))) + (check-regexp-match #rx"test-test\\.rkt" (location->string loc))))) (test-case "Shortcuts capture location" @@ -273,7 +273,7 @@ (test-failure-result failure))) (loc (check-info-value (car (filter check-location? stack))))) - (check-regexp-match #rx"test-test\\.ss" (location->string loc))))) + (check-regexp-match #rx"test-test\\.rkt" (location->string loc))))) (test-case "All names that should be exported are exported" diff --git a/collects/tests/schemeunit/text-ui-test.rkt b/collects/tests/rktunit/text-ui-test.rkt similarity index 93% rename from collects/tests/schemeunit/text-ui-test.rkt rename to collects/tests/rktunit/text-ui-test.rkt index c5daf759eb..1d9a0d95a3 100644 --- a/collects/tests/schemeunit/text-ui-test.rkt +++ b/collects/tests/rktunit/text-ui-test.rkt @@ -26,15 +26,15 @@ ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require scheme/runtime-path - scheme/pretty - scheme/port +(require racket/runtime-path + racket/pretty + racket/port srfi/1 srfi/13 - schemeunit - schemeunit/text-ui) + rktunit + rktunit/text-ui) (provide text-ui-tests) @@ -119,9 +119,9 @@ (with-all-output-to-string (failing-binary-test/complex-params)))]) (check string-contains op - "((0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) + "(`(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) (test-case "Non-binary check output is pretty printed" @@ -129,9 +129,9 @@ (with-all-output-to-string (failing-test/complex-params)))]) (check string-contains op - "((0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) - (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) + "(`(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14) + `(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))"))) (test-case "Location trimmed when file is under current directory" @@ -139,7 +139,7 @@ (let ((op (with-all-output-to-string (failing-test)))) (check string-contains op - "location: text-ui-test.ss")))) + "location: text-ui-test.rkt")))) (test-case "Name and location displayed before actual/expected" diff --git a/collects/tests/schemeunit/text-ui-util-test.rkt b/collects/tests/rktunit/text-ui-util-test.rkt similarity index 85% rename from collects/tests/schemeunit/text-ui-util-test.rkt rename to collects/tests/rktunit/text-ui-util-test.rkt index bb4948db09..2cb1362eb8 100644 --- a/collects/tests/schemeunit/text-ui-util-test.rkt +++ b/collects/tests/rktunit/text-ui-util-test.rkt @@ -25,10 +25,10 @@ ;; ;; ;; Commentary: -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/text-ui-util) +(require rktunit + rktunit/private/text-ui-util) (provide text-ui-util-tests) @@ -44,12 +44,12 @@ (test-equal? "trim-current-directory strips directory from files in current directory" (trim-current-directory - (path->string (build-path (current-directory) "foo.ss"))) - "foo.ss") + (path->string (build-path (current-directory) "foo.rkt"))) + "foo.rkt") (test-equal? "trim-current-directory leaves subdirectories alone" (trim-current-directory - (path->string (build-path (current-directory) "foo" "bar.ss"))) - "foo/bar.ss") + (path->string (build-path (current-directory) "foo" "bar.rkt"))) + "foo/bar.rkt") )) diff --git a/collects/tests/schemeunit/util-test.rkt b/collects/tests/rktunit/util-test.rkt similarity index 84% rename from collects/tests/schemeunit/util-test.rkt rename to collects/tests/rktunit/util-test.rkt index 36b90a5d89..b1c534592b 100644 --- a/collects/tests/schemeunit/util-test.rkt +++ b/collects/tests/rktunit/util-test.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require schemeunit - schemeunit/private/util) +(require rktunit + rktunit/private/util) (provide util-tests) @@ -10,18 +10,18 @@ ;; prevents the tests from loading. ;; 2 - For whatever reason, it *does* fail when loaded via PLaneT. ;; Still waiting for resolution on a bug report. -(require/expose "check-test.ss" (make-failure-test)) +(require/expose "check-test.rkt" (make-failure-test)) (define util-tests (test-suite "Util tests" (test-case - "make-failure-test required from check-test.ss" + "make-failure-test required from check-test.rkt" (begin (check-true (procedure? make-failure-test)) (check-equal? (make-arity-at-least 2) (procedure-arity make-failure-test)) - (check-pred schemeunit-test-case? + (check-pred rktunit-test-case? (delay-test (make-failure-test "foo" string?))))) (test-case diff --git a/collects/tests/srfi/1/alist-test.rkt b/collects/tests/srfi/1/alist-test.rkt index 6ab78110ae..6d6277e4bb 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 schemeunit) + (require rktunit) (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 e9ad57fe06..6c5b992850 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 schemeunit) + (require rktunit) (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 734db4af3b..d24a275e3e 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 schemeunit) + (require rktunit) (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 46a89fbbab..c721dc88fa 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 schemeunit) + (require rktunit) (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 d18bd1f85e..ab7a7d3d92 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 schemeunit) + (require rktunit) (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 bf1e8f9cc8..582ece5217 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 schemeunit) + (require rktunit) (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 d57938e188..6acd3fc9d1 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 schemeunit) + (require rktunit) (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 b8a72c5f2f..989715be06 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 schemeunit) + (require rktunit) (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 8f846805cc..e62d66b5f5 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 schemeunit) + (require rktunit) (require srfi/1/predicate srfi/1/cons) diff --git a/collects/tests/srfi/1/run-tests.rkt b/collects/tests/srfi/1/run-tests.rkt index e4cfd86d66..5f16086162 100644 --- a/collects/tests/srfi/1/run-tests.rkt +++ b/collects/tests/srfi/1/run-tests.rkt @@ -1,5 +1,5 @@ -(require schemeunit) -(require schemeunit/text-ui) +(require rktunit) +(require rktunit/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 fd2e9f8e9f..12ab23f04c 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 schemeunit) + (require rktunit) (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 ba9edd9a28..76803dc9ad 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 schemeunit) + (require rktunit) (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 5191748594..073ba14ff3 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 schemeunit) + (require rktunit) (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 4f25d619c7..67d8b0fff2 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 schemeunit) + (require rktunit) (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 7ef340b0a7..1851ecb8a7 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 schemeunit - schemeunit/text-ui) +(require rktunit + rktunit/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 2cd38ea1ba..03ad164fc4 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 schemeunit) + (require rktunit) (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 d053599e42..8f2ffb84c4 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 schemeunit) + (require rktunit) (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 3434ef1e3b..7aa4225ffb 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 schemeunit) - (require schemeunit/text-ui + (require rktunit) + (require rktunit/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 bdc6627dfb..8f069f96f0 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 schemeunit) + (require rktunit) (require srfi/40) (provide all-srfi-40-tests) diff --git a/collects/tests/srfi/40/run-tests.rkt b/collects/tests/srfi/40/run-tests.rkt index ec2e6d6957..a9b0fada83 100644 --- a/collects/tests/srfi/40/run-tests.rkt +++ b/collects/tests/srfi/40/run-tests.rkt @@ -1,5 +1,5 @@ -(require schemeunit) -(require schemeunit/text-ui) +(require rktunit) +(require rktunit/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 0ee7c197d7..c4620fc684 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 schemeunit) + (require rktunit) (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 217a9ffe04..c2457f093c 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 schemeunit) + (require rktunit) (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 43340d7c9e..26617e5430 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 schemeunit) + (require rktunit) (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 514ddd4398..a3ce6e6579 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 schemeunit) + (require rktunit) (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 8ef936f896..79f1813918 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 schemeunit) + (require rktunit) (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 32a82dd82d..a98b03d4eb 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 schemeunit) + (require rktunit) (require srfi/43/vector-lib) (provide predicate-tests) diff --git a/collects/tests/srfi/43/run-tests.rkt b/collects/tests/srfi/43/run-tests.rkt index bef2758593..18e001b1fe 100644 --- a/collects/tests/srfi/43/run-tests.rkt +++ b/collects/tests/srfi/43/run-tests.rkt @@ -1,5 +1,5 @@ -(require schemeunit) -(require schemeunit/text-ui) +(require rktunit) +(require rktunit/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 d3fd4eaee9..e8c6ffcc06 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 schemeunit) + (require rktunit) (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 cb09f6feba..433c1e3817 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 schemeunit) + (require rktunit) (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 85c7530761..4626cd8dd3 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 schemeunit) + (require rktunit) (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 ba8d6abb63..b4ebddcd28 100644 --- a/collects/tests/srfi/run-tests.rkt +++ b/collects/tests/srfi/run-tests.rkt @@ -1,7 +1,7 @@ #lang scheme/base -(require schemeunit) -(require schemeunit/text-ui) +(require rktunit) +(require rktunit/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 1e794b1da0..46fbbd80a3 100644 --- a/collects/tests/stxparse/more-tests.rkt +++ b/collects/tests/stxparse/more-tests.rkt @@ -1,6 +1,6 @@ #lang scheme (require syntax/parse - schemeunit) + rktunit) (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 5cb56de502..7ff85f6bec 100644 --- a/collects/tests/stxparse/select.rkt +++ b/collects/tests/stxparse/select.rkt @@ -1,5 +1,5 @@ #lang scheme -(require schemeunit +(require rktunit 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 da957d5c2a..2d06baf0a3 100644 --- a/collects/tests/stxparse/stxclass.rkt +++ b/collects/tests/stxparse/stxclass.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require schemeunit +(require rktunit syntax/parse (for-syntax scheme/base syntax/parse)) diff --git a/collects/tests/stxparse/test.rkt b/collects/tests/stxparse/test.rkt index 8539559364..62d41a7fe9 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 schemeunit) +(require rktunit) ;; tok = test pattern ok (define-syntax tok diff --git a/collects/tests/typed-scheme/main.rkt b/collects/tests/typed-scheme/main.rkt index bbd37489cb..048b2d4195 100644 --- a/collects/tests/typed-scheme/main.rkt +++ b/collects/tests/typed-scheme/main.rkt @@ -2,7 +2,7 @@ (provide go go/text) -(require schemeunit schemeunit/text-ui +(require rktunit rktunit/text-ui mzlib/etc scheme/port compiler/compiler scheme/match diff --git a/collects/tests/typed-scheme/succeed/fixnum.rkt b/collects/tests/typed-scheme/succeed/fixnum.rkt index b9dfc1b918..640cdf1cfa 100644 --- a/collects/tests/typed-scheme/succeed/fixnum.rkt +++ b/collects/tests/typed-scheme/succeed/fixnum.rkt @@ -10,7 +10,7 @@ ;; really badly wrong. (: check (All (a) ((a a -> Boolean) a a -> Boolean))) -;; Simple check function as SchemeUnit doesn't work in Typed Scheme (yet) +;; Simple check function as RktUnit doesn't work in Typed Scheme (yet) (define (check f a b) (if (f a b) #t diff --git a/collects/tests/typed-scheme/succeed/flonum.rkt b/collects/tests/typed-scheme/succeed/flonum.rkt index d6c70ff3c3..bacb377500 100644 --- a/collects/tests/typed-scheme/succeed/flonum.rkt +++ b/collects/tests/typed-scheme/succeed/flonum.rkt @@ -5,7 +5,7 @@ scheme/unsafe/ops) (: check (All (a) ((a a -> Boolean) a a -> Boolean))) -;; Simple check function as SchemeUnit doesn't work in Typed Scheme (yet) +;; Simple check function as RktUnit doesn't work in Typed Scheme (yet) (define (check f a b) (if (f a b) #t diff --git a/collects/tests/typed-scheme/succeed/flvector.rkt b/collects/tests/typed-scheme/succeed/flvector.rkt index 9ee9e90013..066d2068c1 100644 --- a/collects/tests/typed-scheme/succeed/flvector.rkt +++ b/collects/tests/typed-scheme/succeed/flvector.rkt @@ -11,7 +11,7 @@ ;; really badly wrong. (: check (All (a) ((a a -> Boolean) a a -> Boolean))) -;; Simple check function as SchemeUnit doesn't work in Typed Scheme (yet) +;; Simple check function as RktUnit doesn't work in Typed Scheme (yet) (define (check f a b) (if (f a b) #t @@ -40,4 +40,4 @@ (let ([v (flvector 1. 2. 3.)]) (unsafe-flvector-set! v 0 10.) (unsafe-flvector-ref v 0)) - 10.) \ No newline at end of file + 10.) diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.rkt b/collects/tests/typed-scheme/unit-tests/all-tests.rkt index 697a04734b..7d6b9f542f 100644 --- a/collects/tests/typed-scheme/unit-tests/all-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/all-tests.rkt @@ -12,7 +12,7 @@ "subst-tests.ss" ;; pass "infer-tests.ss" ;; pass "contract-tests.ss" - (r:infer infer infer-dummy) schemeunit) + (r:infer infer infer-dummy) rktunit) (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 39884f0685..2da932c628 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) - schemeunit) + rktunit) (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 7edf9b4c37..4418c8f51e 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) - schemeunit) + rktunit) diff --git a/collects/tests/typed-scheme/unit-tests/module-tests.rkt b/collects/tests/typed-scheme/unit-tests/module-tests.rkt index 1c310c487e..188bf916bd 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" schemeunit) +(require "test-utils.ss" rktunit) (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 f7f028fb4e..8f04fa8258 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) - schemeunit) + rktunit) (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 e3bbf69f8e..1a7db776e2 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 schemeunit) +(provide rktunit) ;; why is this neccessary? (provide planet/multiple) -(define-module schemeunit - (planet/multiple ("schematics" "schemeunit.plt" 2 11) +(define-module rktunit + (planet/multiple ("schematics" "rktunit.plt" 2 11) "test.ss" ;"graphical-ui.ss" "text-ui.ss" @@ -44,4 +44,4 @@ #; (planet/multiple ("cce" "fasttest.plt" 1 2) "random.ss" - "schemeunit.ss")) + "rktunit.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 39fc818dc8..46d0910d1c 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) - schemeunit) + rktunit) (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 337518b101..546c4eef08 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) - schemeunit) + rktunit) (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 c6f68f753f..9f5fe6c943 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) - schemeunit + rktunit (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 b366273026..bcce8ab843 100644 --- a/collects/tests/typed-scheme/unit-tests/test-utils.rkt +++ b/collects/tests/typed-scheme/unit-tests/test-utils.rkt @@ -7,7 +7,7 @@ typed-scheme/utils/utils (for-syntax scheme/base) (types comparison utils) - schemeunit schemeunit/text-ui) + rktunit rktunit/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 'schemeunit/private/gui/gui 'make-gui-runner)) + (((dynamic-require 'rktunit/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 30909685c2..8479820a8f 100644 --- a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt @@ -6,7 +6,7 @@ (env type-environments type-name-env init-envs) (utils tc-utils) (rep type-rep) - schemeunit) + rktunit) (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 430228007d..1fcd1f759d 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) - schemeunit) + rktunit) (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 65791fcfd1..be6a31f2ab 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -17,7 +17,7 @@ (utils tc-utils utils) unstable/mutated-vars (env type-name-env type-environments init-envs) - schemeunit + rktunit 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 9f226de5f1..65b4b07ccd 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 schemeunit +(require rktunit "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 362cbca91e..41c99ecc30 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 schemeunit +(require rktunit "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 365ab7b506..d67e440b4d 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 schemeunit +(require rktunit (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 c5534a74ec..d91d90af25 100644 --- a/collects/tests/web-server/dispatch-test.rkt +++ b/collects/tests/web-server/dispatch-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require schemeunit +(require rktunit web-server/http web-server/dispatchers/dispatch net/url @@ -458,5 +458,5 @@ #;(test-serve/dispatch) -(require schemeunit/text-ui) +(require rktunit/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 62739d96f9..00083f7917 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 schemeunit +(require rktunit "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 3e7e613fa1..78b5ccf047 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 schemeunit +(require rktunit (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/schemeunit:3/text-ui)) +#;(require (planet schematics/rktunit: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 5662cb6003..3143d201e0 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 schemeunit +(require rktunit (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 6856fd66ef..7036604798 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 schemeunit +(require rktunit mzlib/etc mzlib/list web-server/dispatchers/dispatch @@ -164,6 +164,6 @@ )) #| -(require schemeunit/text-ui) +(require rktunit/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 a85ec12417..869c4bbb30 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 schemeunit +(require rktunit (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 85a2ac602d..f8bfb708c9 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 schemeunit +(require rktunit mzlib/etc mzlib/list web-server/http @@ -112,4 +112,4 @@ [k0 (first ((sxpath "//a/@href/text()") (call d url0 empty)))]) (sleep 3) (call d k0 empty)) - "#")))) \ No newline at end of file + "#")))) diff --git a/collects/tests/web-server/dispatchers/filesystem-map-test.rkt b/collects/tests/web-server/dispatchers/filesystem-map-test.rkt index 068a839466..8e3944fe77 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 schemeunit +(require rktunit 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 8b493560fd..3a8891151e 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 schemeunit +(require rktunit 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 adb6f860b5..895e44d95e 100644 --- a/collects/tests/web-server/formlets-test.rkt +++ b/collects/tests/web-server/formlets-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require schemeunit +(require rktunit net/url web-server/http web-server/formlets @@ -370,5 +370,5 @@ )) -(require schemeunit/text-ui) -(run-tests all-formlets-tests) \ No newline at end of file +(require rktunit/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 0b44ce0485..906b334a1f 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 schemeunit +(require rktunit "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 83bc473e12..c1f56f8227 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 schemeunit +(require rktunit net/url web-server/http/request-structs web-server/http/response-structs @@ -141,5 +141,5 @@ ))) -#;(require schemeunit/text-ui) -#;(run-tests cookies-tests) \ No newline at end of file +#;(require rktunit/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 88961e8cff..bb31d356f4 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 schemeunit +(require rktunit 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 ce88cbf809..98107a4d96 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 schemeunit +(require rktunit "util.rkt") (provide lang-tests) @@ -212,14 +212,14 @@ (provide store-k lookup-k) - (define the-table (hash)) + (define the-table (make-hash)) (define (store-k k) (let ([key (string->symbol (symbol->string (gensym 'key)))]) - (hash-table-put! the-table key k) + (hash-set! the-table key k) key)) (define (lookup-k key-pair) - (hash-table-get the-table (car key-pair) (lambda () #f)))))]) + (hash-ref the-table (car key-pair) (lambda () #f)))))]) (table-01-eval '(module m06 (lib "lang.rkt" "web-server") (require 'table01) diff --git a/collects/tests/web-server/lang/abort-resume-test.rkt b/collects/tests/web-server/lang/abort-resume-test.rkt index bdddafd961..b8305fed4c 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 schemeunit +(require rktunit web-server/lang/abort-resume) (require/expose web-server/lang/abort-resume (web-prompt)) (provide abort-resume-tests) @@ -306,6 +306,6 @@ )) #| -(require schemeunit/text-ui) +(require rktunit/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 73e62e5eaf..e4830190cf 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 schemeunit +(require rktunit "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 d106742cb6..430c7099bb 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 schemeunit +(require rktunit 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 927cb2dd01..de10e08029 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 schemeunit +(require rktunit 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 f9745a35e6..144287593b 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 schemeunit +(require rktunit 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 24b06c57c4..042b9bac1f 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 schemeunit +(require rktunit 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 bafe70ad41..fa25f1a6ff 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 - schemeunit + rktunit 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 9180ba0f64..2c9f0f06a6 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 schemeunit +(require rktunit "../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 0432690bed..739cab4bf4 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 schemeunit) +(require rktunit) (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 e9bcf88dfb..adae03de54 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 schemeunit +(require rktunit "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 0200da5b02..48028c50dc 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 schemeunit +(require rktunit web-server/private/cache-table) (provide cache-table-tests) @@ -37,6 +37,6 @@ (cache-table-lookup! ct 'foo (lambda () #f))))))) #| -(require (planet schematics/schemeunit:3/text-ui)) +(require (planet schematics/rktunit: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 99d1423e0a..72950e37b9 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 schemeunit +(require rktunit 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 49244c9e70..7e35dd3f78 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 schemeunit +(require rktunit 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 adaa2f447d..32c5b6d06c 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 schemeunit +(require rktunit 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 1d2141905c..78942cce7d 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 schemeunit +(require rktunit (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 8c3dfbb9f9..df290694f4 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 schemeunit +(require rktunit 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 d247367ea8..85adc37e5d 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 schemeunit +(require rktunit 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 46ee284794..95a1303b1d 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 schemeunit +(require rktunit 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 b30c44999e..9370012973 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 schemeunit +(require rktunit 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 1f9f581e7b..a0a977a385 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 schemeunit +(require rktunit 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 1f51bd8800..484934b0d4 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 schemeunit/text-ui +(require rktunit/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 6f091be12b..867dfebbf1 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 schemeunit +(require rktunit 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 48d308797b..cfc7e907b3 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 schemeunit +(require rktunit "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 893858f3cf..c6e0d85ba8 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 schemeunit +(require rktunit 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 cba6f8aa44..0757517fd8 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 schemeunit +(require rktunit 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 d4d3ddf1f6..312b7cc1c6 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 schemeunit +(require rktunit 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/schemeunit:3/text-ui)) +;(require (planet schematics/rktunit: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 2cdac87e54..be5fe60d7f 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 schemeunit +(require rktunit 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 5a7502b9b7..7baae5d620 100644 --- a/collects/tests/web-server/stuffers-test.rkt +++ b/collects/tests/web-server/stuffers-test.rkt @@ -1,5 +1,5 @@ #lang racket -(require schemeunit +(require rktunit 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/schemeunit:3/text-ui)) +(require (planet schematics/rktunit: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 60dcac2ba5..1b94b46cac 100644 --- a/collects/tests/xml/test-clark.rkt +++ b/collects/tests/xml/test-clark.rkt @@ -1,6 +1,6 @@ #lang racket -(require schemeunit - schemeunit/text-ui +(require rktunit + rktunit/text-ui xml racket/runtime-path) diff --git a/collects/tests/xml/test.rkt b/collects/tests/xml/test.rkt index 480793acc5..3862212969 100644 --- a/collects/tests/xml/test.rkt +++ b/collects/tests/xml/test.rkt @@ -1,6 +1,6 @@ #lang racket -(require schemeunit - schemeunit/text-ui +(require rktunit + rktunit/text-ui xml xml/plist mzlib/etc