X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=client_test.go;h=3735e1f71034f8c3ebcd03f7efb63c522eff4c1a;hb=0b8c40aa61e899edb3e563b7771e3d7927d6e859;hp=101de56347398c3e221547ecf178de216335b6ce;hpb=b2f90fb412218973608b24a32eebadc60de9878a;p=goircd.git

diff --git a/client_test.go b/client_test.go
index 101de56..3735e1f 100644
--- 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 (
@@ -26,33 +27,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 append([]byte(msg), CRLF...) {
 		b[n] = bt
 	}
-	return len(conn.msgs[conn.msg_ptr]), nil
+	return len(msg)+2, nil
 }
 
 type MyAddr struct{}
@@ -65,8 +63,8 @@ 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 {
@@ -97,52 +95,57 @@ 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)
+	host := "foohost"
+	client := NewClient(&host, conn)
 	go client.Processor(sink)
 
 	event := <-sink
-	if event.event_type != EVENT_NEW {
-		t.Fail()
+	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.Fail()
+	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.Fail()
+	if (event.eventType != EventMsg) || (event.text != "bar") {
+		t.Fatal("no second MSG", event)
 	}
+	conn.inbound <- ""
 	event = <-sink
-	if event.event_type != EVENT_DEL {
-		t.Fail()
+	if event.eventType != EventDel {
+		t.Fatal("no client termination", event)
 	}
 }
 
 // Test replies formatting
 func TestClientReplies(t *testing.T) {
-	conn := NewTestingConn("foo", "bar")
-	client := NewClient("foohost", conn)
+	conn := NewTestingConn()
+	host := "foohost"
+	client := NewClient(&host, conn)
 	client.nickname = "мойник"
 
 	client.Reply("hello")
-	if (len(conn.incoming) != 1) || (conn.incoming[0] != ":foohost hello\r\n") {
-		t.Fatal("did not recieve hello message")
+	if r := <-conn.outbound; r != ":foohost hello\r\n" {
+		t.Fatal("did not recieve hello message", r)
 	}
 
 	client.ReplyParts("200", "foo", "bar")
-	if (len(conn.incoming) != 2) || (conn.incoming[1] != ":foohost 200 foo :bar\r\n") {
-		t.Fatal("did not recieve 200 message")
+	if r := <-conn.outbound; r != ":foohost 200 foo :bar\r\n" {
+		t.Fatal("did not recieve 200 message", r)
 	}
 
 	client.ReplyNicknamed("200", "foo", "bar")
-	if (len(conn.incoming) != 3) || (conn.incoming[2] != ":foohost 200 мойник foo :bar\r\n") {
-		t.Fatal("did not recieve nicknamed message")
+	if r := <-conn.outbound; r != ":foohost 200 мойник foo :bar\r\n" {
+		t.Fatal("did not recieve nicknamed message", r)
 	}
 
 	client.ReplyNotEnoughParameters("CMD")
-	if (len(conn.incoming) != 4) || (conn.incoming[3] != ":foohost 461 мойник CMD :Not enough parameters\r\n") {
-		t.Fatal("did not recieve 461 message")
+	if r := <-conn.outbound; r != ":foohost 461 мойник CMD :Not enough parameters\r\n" {
+		t.Fatal("did not recieve 461 message", r)
 	}
 }