Hold off on table-driven-tests for now.

I feel like that gets a bit too abstract, too quickly.

agwpe_test.go

@@ -5,93 +5,52 @@ import (
 	"time"
 )
 
+// NOTE(m): Use more table-driven-tests? At the moment this feels less abstract.
+
 func TestNewPacketEngine(t *testing.T) {
-	tests := []struct {
+	// Default configuration
-		name            string
+	engine, err := NewPacketEngine("localhost:1234")
-		address         string
+	if err != nil {
-		options         []Option
+		t.Errorf("Did not expect error: %v", err)
-		expectedError   bool
+	}
-		expectedTimeout time.Duration
+	if engine.cfg.Timeout != 5*time.Second {
-	}{
+		t.Errorf("Expected 5 second timeout, got %v", engine.cfg.Timeout)
-		{
+	}
-			name:            "Default configuration",
+	if engine.Ready {
-			address:         "localhost:1234",
+		t.Error("Expected engine that is not ready")
-			options:         []Option{},
-			expectedError:   false,
-			expectedTimeout: 5 * time.Second,
-		},
-		{
-			name:            "Custom timeout",
-			address:         "localhost:1234",
-			options:         []Option{WithTimeout(30 * time.Second)},
-			expectedError:   false,
-			expectedTimeout: 30 * time.Second,
-		},
 	}
 
-	for _, tt := range tests {
+	// Custom timeout
-		t.Run(tt.name, func(t *testing.T) {
+	engine, err = NewPacketEngine("localhost:1234", WithTimeout(30*time.Second))
-			engine, err := NewPacketEngine(tt.address, tt.options...)
+	if err != nil {
-
+		t.Errorf("Did not expect error: %v", err)
-			if (err != nil) != tt.expectedError {
+	}
-				t.Errorf("Expected error: %v, got: %v", tt.expectedError, err)
+	if engine.cfg.Timeout != 30*time.Second {
-			}
+		t.Errorf("Expected 30 second timeout, got %v", engine.cfg.Timeout)
-
-			if !tt.expectedError {
-				if engine == nil {
-					t.Fatal("Expected non-nil engine")
-				}
-				if engine.Ready {
-					t.Fatal("Expected engine that is not ready")
-				}
-				if engine.cfg.Timeout != tt.expectedTimeout {
-					t.Errorf("Expected timeout %v, got %v", tt.expectedTimeout, engine.cfg.Timeout)
-				}
-			}
-
-		})
 	}
 }
 
-func TestConnect(t *testing.T) {
+func TestNewPacketEngine_Connect(t *testing.T) {
-	tests := []struct {
+	// Successful connect
-		name          string
+	engine, _ := NewPacketEngine("localhost:1234")
-		address       string
+	err := engine.Connect()
-		options       []Option
+	if err != nil {
-		expectedError bool
+		t.Errorf("Did not expect error: %v", err)
-	}{
-		{
-			name:          "Successful connection",
-			address:       "localhost:1234",
-			expectedError: false,
-		},
-		{
-			name:          "Invalid address",
-			address:       "invalid-address",
-			expectedError: true,
-		},
 	}
 
-	for _, tt := range tests {
+	// Invalid address
-		t.Run(tt.name, func(t *testing.T) {
+	engine, _ = NewPacketEngine("invalid-address")
-			engine, _ := NewPacketEngine(tt.address, tt.options...)
+	err = engine.Connect()
-			err := engine.Connect()
+	if err == nil {
-
+		t.Error("Expected an error")
-			if tt.expectedError && (err == nil) {
-				t.Errorf("Expected error: %v, got: %v", tt.expectedError, err)
-			}
-
-			if !tt.expectedError && (err != nil) {
-				t.Errorf("Did not expect error: %v", err)
-			}
-		})
 	}
 }
 
-func TestDisconnect(t *testing.T) {
+func TestNewPacketEngine_Disconnect(t *testing.T) {
 	engine, _ := NewPacketEngine("localhost:1234")
 	engine.Connect()
 
+	// Disconnect connected engine
 	err := engine.Disconnect()
 	if err != nil {
 		t.Errorf("Did not expect error: %v", err)
@@ -100,6 +59,6 @@ func TestDisconnect(t *testing.T) {
 	// Call to Disconnect() on disconnected packet engine should return an error
 	err = engine.Disconnect()
 	if err == nil {
-		t.Error("Expected an error, but got", nil)
+		t.Error("Expected an error")
 	}
 }