branch: externals/websocket commit 0dd3175fa729ffc8d0d2e36a4eecd35720248e1b Author: Andrew Hyatt <ahy...@gmail.com> Commit: Andrew Hyatt <ahy...@gmail.com>
Fix tests to handle extra argument to websocket-encode-frame. --- websocket-test.el | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/websocket-test.el b/websocket-test.el index 3cc51f904c..e14134f9e1 100644 --- a/websocket-test.el +++ b/websocket-test.el @@ -282,38 +282,28 @@ (ert-deftest websocket-encode-frame () ;; We've tested websocket-read-frame, now we can use that to help ;; test websocket-encode-frame. - (let ((websocket-mask-frames nil)) - (should (equal + (should (equal websocket-test-hello (websocket-encode-frame - (make-websocket-frame :opcode 'text :payload "Hello" :completep t)))) - (dolist (len '(200 70000)) - (let ((long-string (make-string len ?x))) - (should (equal long-string - (websocket-frame-payload - (websocket-read-frame - (websocket-encode-frame - (make-websocket-frame :opcode 'text - :payload long-string))))))))) - (let ((websocket-mask-frames t)) - (flet ((websocket-genbytes (n) (substring websocket-test-masked-hello 2 6))) + (make-websocket-frame :opcode 'text :payload "Hello" :completep t) nil))) + (flet ((websocket-genbytes (n) (substring websocket-test-masked-hello 2 6))) (should (equal websocket-test-masked-hello (websocket-encode-frame (make-websocket-frame :opcode 'text :payload "Hello" - :completep t)))))) + :completep t) t)))) (should-not (websocket-frame-completep (websocket-read-frame (websocket-encode-frame (make-websocket-frame :opcode 'text :payload "Hello" - :completep nil))))) + :completep nil) t)))) (dolist (opcode '(close ping pong)) (should (equal opcode (websocket-frame-opcode (websocket-read-frame (websocket-encode-frame (make-websocket-frame :opcode opcode - :completep t)))))))) + :completep t) t))))))) (ert-deftest websocket-close () (let ((sent-frames) @@ -349,8 +339,8 @@ (open-callback-called) (websocket-frames (concat - (websocket-encode-frame frame1) - (websocket-encode-frame frame2)))) + (websocket-encode-frame frame1 t) + (websocket-encode-frame frame2 t)))) (flet ((websocket-process-frame (websocket frame) (lexical-let ((frame frame))