X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=daemon_test.go;h=76d620305dcf83725ef3e43f7d68e21028f4b6d3;hp=ac9bc4cfc3ec5c8ac351db2fe961134b6c98fc31;hb=b7fb219307483d2c31b5dad1f559f325f2fd1a5e;hpb=990937d451208b0299246c46dd29adf7a35f97ee

diff --git a/daemon_test.go b/daemon_test.go
index ac9bc4c..76d6203 100644
--- a/daemon_test.go
+++ b/daemon_test.go
@@ -1,11 +1,10 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014 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
@@ -15,6 +14,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,21 +26,25 @@ import (
 
 func TestRegistrationWorkflow(t *testing.T) {
 	host := "foohost"
-	daemon := NewDaemon("ver1", &host, nil, nil, nil, nil)
+	hostname = &host
 	events := make(chan ClientEvent)
-	go daemon.Processor(events)
+	finished := make(chan struct{})
+	defer func() {
+		events <- ClientEvent{eventType: EventTerm}
+		<-finished
+	}()
+	go Processor(events, finished)
 	conn := NewTestingConn()
-	client := NewClient(&host, conn)
-	go client.Processor(events)
+	client := NewClient(conn, events)
 
-	conn.inbound <- "UNEXISTENT CMD" // should recieve nothing on this
+	conn.inbound <- "UNEXISTENT CMD" // should receive nothing on this
 	conn.inbound <- "NICK"
 
 	if r := <-conn.outbound; r != ":foohost 431 :No nickname given\r\n" {
 		t.Fatal("431 for NICK", r)
 	}
 
-	for _, n := range []string{"привет", " foo", "longlonglong", "#foo", "mein nick", "foo_bar"} {
+	for _, n := range []string{"привет", " foo", "#foo", "mein nick", "foo_bar"} {
 		conn.inbound <- "NICK " + n
 		if r := <-conn.outbound; r != ":foohost 432 * "+n+" :Erroneous nickname\r\n" {
 			t.Fatal("nickname validation", r)
@@ -60,7 +64,7 @@ func TestRegistrationWorkflow(t *testing.T) {
 		t.Fatal("461 again for USER", r)
 	}
 
-	daemon.SendLusers(client)
+	client.SendLusers()
 	if r := <-conn.outbound; !strings.Contains(r, "There are 0 users") {
 		t.Fatal("LUSERS", r)
 	}
@@ -90,11 +94,12 @@ func TestRegistrationWorkflow(t *testing.T) {
 
 	conn.inbound <- "AWAY"
 	conn.inbound <- "UNEXISTENT CMD"
+	<-conn.outbound
 	if r := <-conn.outbound; r != ":foohost 421 meinick UNEXISTENT :Unknown command\r\n" {
 		t.Fatal("reply for unexistent command", r)
 	}
 
-	daemon.SendLusers(client)
+	client.SendLusers()
 	if r := <-conn.outbound; !strings.Contains(r, "There are 1 users") {
 		t.Fatal("1 users logged in", r)
 	}
@@ -105,10 +110,6 @@ func TestRegistrationWorkflow(t *testing.T) {
 	}
 
 	conn.inbound <- "QUIT\r\nUNEXISTENT CMD"
-	<-conn.outbound
-	if !conn.closed {
-		t.Fatal("closed connection on QUIT")
-	}
 }
 
 func TestMotd(t *testing.T) {
@@ -121,11 +122,15 @@ func TestMotd(t *testing.T) {
 
 	conn := NewTestingConn()
 	host := "foohost"
-	client := NewClient(&host, conn)
+	hostname = &host
+	client := NewClient(conn, make(chan ClientEvent, 2))
+	defer func() {
+		client.Close()
+	}()
 	motdName := fd.Name()
-	daemon := NewDaemon("ver1", &host, &motdName, nil, nil, nil)
+	motd = &motdName
 
-	daemon.SendMotd(client)
+	client.SendMotd()
 	if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 375") {
 		t.Fatal("MOTD start", r)
 	}