X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon_test.go;h=b67fbd4664743662709cd8890b220aa3acbf8072;hb=HEAD;hp=9c9db3de436923a43540debbc7d582374db58a43;hpb=41f96494948d1f9f1e0c3066099e0bd9ad0ee8dd;p=goircd.git

diff --git a/daemon_test.go b/daemon_test.go
index 9c9db3d..b67fbd4 100644
--- a/daemon_test.go
+++ b/daemon_test.go
@@ -1,45 +1,47 @@
-/*
-goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.
-*/
+// goircd -- minimalistic simple Internet Relay Chat (IRC) server
+// Copyright (C) 2014-2024 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// 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 (
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
 )
 
 func TestRegistrationWorkflow(t *testing.T) {
-	daemon := NewDaemon("foohost", "", nil, nil)
+	host := "foohost"
+	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("foohost", 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)
@@ -59,7 +61,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)
 	}
@@ -89,11 +91,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)
 	}
@@ -104,14 +107,10 @@ 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) {
-	fd, err := ioutil.TempFile("", "motd")
+	fd, err := os.CreateTemp("", "motd")
 	if err != nil {
 		t.Fatalf("can not create temporary file: %v", err)
 	}
@@ -119,10 +118,16 @@ func TestMotd(t *testing.T) {
 	fd.WriteString("catched\n")
 
 	conn := NewTestingConn()
-	client := NewClient("foohost", conn)
-	daemon := NewDaemon("foohost", fd.Name(), nil, nil)
-
-	daemon.SendMotd(client)
+	host := "foohost"
+	hostname = &host
+	client := NewClient(conn, make(chan ClientEvent, 2))
+	defer func() {
+		client.Close()
+	}()
+	motdName := fd.Name()
+	motd = &motdName
+
+	client.SendMotd()
 	if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 375") {
 		t.Fatal("MOTD start", r)
 	}