X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=client_test.go;h=ca1b2bfcd087974ab0d04d418293474b4f6aa027;hb=HEAD;hp=3735e1f71034f8c3ebcd03f7efb63c522eff4c1a;hpb=0b8c40aa61e899edb3e563b7771e3d7927d6e859;p=goircd.git

diff --git a/client_test.go b/client_test.go
index 3735e1f..ca1b2bf 100644
--- a/client_test.go
+++ b/client_test.go
@@ -1,132 +1,63 @@
-/*
-goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014-2015 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 (
-	"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 append([]byte(msg), CRLF...) {
-		b[n] = bt
-	}
-	return len(msg)+2, 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)
+	events := make(chan ClientEvent)
 	host := "foohost"
-	client := NewClient(&host, conn)
-	go client.Processor(sink)
+	hostname = &host
+	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"
-	client := NewClient(&host, conn)
+	hostname = &host
+	client := NewClient(conn, make(chan ClientEvent, 2))
+	defer func() {
+		client.Close()
+	}()
 	client.nickname = "мойник"
 
 	client.Reply("hello")