Adding server tests

Author: lxfontes

client_test.go

@@ -24,6 +24,7 @@ func (n *Nooper) OnDisconnect(con *Connection) {
 
 func (n *Nooper) OnEvent(con *Connection, evt *Event) {
 	fmt.Println("event", evt.EventBody.Get("Event-Name"))
+	con.Send("quit")
 }
 
 func (n *Nooper) OnClose(con *Connection) {
@@ -43,7 +44,9 @@ func Test_Client(t *testing.T) {
 	if err != nil {
 		fmt.Println("Something went wrong ", err)
 	}
+	if client != nil {
+	}
 
-	client.Loop()
+	//	client.Loop()
 
 }

net.go

@@ -3,7 +3,7 @@ package eventsocket
 import (
 	"bufio"
 	"bytes"
-	"fmt"
+	_ "fmt"
 	"net"
 	"sync"
 	"time"
@@ -43,7 +43,7 @@ type Connection struct {
 }
 
 type Server struct {
-	Settings    *ServerSettings
+	Settings    ServerSettings
 	NetListener net.Listener
 	EvListener  ServerListener
 }
@@ -91,7 +91,7 @@ func (con *Connection) tryConnect(client *Client) bool {
 	return true
 }
 
-func (con *Connection) setupConnect() {
+func (con *Connection) setupConnect() bool {
 	//authenticate socket
 	cBuf := bytes.NewBufferString("connect")
 	cBuf.Write(doubleLine)
@@ -100,25 +100,25 @@ func (con *Connection) setupConnect() {
 
 	if err != nil {
 		con.eslCon.Close()
-		return
+		return false
 	}
 
 	channelData := readMessage(con.rw)
 
 	if channelData.Type != EventReply {
 		con.eslCon.Close()
-		return
+		return false
 	}
 
 	con.ChannelData = channelData.Headers
 	con.Connected = true
+	return true
 }
 
 func (con *Connection) Loop() {
 	//spin this on a separate goroutine so we can start handling api events
 	//people will likely subscribe to events here
 	go con.Listener.OnConnect(con)
-	fmt.Println("Connection Loop")
 	for con.Connected {
 		message := readMessage(con.rw)
 
@@ -140,12 +140,11 @@ func (con *Connection) Loop() {
 		}
 
 	}
-	fmt.Println("Close Connection Loop")
 }
 
 /* Server */
 
-func CreateServer(settings *ServerSettings) (*Server, error) {
+func CreateServer(settings ServerSettings) (*Server, error) {
 	var err error
 	retServer := new(Server)
 	retServer.Settings = settings
@@ -155,10 +154,9 @@ func CreateServer(settings *ServerSettings) (*Server, error) {
 	if err != nil {
 		return nil, err
 	}
-	go retServer.loop()
 	return retServer, nil
 }
-func (server *Server) loop() {
+func (server *Server) Loop() {
 	for {
 		conn, err := server.NetListener.Accept()
 		if err != nil {
@@ -172,7 +170,9 @@ func (server *Server) loop() {
 		scon.rw = bufio.NewReadWriter(
 			bufio.NewReaderSize(scon.eslCon, BufferSize),
 			bufio.NewWriter(scon.eslCon))
-		server.EvListener.OnNewConnection(scon)
+		if scon.setupConnect() {
+			server.EvListener.OnNewConnection(scon)
+		}
 	}
 }
 
@@ -201,17 +201,13 @@ func CreateClient(settings ClientSettings) (*Client, error) {
 func (client *Client) Loop() {
 	for {
 		if !client.Connected {
-			fmt.Println("Trying to reconnect")
 			client.Connected = client.connection.tryConnect(client)
 			if !client.Connected {
 				time.Sleep(client.Settings.Timeout)
 			}
-			fmt.Println("Finished trying to reconnect", client.Connected)
 			continue
 		}
-		fmt.Println("Client Loop")
 		client.connection.Loop()
-		fmt.Println("Client Loop Finished")
 		client.Connected = false
 	}
 }

server_test.go

@@ -5,33 +5,54 @@ import (
 	"testing"
 )
 
-func Test_Server(t *testing.T) {
-	t.Log("Test Basic Server")
-
-	server, err := CreateServer(&ServerSettings{
-		Address: "localhost:8086",
-	})
+type ServerNooper struct{}
 
+func (n *ServerNooper) OnConnect(con *Connection) {
+	fmt.Println("Connected")
+	evt, err := con.Send("event", "plain", "HEARTBEAT")
 	if err != nil {
-		fmt.Println("Something went wrong ", err)
+		fmt.Println("ahn?")
+		return
 	}
+	fmt.Println(evt.Success)
+
+	con.Execute(&Command{
+		App:  "answer",
+		Args: "",
+	})
+}
 
-	fmt.Println("Listening on", server.Settings.Address)
+func (n *ServerNooper) OnDisconnect(con *Connection) {
+	fmt.Println("disconnect")
+}
 
-	for loop := true; loop; {
-		msg := <-server.EventsChannel
-		switch {
-		case msg.Type == EventState && !msg.Success:
-			fmt.Println("Disconnected")
-			loop = false
-		case msg.Type == EventState && msg.Success:
-			fmt.Println("Connected")
-			fmt.Println("Answering")
-			msg.Connection.Answer()
+func (n *ServerNooper) OnEvent(con *Connection, evt *Event) {
+	fmt.Println("event", evt.EventBody.Get("Event-Name"))
+}
 
-		case msg.Type == EventGeneric:
+func (n *ServerNooper) OnClose(con *Connection) {
+	fmt.Println("close")
+}
 
-		}
+func (n *ServerNooper) OnNewConnection(con *Connection) {
+	fmt.Println("Got new connection")
+	con.Listener = n
+	go con.Loop()
+}
+
+func Test_Server(t *testing.T) {
+	fmt.Println("Test Basic Server")
+
+	server, err := CreateServer(ServerSettings{
+		Address:  "localhost:8087",
+		Listener: new(ServerNooper),
+	})
+
+	if err != nil {
+		fmt.Println("Something went wrong ", err)
 	}
+	fmt.Println("Listening")
+
+	server.Loop()
 
 }