From 9b066d0f0498075cc529dc4100a720d7a56569ac Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Sat, 27 Nov 2010 20:17:33 -0500 Subject: [PATCH] Correcting tests and examples --- .../tests/web-server/dispatchers/dispatch-files-test.rkt | 2 +- collects/tests/web-server/run-all-tests.rkt | 7 +++---- .../default-web-root/htdocs/servlets/examples/clear.rkt | 3 ++- .../default-web-root/htdocs/servlets/examples/count.rkt | 3 ++- .../default-web-root/htdocs/servlets/examples/hello.rkt | 1 + collects/web-server/formlets/servlet.rkt | 9 +++++---- collects/web-server/http.rkt | 8 +++++--- collects/web-server/http/response-structs.rkt | 2 +- collects/web-server/{ => http}/xexpr.rkt | 5 +++-- collects/web-server/servlet/setup.rkt | 2 +- 10 files changed, 24 insertions(+), 18 deletions(-) rename collects/web-server/{ => http}/xexpr.rkt (89%) diff --git a/collects/tests/web-server/dispatchers/dispatch-files-test.rkt b/collects/tests/web-server/dispatchers/dispatch-files-test.rkt index b42647180a..ba8172b09f 100644 --- a/collects/tests/web-server/dispatchers/dispatch-files-test.rkt +++ b/collects/tests/web-server/dispatchers/dispatch-files-test.rkt @@ -112,7 +112,7 @@ #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n") (test-equal? "dir, not dir-url, get" (collect (dispatch #t a-dir) (req #f #"GET" empty)) - #"HTTP/1.1 302 Moved Temporarily\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Length: 0\r\nContent-Type: text/html\r\nLocation: /foo/\r\n\r\n") + #"HTTP/1.1 302 Moved Temporarily\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nLocation: /foo/\r\n\r\n") (test-exn "dir, not exists, get" exn:dispatcher? (lambda () (collect (dispatch #f a-dir) (req #t #"GET" empty)))) diff --git a/collects/tests/web-server/run-all-tests.rkt b/collects/tests/web-server/run-all-tests.rkt index 6d1ab443aa..f8ef1e02e5 100644 --- a/collects/tests/web-server/run-all-tests.rkt +++ b/collects/tests/web-server/run-all-tests.rkt @@ -4,8 +4,7 @@ (require rackunit/text-ui) (run-tests all-web-server-tests) -#| -(require rackunit/gui) -(test/gui all-web-server-tests) -|# \ No newline at end of file +#;(require rackunit/gui) +#;(test/gui all-web-server-tests) + diff --git a/collects/web-server/default-web-root/htdocs/servlets/examples/clear.rkt b/collects/web-server/default-web-root/htdocs/servlets/examples/clear.rkt index 44c3bb155c..a75dc7f3d8 100644 --- a/collects/web-server/default-web-root/htdocs/servlets/examples/clear.rkt +++ b/collects/web-server/default-web-root/htdocs/servlets/examples/clear.rkt @@ -6,7 +6,8 @@ (define (start initial-request) (parameterize ([current-servlet-continuation-expiration-handler (lambda _ - `(html (body "Expired")))]) + (response/xexpr + `(html (body "Expired"))))]) (send/suspend (lambda (k-url) (response/xexpr `(html (a ([href ,k-url]) "Link"))))) (send/forward (lambda (k-url) (response/xexpr `(html (a ([href ,k-url]) "Link"))))) (send/finish (response/xexpr `(html (body "Done.")))))) diff --git a/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt b/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt index a29e8cdec8..7da5df717c 100644 --- a/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt +++ b/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt @@ -1,5 +1,6 @@ #lang racket/base -(require racket/date) +(require racket/date + web-server/http) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/htdocs/servlets/examples/hello.rkt b/collects/web-server/default-web-root/htdocs/servlets/examples/hello.rkt index 1cd57a9dbf..83ec2cd184 100644 --- a/collects/web-server/default-web-root/htdocs/servlets/examples/hello.rkt +++ b/collects/web-server/default-web-root/htdocs/servlets/examples/hello.rkt @@ -1,4 +1,5 @@ #lang racket/base +(require web-server/http) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/formlets/servlet.rkt b/collects/web-server/formlets/servlet.rkt index 3dc00ee3e4..a90c145ebf 100644 --- a/collects/web-server/formlets/servlet.rkt +++ b/collects/web-server/formlets/servlet.rkt @@ -5,7 +5,7 @@ (provide/contract [send/formlet ((formlet*/c) - (#:wrap (pretty-xexpr/c . -> . response?)) + (#:wrap (pretty-xexpr/c . -> . pretty-xexpr/c)) . ->* . any)]) (define (send/formlet f @@ -18,9 +18,10 @@ f (send/suspend (lambda (k-url) - (wrapper - `(form ([action ,k-url]) - ,@(formlet-display f))))))) + (response/xexpr + (wrapper + `(form ([action ,k-url]) + ,@(formlet-display f)))))))) (provide/contract [embed-formlet (embed/url/c formlet*/c . -> . pretty-xexpr/c)]) diff --git a/collects/web-server/http.rkt b/collects/web-server/http.rkt index 0efff25ee4..a4be2034b9 100644 --- a/collects/web-server/http.rkt +++ b/collects/web-server/http.rkt @@ -1,15 +1,17 @@ -#lang racket +#lang racket/base (require web-server/http/basic-auth web-server/http/digest-auth web-server/http/request-structs web-server/http/response-structs web-server/http/cookie web-server/http/cookie-parse - web-server/http/redirect) + web-server/http/redirect + web-server/http/xexpr) (provide (all-from-out web-server/http/basic-auth web-server/http/digest-auth web-server/http/request-structs web-server/http/response-structs web-server/http/cookie web-server/http/cookie-parse - web-server/http/redirect)) + web-server/http/redirect + web-server/http/xexpr)) diff --git a/collects/web-server/http/response-structs.rkt b/collects/web-server/http/response-structs.rkt index 43d6afffcd..49748c9db8 100644 --- a/collects/web-server/http/response-structs.rkt +++ b/collects/web-server/http/response-structs.rkt @@ -17,7 +17,7 @@ headers) (lambda (op) (for ([b (in-list body)]) - (write-bytes op))))) + (write-bytes b op))))) (provide/contract [struct response diff --git a/collects/web-server/xexpr.rkt b/collects/web-server/http/xexpr.rkt similarity index 89% rename from collects/web-server/xexpr.rkt rename to collects/web-server/http/xexpr.rkt index b72ca3dbfa..1cf763bf1d 100644 --- a/collects/web-server/xexpr.rkt +++ b/collects/web-server/http/xexpr.rkt @@ -2,9 +2,10 @@ (require racket/contract racket/list xml - web-server/http/cookie web-server/private/xexpr - web-server/http/response-structs) + "request-structs.rkt" + "cookie.rkt" + "response-structs.rkt") (define (response/xexpr xexpr diff --git a/collects/web-server/servlet/setup.rkt b/collects/web-server/servlet/setup.rkt index 32c7a697e6..767e53473e 100644 --- a/collects/web-server/servlet/setup.rkt +++ b/collects/web-server/servlet/setup.rkt @@ -176,7 +176,7 @@ [else (make-v1.servlet (directory-part a-path) timeouts-default-servlet (v0.response->v1.lambda - (contract response? s + (contract response? (response/xexpr s) pos-blame neg-blame path-string loc) a-path))])))))