Refactored and corrected client's network data reading

[goircd.git] / client_test.go

diff --git a/client_test.go b/client_test.go
index 86bd35c135a13534206374bc79b6922abeb2f66b..3735e1f71034f8c3ebcd03f7efb63c522eff4c1a 100644 (file)
--- a/client_test.go
+++ b/client_test.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
 
 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
@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
+
 package main
 
 import (
@@ -46,10 +47,10 @@ func (conn *TestingConn) Read(b []byte) (n int, err error) {
        if msg == "" {
                return 0, conn
        }
-       for n, bt := range []byte(msg + CRLF) {
+       for n, bt := range append([]byte(msg), CRLF...) {
                b[n] = bt
        }
-       return len(msg), nil
+       return len(msg)+2, nil
 }
 
 type MyAddr struct{}
@@ -68,7 +69,6 @@ func (conn *TestingConn) Write(b []byte) (n int, err error) {
 
 func (conn *TestingConn) Close() error {
        conn.closed = true
-       //conn.incoming <- ""
        return nil
 }
 
@@ -97,53 +97,55 @@ func (conn TestingConn) SetWriteDeadline(t time.Time) error {
 func TestNewClient(t *testing.T) {
        conn := NewTestingConn()
        sink := make(chan ClientEvent)
-       client := NewClient("foohost", conn)
+       host := "foohost"
+       client := NewClient(&host, conn)
        go client.Processor(sink)
 
        event := <-sink
-       if event.event_type != EVENT_NEW {
-               t.Fatal("no NEW event")
+       if event.eventType != EventNew {
+               t.Fatal("no NEW event", event)
        }
        conn.inbound <- "foo"
        event = <-sink
-       if (event.event_type != EVENT_MSG) || (event.text != "foo") {
-               t.Fatal("no first MSG")
+       if (event.eventType != EventMsg) || (event.text != "foo") {
+               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")
+       if (event.eventType != EventMsg) || (event.text != "bar") {
+               t.Fatal("no second MSG", event)
        }
        conn.inbound <- ""
        event = <-sink
-       if event.event_type != EVENT_DEL {
-               t.Fatal("no client termination")
+       if event.eventType != EventDel {
+               t.Fatal("no client termination", event)
        }
 }
 
 // Test replies formatting
 func TestClientReplies(t *testing.T) {
        conn := NewTestingConn()
-       client := NewClient("foohost", conn)
+       host := "foohost"
+       client := NewClient(&host, conn)
        client.nickname = "мойник"
 
        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)
        }
 }