From: Sergey Matveev Date: Sun, 18 May 2014 11:27:17 +0000 (+0400) Subject: Additional unittests X-Git-Tag: 1.0~22 X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=commitdiff_plain;h=59a6cddf54c13b63990d2c1bdc708d6b9ddb5b5f Additional unittests --- diff --git a/TODO b/TODO deleted file mode 100644 index b9f7192..0000000 --- a/TODO +++ /dev/null @@ -1 +0,0 @@ -* Cover all available commands with unittests diff --git a/client_test.go b/client_test.go index 86bd35c..22cc401 100644 --- a/client_test.go +++ b/client_test.go @@ -68,7 +68,6 @@ func (conn *TestingConn) Write(b []byte) (n int, err error) { func (conn *TestingConn) Close() error { conn.closed = true - //conn.incoming <- "" return nil } @@ -102,22 +101,26 @@ func TestNewClient(t *testing.T) { event := <-sink if event.event_type != EVENT_NEW { - t.Fatal("no NEW event") + t.Fatal("no NEW event", event) } conn.inbound <- "foo" event = <-sink + ts1 := client.timestamp if (event.event_type != EVENT_MSG) || (event.text != "foo") { - t.Fatal("no first MSG") + t.Fatal("no first MSG", event) } conn.inbound <- "bar" event = <-sink if (event.event_type != EVENT_MSG) || (event.text != "bar") { - t.Fatal("no second MSG") + t.Fatal("no second MSG", event) } conn.inbound <- "" + if client.timestamp.Before(ts1) || client.timestamp.Equal(ts1) { + t.Fatal("timestamp updating") + } event = <-sink if event.event_type != EVENT_DEL { - t.Fatal("no client termination") + t.Fatal("no client termination", event) } } @@ -129,21 +132,21 @@ func TestClientReplies(t *testing.T) { client.Reply("hello") if r := <-conn.outbound; r != ":foohost hello\r\n" { - t.Fatal("did not recieve hello message") + t.Fatal("did not recieve hello message", r) } client.ReplyParts("200", "foo", "bar") if r := <-conn.outbound; r != ":foohost 200 foo :bar\r\n" { - t.Fatal("did not recieve 200 message") + t.Fatal("did not recieve 200 message", r) } client.ReplyNicknamed("200", "foo", "bar") if r := <-conn.outbound; r != ":foohost 200 мойник foo :bar\r\n" { - t.Fatal("did not recieve nicknamed message") + t.Fatal("did not recieve nicknamed message", r) } client.ReplyNotEnoughParameters("CMD") if r := <-conn.outbound; r != ":foohost 461 мойник CMD :Not enough parameters\r\n" { - t.Fatal("did not recieve 461 message") + t.Fatal("did not recieve 461 message", r) } } diff --git a/daemon_test.go b/daemon_test.go index a0c21a0..1c86f35 100644 --- a/daemon_test.go +++ b/daemon_test.go @@ -36,10 +36,17 @@ func TestRegistrationWorkflow(t *testing.T) { conn.inbound <- "NICK" if r := <-conn.outbound; r != ":foohost 431 :No nickname given\r\n" { - t.Fatal("431 for NICK") + t.Fatal("431 for NICK", r) } - conn.inbound <- "NICK meinick\r\nUSER\r\n" + for _, n := range []string{"привет", " foo", "longlonglong", "#foo", "mein nick", "foo_bar"} { + conn.inbound <- "NICK " + n + if r := <-conn.outbound; r != ":foohost 432 * "+n+" :Erroneous nickname\r\n" { + t.Fatal("nickname validation", r) + } + } + + conn.inbound <- "NICK meinick\r\nUSER" if r := <-conn.outbound; r != ":foohost 461 meinick USER :Not enough parameters\r\n" { t.Fatal("461 for USER", r) } @@ -47,51 +54,56 @@ func TestRegistrationWorkflow(t *testing.T) { t.Fatal("NICK saved") } - conn.inbound <- "USER 1 2 3\r\n" + conn.inbound <- "USER 1 2 3" if r := <-conn.outbound; r != ":foohost 461 meinick USER :Not enough parameters\r\n" { - t.Fatal("461 again for USER") + t.Fatal("461 again for USER", r) } daemon.SendLusers(client) if r := <-conn.outbound; !strings.Contains(r, "There are 0 users") { - t.Fatal("LUSERS") + t.Fatal("LUSERS", r) } - conn.inbound <- "USER 1 2 3 :4 5\r\n" + conn.inbound <- "USER 1 2 3 :4 5" if r := <-conn.outbound; !strings.Contains(r, ":foohost 001") { - t.Fatal("001 after registration") + t.Fatal("001 after registration", r) } if r := <-conn.outbound; !strings.Contains(r, ":foohost 002") { - t.Fatal("002 after registration") + t.Fatal("002 after registration", r) } if r := <-conn.outbound; !strings.Contains(r, ":foohost 003") { - t.Fatal("003 after registration") + t.Fatal("003 after registration", r) } if r := <-conn.outbound; !strings.Contains(r, ":foohost 004") { - t.Fatal("004 after registration") + t.Fatal("004 after registration", r) } if r := <-conn.outbound; !strings.Contains(r, ":foohost 251") { - t.Fatal("251 after registration") + t.Fatal("251 after registration", r) } if r := <-conn.outbound; !strings.Contains(r, ":foohost 422") { - t.Fatal("422 after registration") + t.Fatal("422 after registration", r) } if (client.username != "1") || (client.realname != "4 5") || !client.registered { t.Fatal("client register") } - conn.inbound <- "AWAY\r\n" - conn.inbound <- "UNEXISTENT CMD\r\n" + conn.inbound <- "AWAY" + conn.inbound <- "UNEXISTENT CMD" if r := <-conn.outbound; r != ":foohost 421 meinick UNEXISTENT :Unknown command\r\n" { - t.Fatal("reply for unexistent command") + t.Fatal("reply for unexistent command", r) } daemon.SendLusers(client) if r := <-conn.outbound; !strings.Contains(r, "There are 1 users") { - t.Fatal("1 users logged in") + t.Fatal("1 users logged in", r) + } + + conn.inbound <- "PING thishost" + if r := <-conn.outbound; r != ":foohost PONG foohost :thishost\r\n" { + t.Fatal("PONG", r) } - conn.inbound <- "QUIT\r\nUNEXISTENT CMD\r\n" + conn.inbound <- "QUIT\r\nUNEXISTENT CMD" <-conn.outbound if !conn.closed { t.Fatal("closed connection on QUIT") @@ -112,10 +124,10 @@ func TestMotd(t *testing.T) { daemon.SendMotd(client) if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 375") { - t.Fatal("MOTD start") + t.Fatal("MOTD start", r) } if r := <-conn.outbound; !strings.Contains(r, "372 * :- catched\r\n") { - t.Fatal("MOTD contents") + t.Fatal("MOTD contents", r) } if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 376") { t.Fatal("MOTD end", r) diff --git a/room_test.go b/room_test.go new file mode 100644 index 0000000..fc6c94a --- /dev/null +++ b/room_test.go @@ -0,0 +1,236 @@ +package main + +import ( + "strings" + "testing" +) + +func no_nickchan(t *testing.T, c *TestingConn) { + if r := <-c.outbound; !strings.HasPrefix(r, ":foohost 401") { + t.Fatal("no nick/channel", r) + } +} + +func no_chan(t *testing.T, c *TestingConn) { + if r := <-c.outbound; !strings.HasPrefix(r, ":foohost 403") { + t.Fatal("no channel", r) + } +} + +func not_enough_params(t *testing.T, c *TestingConn) { + if r := <-c.outbound; !strings.HasPrefix(r, ":foohost 461") { + t.Fatal("not enough params", r) + } +} + +func TestTwoUsers(t *testing.T) { + log_sink := make(chan LogEvent, 8) + state_sink := make(chan StateEvent, 8) + daemon := NewDaemon("foohost", "", log_sink, state_sink) + events := make(chan ClientEvent) + go daemon.Processor(events) + + conn1 := NewTestingConn() + conn2 := NewTestingConn() + client1 := NewClient("foohost", conn1) + client2 := NewClient("foohost", 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" + for i := 0; i < 6; i++ { + <-conn1.outbound + <-conn2.outbound + } + + daemon.SendLusers(client1) + if r := <-conn1.outbound; !strings.Contains(r, "There are 2 users") { + t.Fatal("LUSERS", r) + } + + conn1.inbound <- "WHOIS" + not_enough_params(t, conn1) + conn1.inbound <- "WHOIS nick3" + no_nickchan(t, conn1) + conn1.inbound <- "WHOIS nick2" + if r := <-conn1.outbound; r != ":foohost 311 nick1 nick2 foo2 someclient * :Long name2\r\n" { + t.Fatal("first WHOIS 311", r) + } + if r := <-conn1.outbound; r != ":foohost 312 nick1 nick2 foohost :foohost\r\n" { + t.Fatal("first WHOIS 312", r) + } + if r := <-conn1.outbound; r != ":foohost 319 nick1 nick2 :\r\n" { + t.Fatal("first WHOIS 319", r) + } + if r := <-conn1.outbound; r != ":foohost 318 nick1 nick2 :End of /WHOIS list\r\n" { + t.Fatal("first WHOIS 318", r) + } + + conn1.inbound <- "LIST" + if r := <-conn1.outbound; r != ":foohost 323 nick1 :End of /LIST\r\n" { + t.Fatal("first LIST", r) + } + + conn1.inbound <- "WHO" + not_enough_params(t, conn1) + conn1.inbound <- "WHO #fooroom" + no_chan(t, conn1) + + conn1.inbound <- "JOIN #foo" + conn2.inbound <- "JOIN #foo" + for i := 0; i < 4; i++ { + <-conn1.outbound + <-conn2.outbound + } + 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) + } + if r := <-conn2.outbound; r != ":nick1!foo1@someclient PRIVMSG #foo :world\r\n" { + t.Fatal("second message", r) + } + if r := <-conn2.outbound; r != ":nick1!foo1@someclient NOTICE #foo :world\r\n" { + t.Fatal("third message", r) + } +} + +func TestJoin(t *testing.T) { + log_sink := make(chan LogEvent, 8) + state_sink := make(chan StateEvent, 8) + daemon := NewDaemon("foohost", "", log_sink, state_sink) + events := make(chan ClientEvent) + go daemon.Processor(events) + conn := NewTestingConn() + client := NewClient("foohost", conn) + go client.Processor(events) + + conn.inbound <- "NICK nick2\r\nUSER foo2 bar2 baz2 :Long name2\r\n" + for i := 0; i < 6; i++ { + <-conn.outbound + } + + conn.inbound <- "JOIN" + not_enough_params(t, conn) + conn.inbound <- "JOIN bla/bla/bla" + no_chan(t, conn) + conn.inbound <- "JOIN bla:bla:bla" + no_chan(t, conn) + + conn.inbound <- "JOIN #foo" + if r := <-conn.outbound; r != ":foohost 331 nick2 #foo :No topic is set\r\n" { + t.Fatal("no topic is set", r) + } + if r := <-conn.outbound; r != ":nick2!foo2@someclient JOIN #foo\r\n" { + t.Fatal("no JOIN message", r) + } + if r := <-conn.outbound; r != ":foohost 353 nick2 = #foo :nick2\r\n" { + t.Fatal("no NAMES list", r) + } + if r := <-conn.outbound; r != ":foohost 366 nick2 #foo :End of NAMES list\r\n" { + t.Fatal("no end of NAMES list", r) + } + if r := <-log_sink; (r.what != "joined") || (r.where != "#foo") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("invalid join log event", r) + } + + conn.inbound <- "JOIN #bar,#baz" + for i := 0; i < 4*2; i++ { + <-conn.outbound + } + if _, ok := daemon.rooms["#bar"]; !ok { + t.Fatal("#bar does not exist") + } + if _, ok := daemon.rooms["#baz"]; !ok { + t.Fatal("#baz does not exist") + } + if r := <-log_sink; (r.what != "joined") || (r.where != "#bar") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("invalid join log event #bar", r) + } + if r := <-log_sink; (r.what != "joined") || (r.where != "#baz") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("invalid join log event #baz", r) + } + + conn.inbound <- "JOIN #barenc,#bazenc key1,key2" + for i := 0; i < 4*2; i++ { + <-conn.outbound + } + if daemon.rooms["#barenc"].key != "key1" { + t.Fatal("no room with key1") + } + if daemon.rooms["#bazenc"].key != "key2" { + t.Fatal("no room with key2") + } + if r := <-log_sink; (r.what != "joined") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("invalid join log event #barenc", r) + } + if r := <-log_sink; (r.what != "joined") || (r.where != "#bazenc") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("invalid join log event #bazenc", r) + } + if r := <-state_sink; (r.topic != "") || (r.where != "#barenc") || (r.key != "key1") { + t.Fatal("set channel key1 state", r) + } + if r := <-state_sink; (r.topic != "") || (r.where != "#bazenc") || (r.key != "key2") { + t.Fatal("set channel key2 state", r) + } + + conn.inbound <- "MODE #barenc -k" + if r := <-conn.outbound; r != ":nick2!foo2@someclient MODE #barenc -k\r\n" { + t.Fatal("remove #barenc key", r) + } + if daemon.rooms["#barenc"].key != "" { + t.Fatal("removing key from #barenc") + } + if r := <-log_sink; (r.what != "removed channel key") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("removed channel key log", r) + } + if r := <-state_sink; (r.topic != "") || (r.where != "#barenc") || (r.key != "") { + t.Fatal("removed channel key state", r) + } + + conn.inbound <- "PART #bazenc\r\nMODE #bazenc -k" + if r := <-conn.outbound; r != ":foohost 442 #bazenc :You are not on that channel\r\n" { + t.Fatal("not on that channel", r) + } + if r := <-log_sink; (r.what != "left") || (r.where != "#bazenc") || (r.who != "nick2") || (r.meta != true) { + 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" { + t.Fatal("unknown MODE flag", r) + } + + conn.inbound <- "MODE #barenc +k newkey" + if r := <-conn.outbound; r != ":nick2!foo2@someclient MODE #barenc +k newkey\r\n" { + t.Fatal("+k MODE setting", r) + } + if r := <-log_sink; (r.what != "set channel key to newkey") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("set channel key", r) + } + if r := <-state_sink; (r.topic != "") || (r.where != "#barenc") || (r.key != "newkey") { + t.Fatal("set channel newkey state", r) + } + + conn.inbound <- "TOPIC #barenc :New topic" + if r := <-conn.outbound; r != ":nick2!foo2@someclient TOPIC #barenc :New topic\r\n" { + t.Fatal("set TOPIC", r) + } + if r := <-log_sink; (r.what != "set topic to New topic") || (r.where != "#barenc") || (r.who != "nick2") || (r.meta != true) { + t.Fatal("set TOPIC log", r) + } + if r := <-state_sink; (r.topic != "New topic") || (r.where != "#barenc") || (r.key != "newkey") { + t.Fatal("set channel TOPIC state", r) + } + + conn.inbound <- "WHO #barenc" + if r := <-conn.outbound; r != ":foohost 352 nick2 #barenc foo2 someclient foohost nick2 H :0 Long name2\r\n" { + t.Fatal("WHO", r) + } + if r := <-conn.outbound; r != ":foohost 315 nick2 #barenc :End of /WHO list\r\n" { + t.Fatal("end of WHO", r) + } + +}