X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room_test.go;h=8618fb9a3228509666a86d3058a65e427e224793;hp=9bfbc2380784a9addbb9fe7b00a60ee129c0dca7;hb=9f6cca6c56d12478afb026ca4bd4ec3a688d6c9b;hpb=cfeaaad88f71bf1b0846251b7f448bf41bde26d9 diff --git a/room_test.go b/room_test.go index 9bfbc23..8618fb9 100644 --- a/room_test.go +++ b/room_test.go @@ -1,3 +1,21 @@ +/* +goircd -- minimalistic simple Internet Relay Chat (IRC) server +Copyright (C) 2014-2016 Sergey Matveev + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + package main import ( @@ -24,27 +42,38 @@ func notEnoughParams(t *testing.T, c *TestingConn) { } func TestTwoUsers(t *testing.T) { - logSink := make(chan LogEvent, 8) - stateSink := make(chan StateEvent, 8) - daemon := NewDaemon("foohost", "", logSink, stateSink) + logSink = make(chan LogEvent, 8) + stateSink = make(chan StateEvent, 8) + host := "foohost" + hostname = &host events := make(chan ClientEvent) - go daemon.Processor(events) + roomsM.Lock() + rooms = make(map[string]*Room) + roomSinks = make(map[*Room]chan ClientEvent) + roomsM.Unlock() + clients = make(map[*Client]struct{}) + finished := make(chan struct{}) + go Processor(events, finished) + defer func() { + events <- ClientEvent{eventType: EventTerm} + <-finished + }() conn1 := NewTestingConn() conn2 := NewTestingConn() - client1 := NewClient("foohost", conn1) - client2 := NewClient("foohost", conn2) + client1 := NewClient(conn1) + client2 := NewClient(conn2) go client1.Processor(events) go client2.Processor(events) - conn1.inbound <- "NICK nick1\r\nUSER foo1 bar1 baz1 :Long name1\r\n" - conn2.inbound <- "NICK nick2\r\nUSER foo2 bar2 baz2 :Long name2\r\n" + conn1.inbound <- "NICK nick1\r\nUSER foo1 bar1 baz1 :Long name1" + conn2.inbound <- "NICK nick2\r\nUSER foo2 bar2 baz2 :Long name2" for i := 0; i < 6; i++ { <-conn1.outbound <-conn2.outbound } - daemon.SendLusers(client1) + SendLusers(client1) if r := <-conn1.outbound; !strings.Contains(r, "There are 2 users") { t.Fatal("LUSERS", r) } @@ -86,28 +115,43 @@ func TestTwoUsers(t *testing.T) { conn1.inbound <- "PRIVMSG nick2 :Hello" conn1.inbound <- "PRIVMSG #foo :world" conn1.inbound <- "NOTICE #foo :world" - if r := <-conn2.outbound; r != ":nick1!foo1@someclient PRIVMSG nick2 :Hello\r\n" { - t.Fatal("first message", r) + m1 := <-conn2.outbound + m2 := <-conn2.outbound + mNeeded := ":nick1!foo1@someclient PRIVMSG nick2 :Hello\r\n" + if !(m1 == mNeeded || m2 == mNeeded) { + t.Fatal("first message", m1, m2) + } + if m2 == mNeeded { + m2 = <-conn2.outbound } - if r := <-conn2.outbound; r != ":nick1!foo1@someclient PRIVMSG #foo :world\r\n" { - t.Fatal("second message", r) + if m2 != ":nick1!foo1@someclient PRIVMSG #foo :world\r\n" { + t.Fatal("second message", m2) } - if r := <-conn2.outbound; r != ":nick1!foo1@someclient NOTICE #foo :world\r\n" { - t.Fatal("third message", r) + if m2 = <-conn2.outbound; m2 != ":nick1!foo1@someclient NOTICE #foo :world\r\n" { + t.Fatal("third message", m2) } } func TestJoin(t *testing.T) { - logSink := make(chan LogEvent, 8) - stateSink := make(chan StateEvent, 8) - daemon := NewDaemon("foohost", "", logSink, stateSink) + logSink = make(chan LogEvent, 8) + stateSink = make(chan StateEvent, 8) + host := "foohost" + hostname = &host events := make(chan ClientEvent) - go daemon.Processor(events) + rooms = make(map[string]*Room) + clients = make(map[*Client]struct{}) + roomSinks = make(map[*Room]chan ClientEvent) + finished := make(chan struct{}) + go Processor(events, finished) + defer func() { + events <- ClientEvent{eventType: EventTerm} + <-finished + }() conn := NewTestingConn() - client := NewClient("foohost", conn) + client := NewClient(conn) go client.Processor(events) - conn.inbound <- "NICK nick2\r\nUSER foo2 bar2 baz2 :Long name2\r\n" + conn.inbound <- "NICK nick2\r\nUSER foo2 bar2 baz2 :Long name2" for i := 0; i < 6; i++ { <-conn.outbound } @@ -140,12 +184,14 @@ func TestJoin(t *testing.T) { for i := 0; i < 4*2; i++ { <-conn.outbound } - if _, ok := daemon.rooms["#bar"]; !ok { + roomsM.RLock() + if _, ok := rooms["#bar"]; !ok { t.Fatal("#bar does not exist") } - if _, ok := daemon.rooms["#baz"]; !ok { + if _, ok := rooms["#baz"]; !ok { t.Fatal("#baz does not exist") } + roomsM.RUnlock() if r := <-logSink; (r.what != "joined") || (r.where != "#bar") || (r.who != "nick2") || (r.meta != true) { t.Fatal("invalid join log event #bar", r) } @@ -157,12 +203,14 @@ func TestJoin(t *testing.T) { for i := 0; i < 4*2; i++ { <-conn.outbound } - if daemon.rooms["#barenc"].key != "key1" { + roomsM.RLock() + if *rooms["#barenc"].key != "key1" { t.Fatal("no room with key1") } - if daemon.rooms["#bazenc"].key != "key2" { + if *rooms["#bazenc"].key != "key2" { t.Fatal("no room with key2") } + roomsM.RUnlock() if r := <-logSink; (r.what != "joined") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { t.Fatal("invalid join log event #barenc", r) } @@ -180,9 +228,11 @@ func TestJoin(t *testing.T) { if r := <-conn.outbound; r != ":nick2!foo2@someclient MODE #barenc -k\r\n" { t.Fatal("remove #barenc key", r) } - if daemon.rooms["#barenc"].key != "" { + roomsM.RLock() + if *rooms["#barenc"].key != "" { t.Fatal("removing key from #barenc") } + roomsM.RUnlock() if r := <-logSink; (r.what != "removed channel key") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { t.Fatal("removed channel key log", r) } @@ -198,8 +248,8 @@ func TestJoin(t *testing.T) { t.Fatal("left #bazenc log", r) } - conn.inbound <- "MODE #barenc +b" - if r := <-conn.outbound; r != ":foohost 472 nick2 +b :Unknown MODE flag\r\n" { + conn.inbound <- "MODE #barenc +i" + if r := <-conn.outbound; r != ":foohost 472 nick2 +i :Unknown MODE flag\r\n" { t.Fatal("unknown MODE flag", r) } @@ -232,5 +282,4 @@ func TestJoin(t *testing.T) { if r := <-conn.outbound; r != ":foohost 315 nick2 #barenc :End of /WHO list\r\n" { t.Fatal("end of WHO", r) } - }