OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-26 13:48:53 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Add mutex to WebSocket service mock (#294)

Browse Source
This commit is contained in:
Aleksandar Novaković 2018-05-21 23:12:21 +02:00 committed by Dejan Mijić
parent c5a40aeffa
commit 64e71edf95
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ws/api/transport_test.go
View File

@ -60,8 +60,7 @@ func handshake(tsURL string, chanID uint64, token string, addHeader bool) (*webs
header.Add("Authorization", token)
}
url := makeURL(tsURL, chanID, token, addHeader)
conn, resp, err := websocket.DefaultDialer.Dial(url, header)
return conn, resp, err
return websocket.DefaultDialer.Dial(url, header)
}
func TestHandshake(t *testing.T) {

13
ws/mocks/messages.go
View File

@ -1,6 +1,8 @@
package mocks
import (
"sync"
"github.com/mainflux/mainflux"
"github.com/mainflux/mainflux/ws"
)
@ -10,25 +12,30 @@ var _ ws.Service = (*mockService)(nil)
type mockService struct {
subscriptions map[uint64]ws.Channel
pubError error
mutex sync.Mutex
}
// NewService returns mock message publisher.
func NewService(subs map[uint64]ws.Channel, pubError error) ws.Service {
return mockService{subs, pubError}
return &mockService{subs, pubError, sync.Mutex{}}
}
func (svc mockService) Publish(msg mainflux.RawMessage) error {
func (svc *mockService) Publish(msg mainflux.RawMessage) error {
if len(msg.Payload) == 0 {
return svc.pubError
}
svc.mutex.Lock()
svc.subscriptions[msg.Channel].Messages <- msg
svc.mutex.Unlock()
return nil
}
func (svc mockService) Subscribe(chanID uint64, channel ws.Channel) error {
func (svc *mockService) Subscribe(chanID uint64, channel ws.Channel) error {
if _, ok := svc.subscriptions[chanID]; !ok {
return ws.ErrFailedSubscription
}
svc.mutex.Lock()
svc.subscriptions[chanID] = channel
svc.mutex.Unlock()
return nil
}