HasPrefix is not necessary before TrimPrefix

[goircd.git] / room_test.go

diff --git a/room_test.go b/room_test.go
index 9bfbc2380784a9addbb9fe7b00a60ee129c0dca7..3de419550ac0b0082b18776e8b45eb14ac467dc5 100644 (file)
--- a/room_test.go
+++ b/room_test.go
@@ -26,14 +26,15 @@ func notEnoughParams(t *testing.T, c *TestingConn) {
 func TestTwoUsers(t *testing.T) {
        logSink := make(chan LogEvent, 8)
        stateSink := make(chan StateEvent, 8)
-       daemon := NewDaemon("foohost", "", logSink, stateSink)
+       host := "foohost"
+       daemon := NewDaemon("ver1", &host, nil, nil, logSink, stateSink)
        events := make(chan ClientEvent)
        go daemon.Processor(events)
 
        conn1 := NewTestingConn()
        conn2 := NewTestingConn()
-       client1 := NewClient("foohost", conn1)
-       client2 := NewClient("foohost", conn2)
+       client1 := NewClient(&host, conn1)
+       client2 := NewClient(&host, conn2)
        go client1.Processor(events)
        go client2.Processor(events)
 
@@ -100,11 +101,12 @@ func TestTwoUsers(t *testing.T) {
 func TestJoin(t *testing.T) {
        logSink := make(chan LogEvent, 8)
        stateSink := make(chan StateEvent, 8)
-       daemon := NewDaemon("foohost", "", logSink, stateSink)
+       host := "foohost"
+       daemon := NewDaemon("ver1", &host, nil, nil, logSink, stateSink)
        events := make(chan ClientEvent)
        go daemon.Processor(events)
        conn := NewTestingConn()
-       client := NewClient("foohost", conn)
+       client := NewClient(&host, conn)
        go client.Processor(events)
 
        conn.inbound <- "NICK nick2\r\nUSER foo2 bar2 baz2 :Long name2\r\n"
@@ -198,8 +200,8 @@ func TestJoin(t *testing.T) {
                t.Fatal("left #bazenc log", r)
        }
 
-       conn.inbound <- "MODE #barenc +b"
-       if r := <-conn.outbound; r != ":foohost 472 nick2 +b :Unknown MODE flag\r\n" {
+       conn.inbound <- "MODE #barenc +i"
+       if r := <-conn.outbound; r != ":foohost 472 nick2 +i :Unknown MODE flag\r\n" {
                t.Fatal("unknown MODE flag", r)
        }