diff options
Diffstat (limited to 'test-suite/tests')
-rw-r--r-- | test-suite/tests/web-request.test | 7 | ||||
-rw-r--r-- | test-suite/tests/web-response.test | 13 |
2 files changed, 10 insertions, 10 deletions
diff --git a/test-suite/tests/web-request.test b/test-suite/tests/web-request.test index 32b99dd99..e1eec2f74 100644 --- a/test-suite/tests/web-request.test +++ b/test-suite/tests/web-request.test @@ -51,11 +51,8 @@ Accept-Language: en-gb, en;q=0.9\r (pass-if (equal? (request-uri r) (build-uri 'http #:path "/qux"))) - (pass-if (equal? (read-request-body/latin-1 r) #f)) - ;; Since it's #f, should be an idempotent read, so we can try - ;; bytevectors too - (pass-if (equal? (read-request-body/bytevector r) #f)) - + (pass-if (equal? (read-request-body r) #f)) + (pass-if "checking all headers" (equal? (request-headers r) diff --git a/test-suite/tests/web-response.test b/test-suite/tests/web-response.test index 7e7331ea7..a21a70207 100644 --- a/test-suite/tests/web-response.test +++ b/test-suite/tests/web-response.test @@ -20,6 +20,7 @@ (define-module (test-suite web-response) #:use-module (web uri) #:use-module (web response) + #:use-module (rnrs bytevectors) #:use-module (srfi srfi-19) #:use-module (test-suite lib)) @@ -53,9 +54,9 @@ abcdefghijklmnopqrstuvwxyz0123456789") (set! r (read-response (open-input-string example-1))) (response? r))) - (pass-if "read-response-body/latin-1" + (pass-if "read-response-body" (begin - (set! body (read-response-body/latin-1 r)) + (set! body (read-response-body r)) #t)) (pass-if (equal? (response-version r) '(1 . 1))) @@ -64,7 +65,9 @@ abcdefghijklmnopqrstuvwxyz0123456789") (pass-if (equal? (response-reason-phrase r) "OK")) - (pass-if (equal? body "abcdefghijklmnopqrstuvwxyz0123456789")) + (pass-if (equal? body + (string->utf8 + "abcdefghijklmnopqrstuvwxyz0123456789"))) (pass-if "checking all headers" (equal? @@ -88,10 +91,10 @@ abcdefghijklmnopqrstuvwxyz0123456789") (with-output-to-string (lambda () (let ((r (write-response r (current-output-port)))) - (write-response-body/latin-1 r body)))) + (write-response-body r body)))) (lambda () (let ((r (read-response (current-input-port)))) - (values r (read-response-body/latin-1 r)))))) + (values r (read-response-body r)))))) (lambda (r* body*) (responses-equal? r body r* body*)))) |