more base64-related changes

svn: r11470

original commit: 20e9673028
This commit is contained in:
Eli Barzilay 2008-08-28 21:00:53 +00:00
parent 9b6503df48
commit 8b65f4ac26

View File

@ -657,19 +657,23 @@
(list (make-bytes 200 32) (list (make-bytes 200 32)
(make-bytes 200 9) (make-bytes 200 9)
(make-bytes 200 (char->integer #\x)) (make-bytes 200 (char->integer #\x))
(make-bytes 201 (char->integer #\x))
(make-bytes 202 (char->integer #\x))
(make-bytes 203 (char->integer #\x))
(make-bytes 204 (char->integer #\x))
(list->bytes (list->bytes
(let loop ([i 0]) (let loop ([i 0])
(if (= i 256) (if (= i 256)
null null
(cons i (loop (add1 i)))))) (cons i (loop (add1 i))))))
;; Something that doesn't end with a LF: ;; Something that doesn't end with a LF:
(bytes-append (bytes-append (with-input-from-file (build-path dir "net.ss")
(with-input-from-file (build-path dir "net.ss") (lambda () (read-bytes 500))) (lambda () (read-bytes 500)))
#"xxx") #"xxx")
;; CRLF: ;; CRLF:
(regexp-replace (regexp-replace #rx#"\r?\n"
#rx#"\n" (with-input-from-file (build-path dir "net.ss")
(with-input-from-file (build-path dir "net.ss") (lambda () (read-bytes 500))) (lambda () (read-bytes 500)))
#"\r\n")))) #"\r\n"))))
(define (check-same encode decode port line-rx max-w) (define (check-same encode decode port line-rx max-w)
@ -685,8 +689,7 @@
(unless (<= (bytes-length l) max-w) (unless (<= (bytes-length l) max-w)
(test encode "line too long" l)) (test encode "line too long" l))
(let ([m (regexp-match-positions line-rx l)]) (let ([m (regexp-match-positions line-rx l)])
(unless (and m (unless (and m (= (bytes-length l) (cdar m)))
(= (bytes-length l) (cdar m)))
(test encode 'bad-line l))) (test encode 'bad-line l)))
(loop)))) (loop))))
(let ([q (open-output-bytes)]) (let ([q (open-output-bytes)])
@ -697,12 +700,11 @@
(with-output-to-file "/tmp/x2" (lambda () (display bytes)) 'truncate) (with-output-to-file "/tmp/x2" (lambda () (display bytes)) 'truncate)
(error 'decode "failed"))))))) (error 'decode "failed")))))))
(define (check-same-file encode decode file line-rx max-w) (define ((check-same-file encode decode line-rx max-w) file)
;; This "test" is really just a progress report: ;; This "test" is really just a progress report:
(test #t list? (list file encode)) (test #t list? (list file encode))
(call-with-input-file file (call-with-input-file file
(lambda (p) (lambda (p) (check-same encode decode p line-rx max-w))))
(check-same encode decode p line-rx max-w))))
(define (check-same-all encode decode line-rx max-w) (define (check-same-all encode decode line-rx max-w)
(for-each (lambda (tricky-string) (for-each (lambda (tricky-string)
@ -710,15 +712,18 @@
(open-input-bytes tricky-string) (open-input-bytes tricky-string)
line-rx max-w)) line-rx max-w))
tricky-strings) tricky-strings)
(parameterize ([current-pseudo-random-generator (make-pseudo-random-generator)]) (let* ([dir (collection-path "tests" "mzscheme")]
(random-seed 17) [files (filter-map (lambda (f)
(let ([dir (collection-path "tests" "mzscheme")]) ;; check 1/3 of the files, randomly
(for-each (lambda (p) (let ([p (build-path dir f)])
(when (regexp-match #rx"[.]ss$" (path->string p)) (and (zero? (random 3))
(unless (or (positive? (random 10)) ; check random 1/10 of files (not (regexp-match
(equal? (path->string p) "flat.ss")) #rx"^flat.*\\.ss$"
(check-same-file encode decode (build-path dir p) line-rx max-w)))) (path-element->string f)))
(directory-list dir))))) (file-exists? p)
p)))
(directory-list dir))])
(for-each (check-same-file encode decode line-rx max-w) files)))
(check-same-all (lambda (i o) (qp-encode-stream i o)) (check-same-all (lambda (i o) (qp-encode-stream i o))
qp-decode-stream qp-decode-stream
@ -730,4 +735,32 @@
#rx#"^[0-9a-zA-Z+=/]*$" #rx#"^[0-9a-zA-Z+=/]*$"
72) 72)
#|
Use this to compare base64 encode/decode against the unix utilities
(require net/base64 scheme/system)
(define (base64-encode* bstr)
(let ([o (open-output-bytes)])
(parameterize ([current-output-port o]
[current-input-port (open-input-bytes bstr)])
(system "base64-encode"))
(let* ([o (get-output-bytes o)]
[o (regexp-replace #rx#"(.)(?:\r?\n)?$" o #"\\1\r\n")]
[o (regexp-replace* #rx#"\r?\n" o #"\r\n")])
o)))
(define (base64-decode* bstr)
(let ([o (open-output-bytes)])
(parameterize ([current-output-port o]
[current-input-port (open-input-bytes bstr)])
(system "base64-decode"))
(get-output-bytes o)))
(define (check-base64-encode bstr)
(equal? (base64-encode bstr) (base64-encode* bstr)))
(define (check-base64-decode bstr)
(equal? (base64-decode bstr) (base64-decode* bstr)))
(define (check-base64-both bstr)
(let ([en (base64-encode bstr)])
(and (equal? en (base64-encode* bstr))
(equal? (base64-decode en) (base64-decode* en)))))
|#
(report-errs) (report-errs)