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

diff --git a/client_test.go b/client_test.go
index be05d71..ed71da8 100644
--- a/client_test.go
+++ b/client_test.go
@@ -1,11 +1,10 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2020 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,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" {