X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=client_test.go;h=f9e3887b5b0fc782d99b7df5ddb020161bea830a;hb=5c79c4235ec745fa47c1f176657287dab4f61ed5;hp=86bd35c135a13534206374bc79b6922abeb2f66b;hpb=49c1eed2e72c62dd7f4a44e3f2ca0647422bda04;p=goircd.git

diff --git a/client_test.go b/client_test.go
index 86bd35c..f9e3887 100644
--- a/client_test.go
+++ b/client_test.go
@@ -68,7 +68,6 @@ func (conn *TestingConn) Write(b []byte) (n int, err error) {
 
 func (conn *TestingConn) Close() error {
 	conn.closed = true
-	//conn.incoming <- ""
 	return nil
 }
 
@@ -101,23 +100,23 @@ func TestNewClient(t *testing.T) {
 	go client.Processor(sink)
 
 	event := <-sink
-	if event.event_type != EVENT_NEW {
-		t.Fatal("no NEW event")
+	if event.eventType != EventNew {
+		t.Fatal("no NEW event", event)
 	}
 	conn.inbound <- "foo"
 	event = <-sink
-	if (event.event_type != EVENT_MSG) || (event.text != "foo") {
-		t.Fatal("no first MSG")
+	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") {
-		t.Fatal("no second MSG")
+	if (event.eventType != EventMsg) || (event.text != "bar") {
+		t.Fatal("no second MSG", event)
 	}
 	conn.inbound <- ""
 	event = <-sink
-	if event.event_type != EVENT_DEL {
-		t.Fatal("no client termination")
+	if event.eventType != EventDel {
+		t.Fatal("no client termination", event)
 	}
 }
 
@@ -129,21 +128,21 @@ func TestClientReplies(t *testing.T) {
 
 	client.Reply("hello")
 	if r := <-conn.outbound; r != ":foohost hello\r\n" {
-		t.Fatal("did not recieve hello message")
+		t.Fatal("did not recieve hello message", r)
 	}
 
 	client.ReplyParts("200", "foo", "bar")
 	if r := <-conn.outbound; r != ":foohost 200 foo :bar\r\n" {
-		t.Fatal("did not recieve 200 message")
+		t.Fatal("did not recieve 200 message", r)
 	}
 
 	client.ReplyNicknamed("200", "foo", "bar")
 	if r := <-conn.outbound; r != ":foohost 200 мойник foo :bar\r\n" {
-		t.Fatal("did not recieve nicknamed message")
+		t.Fatal("did not recieve nicknamed message", r)
 	}
 
 	client.ReplyNotEnoughParameters("CMD")
 	if r := <-conn.outbound; r != ":foohost 461 мойник CMD :Not enough parameters\r\n" {
-		t.Fatal("did not recieve 461 message")
+		t.Fatal("did not recieve 461 message", r)
 	}
 }