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

diff --git a/client_test.go b/client_test.go
index 82756c8..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 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,115 +14,52 @@ 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 (
-	"net"
 	"testing"
-	"time"
 )
 
-// Testing network connection that satisfies net.Conn interface
-// Can send predefined messages and store all written ones
-type TestingConn struct {
-	inbound  chan string
-	outbound chan string
-	closed   bool
-}
-
-func NewTestingConn() *TestingConn {
-	inbound := make(chan string, 8)
-	outbound := make(chan string, 8)
-	return &TestingConn{inbound: inbound, outbound: outbound}
-}
-
-func (conn TestingConn) Error() string {
-	return "i am finished"
-}
-
-func (conn *TestingConn) Read(b []byte) (n int, err error) {
-	msg := <-conn.inbound
-	if msg == "" {
-		return 0, conn
-	}
-	for n, bt := range []byte(msg + CRLF) {
-		b[n] = bt
-	}
-	return len(msg), nil
-}
-
-type MyAddr struct{}
-
-func (a MyAddr) String() string {
-	return "someclient"
-}
-func (a MyAddr) Network() string {
-	return "somenet"
-}
-
-func (conn *TestingConn) Write(b []byte) (n int, err error) {
-	conn.outbound <- string(b)
-	return len(b), nil
-}
-
-func (conn *TestingConn) Close() error {
-	conn.closed = true
-	return nil
-}
-
-func (conn TestingConn) LocalAddr() net.Addr {
-	return nil
-}
-
-func (conn TestingConn) RemoteAddr() net.Addr {
-	return MyAddr{}
-}
-
-func (conn TestingConn) SetDeadline(t time.Time) error {
-	return nil
-}
-
-func (conn TestingConn) SetReadDeadline(t time.Time) error {
-	return nil
-}
-
-func (conn TestingConn) SetWriteDeadline(t time.Time) error {
-	return nil
-}
-
-// 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)
-	client := NewClient("foohost", conn)
-	go client.Processor(sink)
-
-	event := <-sink
-	if event.event_type != EVENT_NEW {
+	events := make(chan ClientEvent)
+	host := "foohost"
+	hostname = &host
+	client := NewClient(conn, events)
+	defer func() {
+		client.Close()
+	}()
+
+	event := <-events
+	if event.eventType != EventNew {
 		t.Fatal("no NEW event", event)
 	}
 	conn.inbound <- "foo"
-	event = <-sink
-	if (event.event_type != EVENT_MSG) || (event.text != "foo") {
+	event = <-events
+	if (event.eventType != EventMsg) || (event.text != "foo") {
 		t.Fatal("no first MSG", event)
 	}
 	conn.inbound <- "bar"
-	event = <-sink
-	if (event.event_type != EVENT_MSG) || (event.text != "bar") {
+	event = <-events
+	if (event.eventType != EventMsg) || (event.text != "bar") {
 		t.Fatal("no second MSG", event)
 	}
 	conn.inbound <- ""
-	event = <-sink
-	if event.event_type != EVENT_DEL {
+	event = <-events
+	if event.eventType != EventDel {
 		t.Fatal("no client termination", event)
 	}
 }
 
-// Test replies formatting
 func TestClientReplies(t *testing.T) {
 	conn := NewTestingConn()
-	client := NewClient("foohost", conn)
+	host := "foohost"
+	hostname = &host
+	client := NewClient(conn, make(chan ClientEvent, 2))
+	defer func() {
+		client.Close()
+	}()
 	client.nickname = "мойник"
 
 	client.Reply("hello")