Refactor unittests

diff --git a/client_test.go b/client_test.go
index 101de56347398c3e221547ecf178de216335b6ce..86bd35c135a13534206374bc79b6922abeb2f66b 100644 (file)
--- a/client_test.go
+++ b/client_test.go
@@ -26,33 +26,30 @@ import (
 // Testing network connection that satisfies net.Conn interface
 // Can send predefined messages and store all written ones
 type TestingConn struct {
-       msgs     []string
-       msg_ptr  int
-       incoming []string
+       inbound  chan string
+       outbound chan string
        closed   bool
 }
 
-func NewTestingConn(msgs ...string) *TestingConn {
-       msgs_crlf := []string{}
-       for _, msg := range msgs {
-               msgs_crlf = append(msgs_crlf, msg+"\r\n")
-       }
-       return &TestingConn{msgs: msgs_crlf, msg_ptr: -1}
+func NewTestingConn() *TestingConn {
+       inbound := make(chan string, 8)
+       outbound := make(chan string, 8)
+       return &TestingConn{inbound: inbound, outbound: outbound}
 }
 
 func (conn TestingConn) Error() string {
-       return "i am out"
+       return "i am finished"
 }
 
 func (conn *TestingConn) Read(b []byte) (n int, err error) {
-       conn.msg_ptr++
-       if len(conn.msgs) == conn.msg_ptr {
-               return 0, TestingConn{}
+       msg := <-conn.inbound
+       if msg == "" {
+               return 0, conn
        }
-       for n, bt := range []byte(conn.msgs[conn.msg_ptr]) {
+       for n, bt := range []byte(msg + CRLF) {
                b[n] = bt
        }
-       return len(conn.msgs[conn.msg_ptr]), nil
+       return len(msg), nil
 }
 
 type MyAddr struct{}
@@ -65,12 +62,13 @@ func (a MyAddr) Network() string {
 }
 
 func (conn *TestingConn) Write(b []byte) (n int, err error) {
-       conn.incoming = append(conn.incoming, string(b))
-       return 0, nil
+       conn.outbound <- string(b)
+       return len(b), nil
 }
 
 func (conn *TestingConn) Close() error {
        conn.closed = true
+       //conn.incoming <- ""
        return nil
 }
 
@@ -97,52 +95,55 @@ func (conn TestingConn) SetWriteDeadline(t time.Time) error {
 // New client creation test. It must send an event about new client,
 // two predefined messages from it and deletion one
 func TestNewClient(t *testing.T) {
-       conn := NewTestingConn("foo", "bar")
+       conn := NewTestingConn()
        sink := make(chan ClientEvent)
        client := NewClient("foohost", conn)
        go client.Processor(sink)
 
        event := <-sink
        if event.event_type != EVENT_NEW {
-               t.Fail()
+               t.Fatal("no NEW event")
        }
+       conn.inbound <- "foo"
        event = <-sink
        if (event.event_type != EVENT_MSG) || (event.text != "foo") {
-               t.Fail()
+               t.Fatal("no first MSG")
        }
+       conn.inbound <- "bar"
        event = <-sink
        if (event.event_type != EVENT_MSG) || (event.text != "bar") {
-               t.Fail()
+               t.Fatal("no second MSG")
        }
+       conn.inbound <- ""
        event = <-sink
        if event.event_type != EVENT_DEL {
-               t.Fail()
+               t.Fatal("no client termination")
        }
 }
 
 // Test replies formatting
 func TestClientReplies(t *testing.T) {
-       conn := NewTestingConn("foo", "bar")
+       conn := NewTestingConn()
        client := NewClient("foohost", conn)
        client.nickname = "мойник"
 
        client.Reply("hello")
-       if (len(conn.incoming) != 1) || (conn.incoming[0] != ":foohost hello\r\n") {
+       if r := <-conn.outbound; r != ":foohost hello\r\n" {
                t.Fatal("did not recieve hello message")
        }
 
        client.ReplyParts("200", "foo", "bar")
-       if (len(conn.incoming) != 2) || (conn.incoming[1] != ":foohost 200 foo :bar\r\n") {
+       if r := <-conn.outbound; r != ":foohost 200 foo :bar\r\n" {
                t.Fatal("did not recieve 200 message")
        }
 
        client.ReplyNicknamed("200", "foo", "bar")
-       if (len(conn.incoming) != 3) || (conn.incoming[2] != ":foohost 200 мойник foo :bar\r\n") {
+       if r := <-conn.outbound; r != ":foohost 200 мойник foo :bar\r\n" {
                t.Fatal("did not recieve nicknamed message")
        }
 
        client.ReplyNotEnoughParameters("CMD")
-       if (len(conn.incoming) != 4) || (conn.incoming[3] != ":foohost 461 мойник CMD :Not enough parameters\r\n") {
+       if r := <-conn.outbound; r != ":foohost 461 мойник CMD :Not enough parameters\r\n" {
                t.Fatal("did not recieve 461 message")
        }
 }

diff --git a/daemon_test.go b/daemon_test.go
index b5f6580302a956a7583f9288f5b1227bc0045369..a0c21a0333336d46c6d35a18dbb1a7ab9f8e353d 100644 (file)
--- a/daemon_test.go
+++ b/daemon_test.go
@@ -18,12 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "fmt"
        "io/ioutil"
        "os"
        "strings"
        "testing"
-       "time"
 )
 
 func TestRegistrationWorkflow(t *testing.T) {
@@ -32,87 +30,71 @@ func TestRegistrationWorkflow(t *testing.T) {
        go daemon.Processor(events)
        conn := NewTestingConn()
        client := NewClient("foohost", conn)
+       go client.Processor(events)
 
-       events <- ClientEvent{client, EVENT_NEW, ""}
-       events <- ClientEvent{client, EVENT_MSG, "UNEXISTENT CMD"}
-       time.Sleep(100)
-       if len(conn.incoming) > 0 {
-               t.Fail()
-       }
+       conn.inbound <- "UNEXISTENT CMD" // should recieve nothing on this
+       conn.inbound <- "NICK"
 
-       events <- ClientEvent{client, EVENT_MSG, "NICK"}
-       time.Sleep(100)
-       if (len(conn.incoming) != 1) || (conn.incoming[0] != ":foohost 431 :No nickname given\r\n") {
-               t.Fail()
+       if r := <-conn.outbound; r != ":foohost 431 :No nickname given\r\n" {
+               t.Fatal("431 for NICK")
        }
 
-       events <- ClientEvent{client, EVENT_MSG, "NICK meinick"}
-       time.Sleep(100)
-       if (len(conn.incoming) != 1) || (client.nickname != "meinick") || client.registered {
-               t.Fail()
+       conn.inbound <- "NICK meinick\r\nUSER\r\n"
+       if r := <-conn.outbound; r != ":foohost 461 meinick USER :Not enough parameters\r\n" {
+               t.Fatal("461 for USER", r)
        }
-
-       events <- ClientEvent{client, EVENT_MSG, "USER"}
-       time.Sleep(100)
-       if (len(conn.incoming) != 2) || (conn.incoming[1] != ":foohost 461 meinick USER :Not enough parameters\r\n") {
-               t.Fail()
+       if (client.nickname != "meinick") || client.registered {
+               t.Fatal("NICK saved")
        }
 
-       events <- ClientEvent{client, EVENT_MSG, "USER 1 2 3"}
-       time.Sleep(100)
-       if (len(conn.incoming) != 3) || (conn.incoming[2] != ":foohost 461 meinick USER :Not enough parameters\r\n") {
-               t.Fail()
+       conn.inbound <- "USER 1 2 3\r\n"
+       if r := <-conn.outbound; r != ":foohost 461 meinick USER :Not enough parameters\r\n" {
+               t.Fatal("461 again for USER")
        }
 
        daemon.SendLusers(client)
-       if !strings.Contains(conn.incoming[len(conn.incoming)-1], "There are 0 users") {
-               t.Fail()
+       if r := <-conn.outbound; !strings.Contains(r, "There are 0 users") {
+               t.Fatal("LUSERS")
        }
 
-       events <- ClientEvent{client, EVENT_MSG, "USER 1 2 3 :4 5"}
-       time.Sleep(100)
-       if (len(conn.incoming) < 4) || (client.username != "1") || (client.realname != "4 5") {
-               t.Fail()
+       conn.inbound <- "USER 1 2 3 :4 5\r\n"
+       if r := <-conn.outbound; !strings.Contains(r, ":foohost 001") {
+               t.Fatal("001 after registration")
        }
-
-       statuses := map[int]bool{1: false, 2: false, 3: false, 4: false, 251: false, 422: false}
-       for _, msg := range conn.incoming {
-               for k, _ := range statuses {
-                       if strings.HasPrefix(msg, fmt.Sprintf(":foohost %03d", k)) {
-                               statuses[k] = true
-                       }
-               }
+       if r := <-conn.outbound; !strings.Contains(r, ":foohost 002") {
+               t.Fatal("002 after registration")
        }
-       for _, v := range statuses {
-               if !v {
-                       t.Fail()
-               }
+       if r := <-conn.outbound; !strings.Contains(r, ":foohost 003") {
+               t.Fatal("003 after registration")
        }
-       if !client.registered {
-               t.Fail()
+       if r := <-conn.outbound; !strings.Contains(r, ":foohost 004") {
+               t.Fatal("004 after registration")
        }
-
-       events <- ClientEvent{client, EVENT_MSG, "UNEXISTENT CMD"}
-       time.Sleep(100)
-       if conn.incoming[len(conn.incoming)-1] != ":foohost 421 meinick UNEXISTENT :Unknown command\r\n" {
-               t.Fail()
+       if r := <-conn.outbound; !strings.Contains(r, ":foohost 251") {
+               t.Fatal("251 after registration")
+       }
+       if r := <-conn.outbound; !strings.Contains(r, ":foohost 422") {
+               t.Fatal("422 after registration")
+       }
+       if (client.username != "1") || (client.realname != "4 5") || !client.registered {
+               t.Fatal("client register")
        }
 
-       events <- ClientEvent{client, EVENT_MSG, "AWAY"}
-       time.Sleep(100)
-       if conn.incoming[len(conn.incoming)-1] == ":foohost 421 meinick AWAY :Unknown command\r\n" {
-               t.Fail()
+       conn.inbound <- "AWAY\r\n"
+       conn.inbound <- "UNEXISTENT CMD\r\n"
+       if r := <-conn.outbound; r != ":foohost 421 meinick UNEXISTENT :Unknown command\r\n" {
+               t.Fatal("reply for unexistent command")
        }
 
        daemon.SendLusers(client)
-       if !strings.Contains(conn.incoming[len(conn.incoming)-1], "There are 1 users") {
-               t.Fail()
+       if r := <-conn.outbound; !strings.Contains(r, "There are 1 users") {
+               t.Fatal("1 users logged in")
        }
 
-       events <- ClientEvent{client, EVENT_MSG, "QUIT"}
-       time.Sleep(100)
+       conn.inbound <- "QUIT\r\nUNEXISTENT CMD\r\n"
+       <-conn.outbound
        if !conn.closed {
-               t.Fail()
+               t.Fatal("closed connection on QUIT")
        }
 }
 
@@ -123,18 +105,19 @@ func TestMotd(t *testing.T) {
        }
        defer os.Remove(fd.Name())
        fd.Write([]byte("catched\n"))
-       daemon := NewDaemon("foohost", fd.Name(), nil, nil)
+
        conn := NewTestingConn()
        client := NewClient("foohost", conn)
+       daemon := NewDaemon("foohost", fd.Name(), nil, nil)
 
        daemon.SendMotd(client)
-       catched := false
-       for _, msg := range conn.incoming {
-               if strings.Contains(msg, "372 * :- catched") {
-                       catched = true
-               }
-       }
-       if !catched {
-               t.Fail()
+       if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 375") {
+               t.Fatal("MOTD start")
+       }
+       if r := <-conn.outbound; !strings.Contains(r, "372 * :- catched\r\n") {
+               t.Fatal("MOTD contents")
+       }
+       if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 376") {
+               t.Fatal("MOTD end", r)
        }
 }