Add more tests

Author: outdead

.gitignore

@@ -1,4 +1,3 @@
 .idea/
 .vscode/
 vendor/
-websocket_integration_test.go

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [v1.0.1] - 2020-11-14
+### Added
+- Added the ability to run the status command on a real Rust server. To do this, set environment variables `TEST_RUST_SERVER=true`, 
+`TEST_RUST_SERVER_ADDR` and `TEST_RUST_SERVER_PASSWORD` with address and password from Rust remote console.  
+- Added deadline test.  
+
+### Changed
+- Changed CI workflows and related badges. Integration with Travis-CI was changed to GitHub actions workflow. Golangci-lint 
+job was joined with tests workflow.  
+
 ## [v1.0.0] - 2020-11-13
 ### Added
 - Added mockserver and tests.
@@ -14,5 +24,6 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Initial implementation.
 
-[Unreleased]: https://github.com/gorcon/websocket/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/gorcon/websocket/compare/v1.0.1...HEAD
+[v1.0.1]: https://github.com/gorcon/websocket/compare/v1.0.0...v1.0.1
 [v1.0.0]: https://github.com/gorcon/websocket/compare/v0.1.0...v1.0.0

websocket_mockserver_test.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/gorilla/websocket"
 )
@@ -62,6 +63,13 @@ func mockHandlers() http.Handler {
 				Identifier: message.Identifier,
 				Type:       "Generic",
 			}
+		case "deadline":
+			time.Sleep(DefaultDeadline + 1*time.Second)
+			response = Message{
+				Message:    fmt.Sprintf("sleep for %d secends", DefaultDeadline+1*time.Second),
+				Identifier: message.Identifier,
+				Type:       "Generic",
+			}
 		default:
 			response = Message{
 				Message:    fmt.Sprintf("Command '%s' not found", message.Message),

websocket_test.go

@@ -3,6 +3,7 @@ package websocket
 import (
 	"fmt"
 	"net/http/httptest"
+	"os"
 	"testing"
 	"time"
 
@@ -74,6 +75,20 @@ func TestConn_Execute(t *testing.T) {
 		assert.Equal(t, 0, len(result))
 	})
 
+	t.Run("read deadline", func(t *testing.T) {
+		conn, err := Dial(server.Listener.Addr().String(), MockPassword, SetDeadline(1*time.Second))
+		if !assert.NoError(t, err) {
+			return
+		}
+		defer func() {
+			assert.NoError(t, conn.Close())
+		}()
+
+		result, err := conn.Execute("deadline")
+		assert.EqualError(t, err, fmt.Sprintf("read tcp %s->%s: i/o timeout", conn.LocalAddr(), conn.RemoteAddr()))
+		assert.Equal(t, 0, len(result))
+	})
+
 	t.Run("unknown command", func(t *testing.T) {
 		conn, err := Dial(server.Listener.Addr().String(), MockPassword)
 		if !assert.NoError(t, err) {
@@ -101,4 +116,42 @@ func TestConn_Execute(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, MockCommandStatusResponseText, result)
 	})
+
+	// Environment variable TEST_RUST_SERVER allows to sends commands to real
+	// Rust server.
+	//
+	// Some Rust commands:
+	// console.tail 5
+	// status
+	// playerlist
+	// serverinfo
+	if run := getVar("TEST_RUST_SERVER", "false"); run == "true" {
+		addr := getVar("TEST_RUST_SERVER_ADDR", "127.0.0.1:28016")
+		password := getVar("TEST_RUST_SERVER_PASSWORD", "docker")
+
+		t.Run("rust server", func(t *testing.T) {
+			conn, err := Dial(addr, password)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer func() {
+				assert.NoError(t, conn.Close())
+			}()
+
+			result, err := conn.Execute("status")
+			assert.NoError(t, err)
+			assert.NotEmpty(t, result)
+
+			fmt.Println(result)
+		})
+	}
+}
+
+// getVar returns environment variable or default value.
+func getVar(key string, fallback string) string {
+	if value := os.Getenv(key); value != "" {
+		return value
+	}
+
+	return fallback
 }