Add more IRC client tests

irc/conn_test.go

@@ -1,6 +1,9 @@
 package irc
 
 import (
+	"bufio"
+	"bytes"
+	"crypto/tls"
 	"log"
 	"net"
 	"testing"
@@ -29,11 +32,27 @@ type mockIrcd struct {
 }
 
 func (i *mockIrcd) start() {
-	ln, err := net.Listen("tcp", ":45678")
+	ln, err := net.Listen("tcp", "127.0.0.1:45678")
 	if err != nil {
 		log.Fatal(err)
 	}
+
+	cert, err := tls.X509KeyPair(testCert, testKey)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	tlsConfig := &tls.Config{
+		Certificates: []tls.Certificate{cert},
+	}
+
+	lnTLS, err := tls.Listen("tcp", "127.0.0.1:45679", tlsConfig)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	go i.accept(ln)
+	go i.accept(lnTLS)
 }
 
 func (i *mockIrcd) accept(ln net.Listener) {
@@ -66,6 +85,15 @@ func TestConnect(t *testing.T) {
 	initTestClient()
 }
 
+func TestConnectTLS(t *testing.T) {
+	c.TLS = true
+	c.Connect("127.0.0.1:45679")
+	assert.Equal(t, c.Host, "127.0.0.1")
+	assert.Equal(t, c.Server, "127.0.0.1:45679")
+	waitConnAndClose(t)
+	initTestClient()
+}
+
 func TestConnectDefaultPorts(t *testing.T) {
 	c.Connect("127.0.0.1")
 	assert.Equal(t, "127.0.0.1:6667", c.Server)
@@ -88,6 +116,43 @@ func TestWrite(t *testing.T) {
 	assert.Equal(t, "test 2\r\n", <-conn.hook)
 }
 
+func TestRecv(t *testing.T) {
+	buf := &bytes.Buffer{}
+	buf.WriteString("CMD\r\n")
+	buf.WriteString("PING :test\r\n")
+	buf.WriteString("001\r\n")
+	c.reader = bufio.NewReader(buf)
+
+	c.ready.Add(1)
+	close(c.quit)
+	go c.recv()
+
+	assert.Equal(t, "PONG :test\r\n", <-conn.hook)
+	assert.Equal(t, &Message{Command: "CMD"}, <-c.Messages)
+	initTestClient()
+}
+
+func TestRecvTriggersReconnect(t *testing.T) {
+	c.reader = bufio.NewReader(&bytes.Buffer{})
+	c.ready.Add(1)
+	done := make(chan struct{})
+	ok := false
+	go func() {
+		c.recv()
+		_, ok = <-c.reconnect
+		close(done)
+	}()
+
+	select {
+	case <-done:
+		assert.False(t, ok)
+		return
+
+	case <-time.After(100 * time.Millisecond):
+		t.Error("Reconnect not triggered")
+	}
+}
+
 func TestClose(t *testing.T) {
 	defer initTestClient()
 	c.close()
@@ -111,18 +176,47 @@ func TestClose(t *testing.T) {
 
 func waitConnAndClose(t *testing.T) {
 	done := make(chan struct{})
+	quit := make(chan struct{})
 	go func() {
 		<-ircd.conn
-		c.Quit()
+		quit <- struct{}{}
 		<-ircd.connClosed
 		close(done)
 	}()
 
-	select {
-	case <-done:
-		return
+	for {
+		select {
+		case <-done:
+			return
 
-	case <-time.After(500 * time.Millisecond):
-		t.Error("Took too long")
+		case <-quit:
+			assert.True(t, c.Connected())
+			c.Quit()
+
+		case <-time.After(500 * time.Millisecond):
+			t.Error("Took too long")
+			return
+		}
 	}
 }
+
+var testCert = []byte(`-----BEGIN CERTIFICATE-----
+MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
+bzAeFw03MDAxMDEwMDAwMDBaFw00OTEyMzEyMzU5NTlaMBIxEDAOBgNVBAoTB0Fj
+bWUgQ28wWjALBgkqhkiG9w0BAQEDSwAwSAJBAN55NcYKZeInyTuhcCwFMhDHCmwa
+IUSdtXdcbItRB/yfXGBhiex00IaLXQnSU+QZPRZWYqeTEbFSgihqi1PUDy8CAwEA
+AaNoMGYwDgYDVR0PAQH/BAQDAgCkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1Ud
+EwEB/wQFMAMBAf8wLgYDVR0RBCcwJYILZXhhbXBsZS5jb22HBH8AAAGHEAAAAAAA
+AAAAAAAAAAAAAAEwCwYJKoZIhvcNAQEFA0EAAoQn/ytgqpiLcZu9XKbCJsJcvkgk
+Se6AbGXgSlq+ZCEVo0qIwSgeBqmsJxUu7NCSOwVJLYNEBO2DtIxoYVk+MA==
+-----END CERTIFICATE-----`)
+
+var testKey = []byte(`-----BEGIN RSA PRIVATE KEY-----
+MIIBPAIBAAJBAN55NcYKZeInyTuhcCwFMhDHCmwaIUSdtXdcbItRB/yfXGBhiex0
+0IaLXQnSU+QZPRZWYqeTEbFSgihqi1PUDy8CAwEAAQJBAQdUx66rfh8sYsgfdcvV
+NoafYpnEcB5s4m/vSVe6SU7dCK6eYec9f9wpT353ljhDUHq3EbmE4foNzJngh35d
+AekCIQDhRQG5Li0Wj8TM4obOnnXUXf1jRv0UkzE9AHWLG5q3AwIhAPzSjpYUDjVW
+MCUXgckTpKCuGwbJk7424Nb8bLzf3kllAiA5mUBgjfr/WtFSJdWcPQ4Zt9KTMNKD
+EUO0ukpTwEIl6wIhAMbGqZK3zAAFdq8DD2jPx+UJXnh0rnOkZBzDtJ6/iN69AiEA
+1Aq8MJgTaYsDQWyU/hDq5YkDJc9e9DSCvUIzqxQWMQE=
+-----END RSA PRIVATE KEY-----`)