From 76853279c39d50682ac8dc16e81b444401a3800d Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 17 Feb 2009 22:11:39 +0000 Subject: [PATCH] Moved to SU3 svn: r13712 --- .../tests/web-server/all-web-server-tests.ss | 2 +- .../configuration/all-configuration-tests.ss | 2 +- .../configuration/configuration-table-test.ss | 2 +- .../dispatchers/all-dispatchers-tests.ss | 2 +- .../dispatchers/dispatch-files-test.ss | 16 ++++++++++------ .../web-server/dispatchers/dispatch-host-test.ss | 3 +-- .../web-server/dispatchers/dispatch-lang-test.ss | 2 +- .../dispatchers/dispatch-passwords-test.ss | 3 +-- .../dispatchers/dispatch-servlets-test.ss | 2 +- .../dispatchers/filesystem-map-test.ss | 2 +- .../web-server/dispatchers/servlet-test-util.ss | 2 +- collects/tests/web-server/formlets-test.ss | 2 +- collects/tests/web-server/http/all-http-tests.ss | 2 +- collects/tests/web-server/http/cookies-test.ss | 6 +++--- .../tests/web-server/http/digest-auth-test.ss | 2 +- collects/tests/web-server/lang-test.ss | 4 ++-- .../tests/web-server/lang/abort-resume-test.ss | 3 +-- collects/tests/web-server/lang/all-lang-tests.ss | 2 +- collects/tests/web-server/lang/anormal-test.ss | 2 +- collects/tests/web-server/lang/defun-test.ss | 2 +- collects/tests/web-server/lang/file-box-test.ss | 2 +- collects/tests/web-server/lang/labels-test.ss | 2 +- collects/tests/web-server/lang/stuff-url-test.ss | 2 +- collects/tests/web-server/lang/web-param-test.ss | 2 +- .../web-server/managers/all-managers-tests.ss | 2 +- .../web-server/private/all-private-tests.ss | 2 +- .../tests/web-server/private/cache-table-test.ss | 2 +- .../private/connection-manager-test.ss | 2 +- .../web-server/private/define-closure-test.ss | 2 +- collects/tests/web-server/private/gzip-test.ss | 2 +- .../tests/web-server/private/mime-types-test.ss | 2 +- .../tests/web-server/private/mod-map-test.ss | 2 +- .../tests/web-server/private/request-test.ss | 3 +-- .../tests/web-server/private/response-test.ss | 3 +-- .../tests/web-server/private/session-test.ss | 2 +- .../tests/web-server/private/url-param-test.ss | 2 +- collects/tests/web-server/private/util-test.ss | 2 +- collects/tests/web-server/run-all-tests.ss | 5 ++--- collects/tests/web-server/servlet-env-test.ss | 2 +- .../web-server/servlet/all-servlet-tests.ss | 2 +- .../tests/web-server/servlet/basic-auth-test.ss | 2 +- .../tests/web-server/servlet/bindings-test.ss | 2 +- .../tests/web-server/servlet/helpers-test.ss | 2 +- collects/tests/web-server/servlet/web-test.ss | 3 +-- collects/tests/web-server/stuffers-test.ss | 2 +- collects/tests/web-server/util.ss | 8 +++++--- 46 files changed, 63 insertions(+), 64 deletions(-) diff --git a/collects/tests/web-server/all-web-server-tests.ss b/collects/tests/web-server/all-web-server-tests.ss index 73a0cf1bf8..ea44c8a081 100644 --- a/collects/tests/web-server/all-web-server-tests.ss +++ b/collects/tests/web-server/all-web-server-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "configuration/all-configuration-tests.ss" "dispatchers/all-dispatchers-tests.ss" "lang/all-lang-tests.ss" diff --git a/collects/tests/web-server/configuration/all-configuration-tests.ss b/collects/tests/web-server/configuration/all-configuration-tests.ss index 5282587ae5..3de7a213ba 100644 --- a/collects/tests/web-server/configuration/all-configuration-tests.ss +++ b/collects/tests/web-server/configuration/all-configuration-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "configuration-table-test.ss") (provide all-configuration-tests) diff --git a/collects/tests/web-server/configuration/configuration-table-test.ss b/collects/tests/web-server/configuration/configuration-table-test.ss index fb48463129..6018612f07 100644 --- a/collects/tests/web-server/configuration/configuration-table-test.ss +++ b/collects/tests/web-server/configuration/configuration-table-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (only-in mzlib/file make-temporary-file) web-server/configuration/configuration-table) diff --git a/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss b/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss index 79d213922e..6d3e761478 100644 --- a/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss +++ b/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "dispatch-passwords-test.ss" "dispatch-files-test.ss" "dispatch-servlets-test.ss" diff --git a/collects/tests/web-server/dispatchers/dispatch-files-test.ss b/collects/tests/web-server/dispatchers/dispatch-files-test.ss index 35b481cbba..e4080c4e37 100644 --- a/collects/tests/web-server/dispatchers/dispatch-files-test.ss +++ b/collects/tests/web-server/dispatchers/dispatch-files-test.ss @@ -1,5 +1,5 @@ -#lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +#lang scheme +(require (planet schematics/schemeunit:3) (only-in mzlib/file file-name-from-path make-temporary-file) @@ -45,10 +45,14 @@ (test-case "read-range-header: missing and badly formed headers" (check-false (files:read-range-header (list (make-header #"Ranges" #"bytes=1-10"))) "check 1") - (check-false (files:read-range-header (list (make-header #"Range" #"completely wrong"))) "check 2") - (check-false (files:read-range-header (list (make-header #"Range" #"byte=1-10"))) "check 3") - (check-false (files:read-range-header (list (make-header #"Range" #"bytes=a-10"))) "check 4") - (check-false (files:read-range-header (list (make-header #"Range" #"bytes=1-1.0"))) "check 5")) + (check-false (parameterize ([current-error-port (open-output-nowhere)]) + (files:read-range-header (list (make-header #"Range" #"completely wrong")))) "check 2") + (check-false (parameterize ([current-error-port (open-output-nowhere)]) + (files:read-range-header (list (make-header #"Range" #"byte=1-10")))) "check 3") + (check-false (parameterize ([current-error-port (open-output-nowhere)]) + (files:read-range-header (list (make-header #"Range" #"bytes=a-10")))) "check 4") + (check-false (parameterize ([current-error-port (open-output-nowhere)]) + (files:read-range-header (list (make-header #"Range" #"bytes=1-1.0")))) "check 5")) (test-case "read-range-header: single range" diff --git a/collects/tests/web-server/dispatchers/dispatch-host-test.ss b/collects/tests/web-server/dispatchers/dispatch-host-test.ss index b04c459cec..1ec05a0d04 100644 --- a/collects/tests/web-server/dispatchers/dispatch-host-test.ss +++ b/collects/tests/web-server/dispatchers/dispatch-host-test.ss @@ -1,6 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (planet "util.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (only-in mzlib/file make-temporary-file) net/url diff --git a/collects/tests/web-server/dispatchers/dispatch-lang-test.ss b/collects/tests/web-server/dispatchers/dispatch-lang-test.ss index b15b37623f..f80795a9cc 100644 --- a/collects/tests/web-server/dispatchers/dispatch-lang-test.ss +++ b/collects/tests/web-server/dispatchers/dispatch-lang-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0)) mzlib/etc mzlib/list diff --git a/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss b/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss index 19be134a59..5f0325ee08 100644 --- a/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss +++ b/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss @@ -1,6 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (planet "util.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (only-in mzlib/file make-temporary-file) net/url diff --git a/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss b/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss index dbfb5b1322..cb96d59275 100644 --- a/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss +++ b/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0)) mzlib/etc mzlib/list diff --git a/collects/tests/web-server/dispatchers/filesystem-map-test.ss b/collects/tests/web-server/dispatchers/filesystem-map-test.ss index 2597c326ae..9059091c6b 100644 --- a/collects/tests/web-server/dispatchers/filesystem-map-test.ss +++ b/collects/tests/web-server/dispatchers/filesystem-map-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) net/url web-server/private/util web-server/dispatchers/filesystem-map) diff --git a/collects/tests/web-server/dispatchers/servlet-test-util.ss b/collects/tests/web-server/dispatchers/servlet-test-util.ss index 37db1dfbcf..225e95310b 100644 --- a/collects/tests/web-server/dispatchers/servlet-test-util.ss +++ b/collects/tests/web-server/dispatchers/servlet-test-util.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0)) mzlib/list web-server/http diff --git a/collects/tests/web-server/formlets-test.ss b/collects/tests/web-server/formlets-test.ss index 9f12129485..c466f4a7ab 100644 --- a/collects/tests/web-server/formlets-test.ss +++ b/collects/tests/web-server/formlets-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) net/url web-server/http web-server/formlets diff --git a/collects/tests/web-server/http/all-http-tests.ss b/collects/tests/web-server/http/all-http-tests.ss index 3ca82a429c..d4b0a037b8 100644 --- a/collects/tests/web-server/http/all-http-tests.ss +++ b/collects/tests/web-server/http/all-http-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "cookies-test.ss" "digest-auth-test.ss") (provide all-http-tests) diff --git a/collects/tests/web-server/http/cookies-test.ss b/collects/tests/web-server/http/cookies-test.ss index fa25ae829f..10d3831fb4 100644 --- a/collects/tests/web-server/http/cookies-test.ss +++ b/collects/tests/web-server/http/cookies-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) net/url web-server/http/request-structs web-server/http/response-structs @@ -57,11 +57,11 @@ "xexpr-response/cookies" (test-equal? "Simple" (response/full-body (xexpr-response/cookies empty `(html))) - (list #"")) + (list #"")) (test-equal? "One (body)" (response/full-body (xexpr-response/cookies (list (make-cookie "name" "value")) `(html))) - (list #"")) + (list #"")) (test-equal? "One (headers)" (map (lambda (h) (cons (header-field h) (header-value h))) diff --git a/collects/tests/web-server/http/digest-auth-test.ss b/collects/tests/web-server/http/digest-auth-test.ss index 6e545c2aea..1da759b525 100644 --- a/collects/tests/web-server/http/digest-auth-test.ss +++ b/collects/tests/web-server/http/digest-auth-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/http net/url) (provide digest-auth-tests) diff --git a/collects/tests/web-server/lang-test.ss b/collects/tests/web-server/lang-test.ss index 1cc0be72dd..a53a562217 100644 --- a/collects/tests/web-server/lang-test.ss +++ b/collects/tests/web-server/lang-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "util.ss") (provide lang-tests) @@ -240,7 +240,7 @@ (let* ([first-key (table-01-eval '(dispatch-start start 'foo))] [second-key (table-01-eval `(dispatch lookup-k '(,first-key 1)))] [third-key (table-01-eval `(dispatch lookup-k '(,first-key -7)))]) - (printf "~S~n" (list first-key second-key third-key)) + #;(printf "~S~n" (list first-key second-key third-key)) (check = 3 (table-01-eval `(dispatch lookup-k '(,second-key 2)))) (check = 4 (table-01-eval `(dispatch lookup-k '(,second-key 3)))) (check-true (zero? (table-01-eval `(dispatch lookup-k '(,second-key -1))))) diff --git a/collects/tests/web-server/lang/abort-resume-test.ss b/collects/tests/web-server/lang/abort-resume-test.ss index b30891e6e7..c9d1c320ec 100644 --- a/collects/tests/web-server/lang/abort-resume-test.ss +++ b/collects/tests/web-server/lang/abort-resume-test.ss @@ -1,6 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (planet "util.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/lang/abort-resume) (require/expose web-server/lang/abort-resume (web-prompt)) (provide abort-resume-tests) diff --git a/collects/tests/web-server/lang/all-lang-tests.ss b/collects/tests/web-server/lang/all-lang-tests.ss index f75fc2afc9..2f7af74d49 100644 --- a/collects/tests/web-server/lang/all-lang-tests.ss +++ b/collects/tests/web-server/lang/all-lang-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "abort-resume-test.ss" "anormal-test.ss" "defun-test.ss" diff --git a/collects/tests/web-server/lang/anormal-test.ss b/collects/tests/web-server/lang/anormal-test.ss index 56202f7cf7..8651ffe3b6 100644 --- a/collects/tests/web-server/lang/anormal-test.ss +++ b/collects/tests/web-server/lang/anormal-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/lang/anormal web-server/lang/util) (provide anormal-tests) diff --git a/collects/tests/web-server/lang/defun-test.ss b/collects/tests/web-server/lang/defun-test.ss index be3b2b9259..7b1e17b954 100644 --- a/collects/tests/web-server/lang/defun-test.ss +++ b/collects/tests/web-server/lang/defun-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/lang/defun web-server/lang/util) (provide defun-tests) diff --git a/collects/tests/web-server/lang/file-box-test.ss b/collects/tests/web-server/lang/file-box-test.ss index 2cb4fef533..fefb26b73c 100644 --- a/collects/tests/web-server/lang/file-box-test.ss +++ b/collects/tests/web-server/lang/file-box-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) 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.ss b/collects/tests/web-server/lang/labels-test.ss index cf8ee4db2f..f261c55ef8 100644 --- a/collects/tests/web-server/lang/labels-test.ss +++ b/collects/tests/web-server/lang/labels-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/lang/labels) (provide labels-tests) diff --git a/collects/tests/web-server/lang/stuff-url-test.ss b/collects/tests/web-server/lang/stuff-url-test.ss index 0f936bd836..70521c87d9 100644 --- a/collects/tests/web-server/lang/stuff-url-test.ss +++ b/collects/tests/web-server/lang/stuff-url-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require web-server/lang/stuff-url web-server/stuffers - (planet "test.ss" ("schematics" "schemeunit.plt" 2)) + (planet schematics/schemeunit:3) net/url mzlib/serialize "../util.ss") diff --git a/collects/tests/web-server/lang/web-param-test.ss b/collects/tests/web-server/lang/web-param-test.ss index a31cedd9ab..072efce82d 100644 --- a/collects/tests/web-server/lang/web-param-test.ss +++ b/collects/tests/web-server/lang/web-param-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "../util.ss") (provide web-param-tests) diff --git a/collects/tests/web-server/managers/all-managers-tests.ss b/collects/tests/web-server/managers/all-managers-tests.ss index c7d44bba43..b2b0b2542c 100644 --- a/collects/tests/web-server/managers/all-managers-tests.ss +++ b/collects/tests/web-server/managers/all-managers-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) +(require (planet schematics/schemeunit:3)) (provide all-managers-tests) (define all-managers-tests diff --git a/collects/tests/web-server/private/all-private-tests.ss b/collects/tests/web-server/private/all-private-tests.ss index 4dcc5803aa..6646557df1 100644 --- a/collects/tests/web-server/private/all-private-tests.ss +++ b/collects/tests/web-server/private/all-private-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "request-test.ss" "cache-table-test.ss" "response-test.ss" diff --git a/collects/tests/web-server/private/cache-table-test.ss b/collects/tests/web-server/private/cache-table-test.ss index 071d55a33e..de88a4ec96 100644 --- a/collects/tests/web-server/private/cache-table-test.ss +++ b/collects/tests/web-server/private/cache-table-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/private/cache-table) (provide cache-table-tests) diff --git a/collects/tests/web-server/private/connection-manager-test.ss b/collects/tests/web-server/private/connection-manager-test.ss index 75dc98384e..5e6a458dfa 100644 --- a/collects/tests/web-server/private/connection-manager-test.ss +++ b/collects/tests/web-server/private/connection-manager-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/private/connection-manager) (provide connection-manager-tests) diff --git a/collects/tests/web-server/private/define-closure-test.ss b/collects/tests/web-server/private/define-closure-test.ss index 75b602edfd..5bb26814f1 100644 --- a/collects/tests/web-server/private/define-closure-test.ss +++ b/collects/tests/web-server/private/define-closure-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) mzlib/serialize mzlib/match web-server/private/define-closure) diff --git a/collects/tests/web-server/private/gzip-test.ss b/collects/tests/web-server/private/gzip-test.ss index f020089a4d..c1969af515 100644 --- a/collects/tests/web-server/private/gzip-test.ss +++ b/collects/tests/web-server/private/gzip-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/private/gzip) (provide gzip-tests) diff --git a/collects/tests/web-server/private/mime-types-test.ss b/collects/tests/web-server/private/mime-types-test.ss index 56ba00cbbe..85c6c64cc3 100644 --- a/collects/tests/web-server/private/mime-types-test.ss +++ b/collects/tests/web-server/private/mime-types-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) (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.ss b/collects/tests/web-server/private/mod-map-test.ss index ecb1328465..d4c45dc127 100644 --- a/collects/tests/web-server/private/mod-map-test.ss +++ b/collects/tests/web-server/private/mod-map-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/private/mod-map mzlib/serialize "../util.ss") diff --git a/collects/tests/web-server/private/request-test.ss b/collects/tests/web-server/private/request-test.ss index 6dfced3bfd..2998634914 100644 --- a/collects/tests/web-server/private/request-test.ss +++ b/collects/tests/web-server/private/request-test.ss @@ -1,6 +1,5 @@ #lang scheme -(require (planet "util.ss" ("schematics" "schemeunit.plt" 2)) - (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/private/connection-manager web-server/private/timer web-server/http) diff --git a/collects/tests/web-server/private/response-test.ss b/collects/tests/web-server/private/response-test.ss index a2575c32e0..b5305ca7a5 100644 --- a/collects/tests/web-server/private/response-test.ss +++ b/collects/tests/web-server/private/response-test.ss @@ -1,6 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (planet "util.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) xml/xml (only-in mzlib/file make-temporary-file) diff --git a/collects/tests/web-server/private/session-test.ss b/collects/tests/web-server/private/session-test.ss index b2597ef20a..2d8882d494 100644 --- a/collects/tests/web-server/private/session-test.ss +++ b/collects/tests/web-server/private/session-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) mzlib/list net/url web-server/private/session) diff --git a/collects/tests/web-server/private/url-param-test.ss b/collects/tests/web-server/private/url-param-test.ss index a7a1f6f8eb..3c134259f0 100644 --- a/collects/tests/web-server/private/url-param-test.ss +++ b/collects/tests/web-server/private/url-param-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) net/url web-server/private/url-param) (provide url-param-tests) diff --git a/collects/tests/web-server/private/util-test.ss b/collects/tests/web-server/private/util-test.ss index c8d1feccf5..bd28d4a886 100644 --- a/collects/tests/web-server/private/util-test.ss +++ b/collects/tests/web-server/private/util-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) net/url xml/xml mzlib/contract diff --git a/collects/tests/web-server/run-all-tests.ss b/collects/tests/web-server/run-all-tests.ss index 290f2b7fbf..9aa2ce4abf 100644 --- a/collects/tests/web-server/run-all-tests.ss +++ b/collects/tests/web-server/run-all-tests.ss @@ -1,6 +1,5 @@ #lang scheme/base -(require (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2)) - (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3/text-ui) "all-web-server-tests.ss") -(test/graphical-ui all-web-server-tests) +(run-tests all-web-server-tests) diff --git a/collects/tests/web-server/servlet-env-test.ss b/collects/tests/web-server/servlet-env-test.ss index f450d730c8..cd3766f31a 100644 --- a/collects/tests/web-server/servlet-env-test.ss +++ b/collects/tests/web-server/servlet-env-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) #;(only (planet "ssax.ss" ("lizorkin" "ssax.plt" 1 3)) ssax:xml->sxml) #;(planet "sxml.ss" ("lizorkin" "sxml.plt" 1 4)) diff --git a/collects/tests/web-server/servlet/all-servlet-tests.ss b/collects/tests/web-server/servlet/all-servlet-tests.ss index a8097822aa..898aa16ad8 100644 --- a/collects/tests/web-server/servlet/all-servlet-tests.ss +++ b/collects/tests/web-server/servlet/all-servlet-tests.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) "bindings-test.ss" "basic-auth-test.ss" "helpers-test.ss" diff --git a/collects/tests/web-server/servlet/basic-auth-test.ss b/collects/tests/web-server/servlet/basic-auth-test.ss index 74525a02d6..33f3eedf68 100644 --- a/collects/tests/web-server/servlet/basic-auth-test.ss +++ b/collects/tests/web-server/servlet/basic-auth-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/http net/url) (provide basic-auth-tests) diff --git a/collects/tests/web-server/servlet/bindings-test.ss b/collects/tests/web-server/servlet/bindings-test.ss index 26f61926da..343e6f10f1 100644 --- a/collects/tests/web-server/servlet/bindings-test.ss +++ b/collects/tests/web-server/servlet/bindings-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) mzlib/list net/url web-server/http diff --git a/collects/tests/web-server/servlet/helpers-test.ss b/collects/tests/web-server/servlet/helpers-test.ss index f345d23e9c..17c105462d 100644 --- a/collects/tests/web-server/servlet/helpers-test.ss +++ b/collects/tests/web-server/servlet/helpers-test.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/servlet) (provide helpers-tests) diff --git a/collects/tests/web-server/servlet/web-test.ss b/collects/tests/web-server/servlet/web-test.ss index 1dac07efac..8caee36c94 100644 --- a/collects/tests/web-server/servlet/web-test.ss +++ b/collects/tests/web-server/servlet/web-test.ss @@ -1,6 +1,5 @@ #lang scheme/base -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (planet "util.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) net/url web-server/servlet/web) (require/expose web-server/servlet/web diff --git a/collects/tests/web-server/stuffers-test.ss b/collects/tests/web-server/stuffers-test.ss index 5036b080bc..7198a58e25 100644 --- a/collects/tests/web-server/stuffers-test.ss +++ b/collects/tests/web-server/stuffers-test.ss @@ -1,5 +1,5 @@ #lang scheme -(require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) +(require (planet schematics/schemeunit:3) web-server/stuffers web-server/private/servlet web-server/http diff --git a/collects/tests/web-server/util.ss b/collects/tests/web-server/util.ss index 007be21461..22b4ebbcfd 100644 --- a/collects/tests/web-server/util.ss +++ b/collects/tests/web-server/util.ss @@ -23,7 +23,7 @@ (match (regexp-match #"^.+\r\n\r\n(.+)$" bs) [(list _ s) (define sx (ssax:xml->sxml (open-input-bytes s) empty)) - (pretty-print sx) + #;(pretty-print sx) sx] [_ (error 'html "Given ~S~n" bs)])) @@ -107,7 +107,8 @@ (eval '(require 'm-id))) (lambda (s-expr) - (parameterize ([current-namespace ns]) + (parameterize ([current-namespace ns] + [current-output-port (open-output-nowhere)]) (eval s-expr))))] [else (raise-syntax-error #f "make-module-evel: dropped through" m-expr)])) @@ -121,5 +122,6 @@ (namespace-require 'mzlib/serialize) (namespace-require pth)) (lambda (expr) - (parameterize ([current-namespace ns]) + (parameterize ([current-namespace ns] + [current-output-port (open-output-nowhere)]) (eval expr)))))