Many fixes and additions

[goircd.git] / client_test.go

diff --git a/client_test.go b/client_test.go
index b9fee14e0de757c4d33f3544a41a78c658db4511..ed71da819be899f950006039f0bdb68d38729400 100644 (file)
--- a/client_test.go
+++ b/client_test.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014-2018 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
@@ -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" {