b378caee5b
Add WriteBufferPool to Dialer and Upgrader. This field specifies a pool to use for write operations on a connection. Use of the pool can reduce memory use when there is a modest write volume over a large number of connections. Use larger of hijacked buffer and buffer allocated for connection (if any) as buffer for building handshake response. This decreases possible allocations when building the handshake response. Modify bufio reuse test to call Upgrade instead of the internal newConnBRW. Move the test from conn_test.go to server_test.go because it's a serer test. Update newConn and newConnBRW: - Move the bufio "hacks" from newConnBRW to separate functions and call these functions directly from Upgrade. - Rename newConn to newTestConn and move to conn_test.go. Shorten argument list to common use case. - Rename newConnBRW to newConn. - Add pool code to newConn.
117 lines
2.0 KiB
Go
117 lines
2.0 KiB
Go
// Copyright 2013 The Gorilla WebSocket Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package websocket
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io"
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
func TestJSON(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
wc := newTestConn(nil, &buf, true)
|
|
rc := newTestConn(&buf, nil, false)
|
|
|
|
var actual, expect struct {
|
|
A int
|
|
B string
|
|
}
|
|
expect.A = 1
|
|
expect.B = "hello"
|
|
|
|
if err := wc.WriteJSON(&expect); err != nil {
|
|
t.Fatal("write", err)
|
|
}
|
|
|
|
if err := rc.ReadJSON(&actual); err != nil {
|
|
t.Fatal("read", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(&actual, &expect) {
|
|
t.Fatal("equal", actual, expect)
|
|
}
|
|
}
|
|
|
|
func TestPartialJSONRead(t *testing.T) {
|
|
var buf0, buf1 bytes.Buffer
|
|
wc := newTestConn(nil, &buf0, true)
|
|
rc := newTestConn(&buf0, &buf1, false)
|
|
|
|
var v struct {
|
|
A int
|
|
B string
|
|
}
|
|
v.A = 1
|
|
v.B = "hello"
|
|
|
|
messageCount := 0
|
|
|
|
// Partial JSON values.
|
|
|
|
data, err := json.Marshal(v)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for i := len(data) - 1; i >= 0; i-- {
|
|
if err := wc.WriteMessage(TextMessage, data[:i]); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
messageCount++
|
|
}
|
|
|
|
// Whitespace.
|
|
|
|
if err := wc.WriteMessage(TextMessage, []byte(" ")); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
messageCount++
|
|
|
|
// Close.
|
|
|
|
if err := wc.WriteMessage(CloseMessage, FormatCloseMessage(CloseNormalClosure, "")); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
for i := 0; i < messageCount; i++ {
|
|
err := rc.ReadJSON(&v)
|
|
if err != io.ErrUnexpectedEOF {
|
|
t.Error("read", i, err)
|
|
}
|
|
}
|
|
|
|
err = rc.ReadJSON(&v)
|
|
if _, ok := err.(*CloseError); !ok {
|
|
t.Error("final", err)
|
|
}
|
|
}
|
|
|
|
func TestDeprecatedJSON(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
wc := newTestConn(nil, &buf, true)
|
|
rc := newTestConn(&buf, nil, false)
|
|
|
|
var actual, expect struct {
|
|
A int
|
|
B string
|
|
}
|
|
expect.A = 1
|
|
expect.B = "hello"
|
|
|
|
if err := WriteJSON(wc, &expect); err != nil {
|
|
t.Fatal("write", err)
|
|
}
|
|
|
|
if err := ReadJSON(rc, &actual); err != nil {
|
|
t.Fatal("read", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(&actual, &expect) {
|
|
t.Fatal("equal", actual, expect)
|
|
}
|
|
}
|