suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing drdr discovered problem

Browse Source
This commit is contained in:
Jay McCarthy 2011-04-13 07:31:29 -06:00
parent 9c19571ecd
commit 91d98aa0fa
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collects/tests/web-server/dispatchers/dispatch-files-test.rkt
View File

@ -39,12 +39,6 @@
(define dir-url (string->url "http://test.com/foo/"))
(define (req d? meth heads)
(make-request meth (if d? dir-url file-url) heads (delay empty) #"" "host" 80 "client"))
(define (bytes-sort bs)
(sort
(with-input-from-bytes bs
(λ () (port->bytes-lines #:line-mode 'return-linefeed)))
bytes<?))
(define-syntax-rule (test-equal?* n lhs rhs)
(test-equal? n (bytes-sort lhs) (bytes-sort rhs)))

42
collects/tests/web-server/http/xexpr.rkt
View File

@ -14,48 +14,58 @@
(output-response conn r)
(close-output-port o-port)
(define bs (port->bytes i-port))
(if redact? (redact bs) bs))
(bytes-sort (if redact? (redact bs) bs)))
(test
(write-response (response/xexpr '(a ([href "#"]) "link")))
=>
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>")
(write-response (response/xexpr '(a ([href "#"]) "link")
#:code 404))
#:code 404))
=>
#"HTTP/1.1 404 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 404 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>")
(write-response (response/xexpr '(a ([href "#"]) "link")
#:message #"Bad request"))
#:message #"Bad request"))
=>
#"HTTP/1.1 200 Bad request\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 200 Bad request\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>")
(regexp-replace
#"Date: [a-zA-Z0-9:, ]+ GMT\r\n"
(map
(λ (b) (regexp-replace
#"Date: [a-zA-Z0-9:, ]+ GMT"
b
#"Date: REDACTED GMT"))
(write-response (response/xexpr '(a ([href "#"]) "link")
#:seconds 0)
#f)
#"Date: REDACTED GMT\r\n")
#:seconds 0)
#f))
=>
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: Thu, 01 Jan 1970 00:00:00 GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: Thu, 01 Jan 1970 00:00:00 GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>")
(write-response (response/xexpr '(a ([href "#"]) "link")
#:mime-type #"application/xml"))
=>
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: application/xml\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: application/xml\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>")
(write-response (response/xexpr '(a ([href "#"]) "link")
#:headers (list (header #"head" #"value"))))
=>
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\nhead: value\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\nhead: value\r\n\r\n<a href=\"#\">link</a>")
(write-response (response/xexpr '(a ([href "#"]) "link")
#:cookies (list (make-cookie "head" "value"))))
=>
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\nSet-Cookie: head=value; Version=1\r\n\r\n<a href=\"#\">link</a>"
(bytes-sort
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\nSet-Cookie: head=value; Version=1\r\n\r\n<a href=\"#\">link</a>")
(write-response (response/xexpr '(a ([href "#"]) "link")
#:preamble #"<<!something XMLy>>"))
=>
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<<!something XMLy>><a href=\"#\">link</a>")
(bytes-sort
#"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<<!something XMLy>><a href=\"#\">link</a>"))

9
collects/tests/web-server/util.rkt
View File

@ -15,7 +15,14 @@
redact
collect
htxml
call)
call
bytes-sort)
(define (bytes-sort bs)
(sort
(with-input-from-bytes bs
(λ () (port->bytes-lines #:line-mode 'return-linefeed)))
bytes<?))
(define keyword->symbol (compose string->symbol keyword->string))
(define (simple-xpath/xexpr p x)