third-party-mirrors/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-04-14 16:17:17 +03:00
Code Issues Projects Releases Wiki Activity

progress: chat tests pass

Browse Source
This commit is contained in:
Andrey Petrov 2016-09-13 18:38:30 -04:00
parent 50022e9e44
commit 0aaaa6a1fb
2 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chat/room.go
View File

@ -91,9 +91,8 @@ func (r *Room) HandleMsg(m message.Message) {
r.Members.Each(func(k string, item set.Item) (err error) {
roomMember := item.Value().(*roomMember)
user := roomMember.Member
from := fromMsg.From().(Member)
if fromMsg != nil && roomMember.Ignored.In(from.ID()) {
if fromMsg != nil && fromMsg.From() != nil && roomMember.Ignored.In(fromMsg.From().(Member).ID()) {
// Skip because ignored
return
}

62
chat/room_test.go
View File

@ -7,23 +7,17 @@ import (
"github.com/shazow/ssh-chat/chat/message"
)
// Used for testing
type MockScreen struct {
buffer []byte
type ChannelWriter struct {
Chan chan []byte
}
func (s *MockScreen) Write(data []byte) (n int, err error) {
s.buffer = append(s.buffer, data...)
func (w *ChannelWriter) Write(data []byte) (n int, err error) {
w.Chan <- data
return len(data), nil
}
func (s *MockScreen) Read(p *[]byte) (n int, err error) {
*p = s.buffer
s.buffer = []byte{}
return len(*p), nil
}
func (s *MockScreen) Close() error {
func (w *ChannelWriter) Close() error {
close(w.Chan)
return nil
}
@ -40,11 +34,6 @@ func TestRoomServe(t *testing.T) {
}
}
type ScreenedUser struct {
*message.User
screen *MockScreen
}
/*
func TestIgnore(t *testing.T) {
var buffer []byte
@ -161,7 +150,9 @@ func expectOutput(t *testing.T, buffer []byte, expected string) {
func TestRoomJoin(t *testing.T) {
var expected, actual []byte
s := &MockScreen{}
s := &ChannelWriter{
Chan: make(chan []byte),
}
u := message.PipedScreen("foo", s)
ch := NewRoom()
@ -174,21 +165,21 @@ func TestRoomJoin(t *testing.T) {
}
expected = []byte(" * foo joined. (Connected: 1)" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
ch.Send(message.NewSystemMsg("hello", u))
expected = []byte("-> hello" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
ch.Send(message.ParseInput("/me says hello.", u))
expected = []byte("** foo says hello." + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
@ -250,15 +241,12 @@ func TestRoomQuietToggleBroadcasts(t *testing.T) {
t.Fatal(err)
}
// Drain the initial Join message
<-ch.broadcast
u.SetConfig(message.UserConfig{
Quiet: false,
})
expectedMsg := message.NewAnnounceMsg("Ignored")
ch.HandleMsg(expectedMsg)
go ch.HandleMsg(expectedMsg)
msg := <-msgs
if _, ok := msg.(*message.AnnounceMsg); !ok {
t.Errorf("Got: `%T`; Expected: `%T`", msg, expectedMsg)
@ -268,8 +256,10 @@ func TestRoomQuietToggleBroadcasts(t *testing.T) {
Quiet: true,
})
ch.HandleMsg(message.NewAnnounceMsg("Ignored"))
ch.HandleMsg(message.NewSystemMsg("hello", u))
go func() {
ch.HandleMsg(message.NewAnnounceMsg("Ignored"))
ch.HandleMsg(message.NewSystemMsg("hello", u))
}()
msg = <-msgs
if _, ok := msg.(*message.AnnounceMsg); ok {
t.Errorf("Got unexpected `%T`", msg)
@ -279,7 +269,9 @@ func TestRoomQuietToggleBroadcasts(t *testing.T) {
func TestQuietToggleDisplayState(t *testing.T) {
var expected, actual []byte
s := &MockScreen{}
s := &ChannelWriter{
Chan: make(chan []byte),
}
u := message.PipedScreen("foo", s)
ch := NewRoom()
@ -292,7 +284,7 @@ func TestQuietToggleDisplayState(t *testing.T) {
}
expected = []byte(" * foo joined. (Connected: 1)" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
@ -300,7 +292,7 @@ func TestQuietToggleDisplayState(t *testing.T) {
ch.Send(message.ParseInput("/quiet", u))
expected = []byte("-> Quiet mode is toggled ON" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
@ -308,7 +300,7 @@ func TestQuietToggleDisplayState(t *testing.T) {
ch.Send(message.ParseInput("/quiet", u))
expected = []byte("-> Quiet mode is toggled OFF" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
@ -317,7 +309,9 @@ func TestQuietToggleDisplayState(t *testing.T) {
func TestRoomNames(t *testing.T) {
var expected, actual []byte
s := &MockScreen{}
s := &ChannelWriter{
Chan: make(chan []byte),
}
u := message.PipedScreen("foo", s)
ch := NewRoom()
@ -330,7 +324,7 @@ func TestRoomNames(t *testing.T) {
}
expected = []byte(" * foo joined. (Connected: 1)" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}
@ -338,7 +332,7 @@ func TestRoomNames(t *testing.T) {
ch.Send(message.ParseInput("/names", u))
expected = []byte("-> 1 connected: foo" + message.Newline)
s.Read(&actual)
actual = <-s.Chan
if !reflect.DeepEqual(actual, expected) {
t.Errorf("Got: %q; Expected: %q", actual, expected)
}