X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room_test.go;h=97c202b82f19d3321776752a5049063b1914ec4b;hp=d5bf41180549eb7485087faf19b12f6dd94f902e;hb=b7fb219307483d2c31b5dad1f559f325f2fd1a5e;hpb=5fcf63baf8ee1de09ed61f41c8ad19eb7f62be30 diff --git a/room_test.go b/room_test.go index d5bf411..97c202b 100644 --- a/room_test.go +++ b/room_test.go @@ -1,11 +1,10 @@ /* goircd -- minimalistic simple Internet Relay Chat (IRC) server -Copyright (C) 2014-2015 Sergey Matveev +Copyright (C) 2014-2020 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. +the Free Software Foundation, version 3 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -42,28 +41,35 @@ func notEnoughParams(t *testing.T, c *TestingConn) { } func TestTwoUsers(t *testing.T) { - logSink := make(chan LogEvent, 8) - stateSink := make(chan StateEvent, 8) + logSink = make(chan LogEvent, 8) + stateSink = make(chan StateEvent, 8) host := "foohost" - daemon := NewDaemon("ver1", &host, nil, nil, logSink, stateSink) + hostname = &host events := make(chan ClientEvent) - go daemon.Processor(events) + roomsLock.Lock() + rooms = make(map[string]*Room) + roomsLock.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(&host, conn1) - client2 := NewClient(&host, conn2) - go client1.Processor(events) - go client2.Processor(events) + client1 := NewClient(conn1, events) + NewClient(conn2, 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) + client1.SendLusers() if r := <-conn1.outbound; !strings.Contains(r, "There are 2 users") { t.Fatal("LUSERS", r) } @@ -105,29 +111,41 @@ 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 r := <-conn2.outbound; r != ":nick1!foo1@someclient PRIVMSG #foo :world\r\n" { - t.Fatal("second message", r) + if m2 == mNeeded { + m2 = <-conn2.outbound } - if r := <-conn2.outbound; r != ":nick1!foo1@someclient NOTICE #foo :world\r\n" { - t.Fatal("third message", r) + if m2 != ":nick1!foo1@someclient PRIVMSG #foo :world\r\n" { + t.Fatal("second message", m2) + } + 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) + logSink = make(chan LogEvent, 8) + stateSink = make(chan StateEvent, 8) host := "foohost" - daemon := NewDaemon("ver1", &host, nil, nil, logSink, stateSink) + hostname = &host events := make(chan ClientEvent) - go daemon.Processor(events) + rooms = make(map[string]*Room) + clients = make(map[*Client]struct{}) + finished := make(chan struct{}) + go Processor(events, finished) + defer func() { + events <- ClientEvent{eventType: EventTerm} + <-finished + }() conn := NewTestingConn() - client := NewClient(&host, conn) - go client.Processor(events) + NewClient(conn, 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 } @@ -160,12 +178,14 @@ func TestJoin(t *testing.T) { for i := 0; i < 4*2; i++ { <-conn.outbound } - if _, ok := daemon.rooms["#bar"]; !ok { + roomsLock.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") } + roomsLock.RUnlock() if r := <-logSink; (r.what != "joined") || (r.where != "#bar") || (r.who != "nick2") || (r.meta != true) { t.Fatal("invalid join log event #bar", r) } @@ -177,12 +197,14 @@ func TestJoin(t *testing.T) { for i := 0; i < 4*2; i++ { <-conn.outbound } - if daemon.rooms["#barenc"].key != "key1" { + roomsLock.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") } + roomsLock.RUnlock() if r := <-logSink; (r.what != "joined") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { t.Fatal("invalid join log event #barenc", r) } @@ -200,9 +222,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 != "" { + roomsLock.RLock() + if rooms["#barenc"].key != "" { t.Fatal("removing key from #barenc") } + roomsLock.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) } @@ -211,6 +235,9 @@ func TestJoin(t *testing.T) { } conn.inbound <- "PART #bazenc\r\nMODE #bazenc -k" + if r := <-conn.outbound; r != ":nick2!foo2@someclient PART #bazenc :nick2\r\n" { + t.Fatal("part", r) + } if r := <-conn.outbound; r != ":foohost 442 #bazenc :You are not on that channel\r\n" { t.Fatal("not on that channel", r) } @@ -227,7 +254,7 @@ func TestJoin(t *testing.T) { if r := <-conn.outbound; r != ":nick2!foo2@someclient MODE #barenc +k newkey\r\n" { t.Fatal("+k MODE setting", r) } - if r := <-logSink; (r.what != "set channel key to newkey") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { + if r := <-logSink; (r.what != "set channel key") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { t.Fatal("set channel key", r) } if r := <-stateSink; (r.topic != "") || (r.where != "#barenc") || (r.key != "newkey") { @@ -252,5 +279,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) } - }