X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=client_test.go;fp=client_test.go;h=ed71da819be899f950006039f0bdb68d38729400;hp=4af1dd34f521348769c3cc9976dd62a87ed52f1d;hb=b7fb219307483d2c31b5dad1f559f325f2fd1a5e;hpb=def58d0f4944397faa8cdd4a9cf3515125e0b548

diff --git a/client_test.go b/client_test.go
index 4af1dd3..ed71da8 100644
--- a/client_test.go
+++ b/client_test.go
@@ -21,45 +21,46 @@ import (
 	"testing"
 )
 
-// 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()
-	sink := make(chan ClientEvent)
+	events := make(chan ClientEvent)
 	host := "foohost"
 	hostname = &host
-	client := NewClient(conn)
-	go client.Processor(sink)
+	client := NewClient(conn, events)
+	defer func() {
+		client.Close()
+	}()
 
-	event := <-sink
+	event := <-events
 	if event.eventType != EventNew {
 		t.Fatal("no NEW event", event)
 	}
 	conn.inbound <- "foo"
-	event = <-sink
+	event = <-events
 	if (event.eventType != EventMsg) || (event.text != "foo") {
 		t.Fatal("no first MSG", event)
 	}
 	conn.inbound <- "bar"
-	event = <-sink
+	event = <-events
 	if (event.eventType != EventMsg) || (event.text != "bar") {
 		t.Fatal("no second MSG", event)
 	}
 	conn.inbound <- ""
-	event = <-sink
+	event = <-events
 	if event.eventType != EventDel {
 		t.Fatal("no client termination", event)
 	}
 }
 
-// Test replies formatting
 func TestClientReplies(t *testing.T) {
 	conn := NewTestingConn()
 	host := "foohost"
 	hostname = &host
-	client := NewClient(conn)
-	nickname := "мойник"
-	client.nickname = &nickname
+	client := NewClient(conn, make(chan ClientEvent, 2))
+	defer func() {
+		client.Close()
+	}()
+	client.nickname = "мойник"
 
 	client.Reply("hello")
 	if r := <-conn.outbound; r != ":foohost hello\r\n" {