martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-14 12:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding read timeout for unit test

Browse Source
This commit is contained in:
Roland Osborne 2022-01-22 20:37:14 -08:00
parent 3b7dfd5b7d
commit 807df99d9a
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/server/internal/ucAttachApp_test.go
View File

@ -68,6 +68,7 @@ func TestAttachAccount(t *testing.T) {
announce := Announce{ AppToken: profile.Guid + "." + access }
msg, _ := json.Marshal(&announce)
ws.WriteMessage(websocket.TextMessage, msg)
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, msg, _ = ws.ReadMessage()
var revision Revision
assert.NoError(t, json.Unmarshal(msg, &revision))
@ -94,6 +95,7 @@ func TestAttachAccount(t *testing.T) {
assert.Equal(t, "Namer", profile.Name)
// profile revision incremented
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, msg, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(msg, &revision))
assert.NotEqual(t, profileRevision, revision.Profile)

31
net/server/internal/ucConnectContact_test.go
View File

@ -1,6 +1,7 @@
package databag
import (
"time"
"testing"
"encoding/json"
"github.com/gorilla/websocket"
@ -13,7 +14,7 @@ func TestConnectContact(t *testing.T) {
var revision Revision
var msg DataMessage
var vars map[string]string
//var cardRevision int64
var cardRevision int64
var contactStatus ContactStatus
// create some contacts for this test
@ -30,6 +31,7 @@ func TestConnectContact(t *testing.T) {
announce := Announce{ AppToken: access[1] }
data, _ := json.Marshal(&announce)
ws.WriteMessage(websocket.TextMessage, data)
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(data, &revision))
//cardRevision = revision.Card
@ -41,10 +43,11 @@ func TestConnectContact(t *testing.T) {
assert.NoError(t, ReadResponse(w, &card))
// profile revision incremented
//_, data, _ = ws.ReadMessage()
//assert.NoError(t, json.Unmarshal(data, &revision))
//assert.NotEqual(t, cardRevision, revision.Card)
//cardRevision = revision.Card
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(data, &revision))
assert.NotEqual(t, cardRevision, revision.Card)
cardRevision = revision.Card
// update A status to connecting
r, w, _ = NewRequest("PUT", "/contact/cards/{cardId}/status", APP_CARDCONNECTING)
@ -55,10 +58,11 @@ func TestConnectContact(t *testing.T) {
assert.NoError(t, ReadResponse(w, &card))
// card revision incremented
//_, data, _ = ws.ReadMessage()
//assert.NoError(t, json.Unmarshal(data, &revision))
//assert.NotEqual(t, cardRevision, revision.Card)
//cardRevision = revision.Card
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(data, &revision))
assert.NotEqual(t, cardRevision, revision.Card)
cardRevision = revision.Card
// get open message to A
r, w, _ = NewRequest("GET", "/contact/cards/{cardId}/openMessage", nil)
@ -112,10 +116,11 @@ func TestConnectContact(t *testing.T) {
assert.Equal(t, APP_CARDCONNECTED, contactStatus.Status)
// card revision incremented
//_, data, _ = ws.ReadMessage()
//assert.NoError(t, json.Unmarshal(data, &revision))
//assert.NotEqual(t, cardRevision, revision.Card)
//cardRevision = revision.Card
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(data, &revision))
assert.NotEqual(t, cardRevision, revision.Card)
cardRevision = revision.Card
// update B status to connected
r, w, _ = NewRequest("PUT", "/contact/cards/{cardId}/status?token=" + contactStatus.Token, APP_CARDCONNECTED)

3
net/server/internal/ucProfileNotification_test.go
View File

@ -1,6 +1,7 @@
package databag
import (
"time"
"testing"
"encoding/json"
"github.com/gorilla/websocket"
@ -34,6 +35,7 @@ func TestProfileNotification(t *testing.T) {
ws.WriteMessage(websocket.TextMessage, data)
// receive revision
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(data, &revision))
cardRevision := revision.Card
@ -50,6 +52,7 @@ func TestProfileNotification(t *testing.T) {
assert.NoError(t, ReadResponse(w, nil))
// receive revision
ws.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = ws.ReadMessage()
assert.NoError(t, json.Unmarshal(data, &revision))
assert.NotEqual(t, cardRevision, revision.Card)