NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 13:46:44 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Refactor websocket model to reduce duplicated code.

Browse Source
This commit is contained in:
Patrick Fairbank
2018-08-31 22:40:08 -07:00
parent b49a86bdca
commit 27c38f7393
42 changed files with 1190 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/web_test.go
View File

@@ -5,11 +5,13 @@ package web
import (
"github.com/Team254/cheesy-arena/field"
"github.com/Team254/cheesy-arena/websocket"
"github.com/stretchr/testify/assert"
"net/http"
"net/http/httptest"
"strings"
"testing"
"time"
)
func TestIndex(t *testing.T) {
@@ -42,7 +44,7 @@ func (web *Web) startTestServer() (*httptest.Server, string) {
}
// Receives the next websocket message and asserts that it is an error.
func readWebsocketError(t *testing.T, ws *Websocket) string {
func readWebsocketError(t *testing.T, ws *websocket.Websocket) string {
messageType, data, err := ws.Read()
if assert.Nil(t, err) && assert.Equal(t, "error", messageType) {
return data.(string)
@@ -51,18 +53,18 @@ func readWebsocketError(t *testing.T, ws *Websocket) string {
}
// Receives the next websocket message and asserts that it is of the given type.
func readWebsocketType(t *testing.T, ws *Websocket, expectedMessageType string) interface{} {
messageType, message, err := ws.Read()
func readWebsocketType(t *testing.T, ws *websocket.Websocket, expectedMessageType string) interface{} {
messageType, message, err := ws.ReadWithTimeout(time.Second)
if assert.Nil(t, err) {
assert.Equal(t, expectedMessageType, messageType)
}
return message
}
func readWebsocketMultiple(t *testing.T, ws *Websocket, count int) map[string]interface{} {
func readWebsocketMultiple(t *testing.T, ws *websocket.Websocket, count int) map[string]interface{} {
messages := make(map[string]interface{})
for i := 0; i < count; i++ {
messageType, message, err := ws.Read()
messageType, message, err := ws.ReadWithTimeout(time.Second)
if assert.Nil(t, err) {
messages[messageType] = message
}