mirror of
https://github.com/go-i2p/go-i2ptunnel.git
synced 2025-12-20 15:15:52 -05:00
Refactor test files for improved readability and consistency
This commit is contained in:
eyedeekay
@@ -1,129 +1,129 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// createTestConfig creates a temporary config file with the given parameters
|
||||
func createTestConfig(t *testing.T, name, tunnelType, target string, port int) string {
|
||||
configDir := t.TempDir()
|
||||
configFile := filepath.Join(configDir, fmt.Sprintf("%s.yaml", name))
|
||||
configDir := t.TempDir()
|
||||
configFile := filepath.Join(configDir, fmt.Sprintf("%s.yaml", name))
|
||||
|
||||
// YAML format requires tunnels: map with tunnel name as key
|
||||
configContent := fmt.Sprintf(`tunnels:
|
||||
// YAML format requires tunnels: map with tunnel name as key
|
||||
configContent := fmt.Sprintf(`tunnels:
|
||||
%s:
|
||||
name: %s
|
||||
type: %s
|
||||
interface: 127.0.0.1
|
||||
port: %d`, name, name, tunnelType, port)
|
||||
|
||||
if target != "" {
|
||||
configContent += fmt.Sprintf(`
|
||||
if target != "" {
|
||||
configContent += fmt.Sprintf(`
|
||||
target: %s`, target)
|
||||
}
|
||||
}
|
||||
|
||||
configContent += "\n"
|
||||
configContent += "\n"
|
||||
|
||||
if err := os.WriteFile(configFile, []byte(configContent), 0644); err != nil {
|
||||
t.Fatalf("Failed to write config file: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(configFile, []byte(configContent), 0644); err != nil {
|
||||
t.Fatalf("Failed to write config file: %v", err)
|
||||
}
|
||||
|
||||
return configFile
|
||||
return configFile
|
||||
}
|
||||
|
||||
// TestConfigServeHTTPGet tests the GET request for configuration display
|
||||
func TestConfigServeHTTPGet(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/test-tcp-client/config", nil)
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/test-tcp-client/config", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
cfg.ServeHTTP(w, req)
|
||||
cfg.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("Expected status 200, got %d", w.Code)
|
||||
}
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("Expected status 200, got %d", w.Code)
|
||||
}
|
||||
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "test-tcp-client") {
|
||||
t.Errorf("Response should contain tunnel name")
|
||||
}
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "test-tcp-client") {
|
||||
t.Errorf("Response should contain tunnel name")
|
||||
}
|
||||
}
|
||||
|
||||
// TestConfigServeHTTPPost tests saving configuration changes
|
||||
func TestConfigServeHTTPPost(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
|
||||
// Test POST request with new config
|
||||
formData := url.Values{}
|
||||
formData.Set("host", "localhost")
|
||||
formData.Set("port", "9090")
|
||||
// Test POST request with new config
|
||||
formData := url.Values{}
|
||||
formData.Set("host", "localhost")
|
||||
formData.Set("port", "9090")
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/config", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/config", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
cfg.ServeHTTP(w, req)
|
||||
cfg.ServeHTTP(w, req)
|
||||
|
||||
// Should redirect on success
|
||||
if w.Code != http.StatusSeeOther {
|
||||
t.Logf("Response body: %s", w.Body.String())
|
||||
t.Errorf("Expected status 303 (redirect), got %d", w.Code)
|
||||
}
|
||||
// Should redirect on success
|
||||
if w.Code != http.StatusSeeOther {
|
||||
t.Logf("Response body: %s", w.Body.String())
|
||||
t.Errorf("Expected status 303 (redirect), got %d", w.Code)
|
||||
}
|
||||
}
|
||||
|
||||
// TestConfigServeHTTPPostInvalidPort tests validation of invalid port numbers
|
||||
func TestConfigServeHTTPPostInvalidPort(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
port string
|
||||
wantCode int
|
||||
}{
|
||||
{"invalid port text", "abc", http.StatusBadRequest},
|
||||
{"port too low", "0", http.StatusBadRequest},
|
||||
{"port too high", "99999", http.StatusBadRequest},
|
||||
}
|
||||
testCases := []struct {
|
||||
name string
|
||||
port string
|
||||
wantCode int
|
||||
}{
|
||||
{"invalid port text", "abc", http.StatusBadRequest},
|
||||
{"port too low", "0", http.StatusBadRequest},
|
||||
{"port too high", "99999", http.StatusBadRequest},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
formData := url.Values{}
|
||||
formData.Set("port", tc.port)
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
formData := url.Values{}
|
||||
formData.Set("port", tc.port)
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/config", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/config", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
cfg.ServeHTTP(w, req)
|
||||
cfg.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != tc.wantCode {
|
||||
t.Errorf("Expected status %d, got %d", tc.wantCode, w.Code)
|
||||
}
|
||||
})
|
||||
}
|
||||
if w.Code != tc.wantCode {
|
||||
t.Errorf("Expected status %d, got %d", tc.wantCode, w.Code)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestConfigServeHTTPPostWhileRunning tests that config cannot be changed while tunnel is running
|
||||
@@ -161,31 +161,31 @@ func TestConfigServeHTTPPostWhileRunning(t *testing.T) {
|
||||
if !strings.Contains(body, "running") {
|
||||
t.Errorf("Error message should mention tunnel is running")
|
||||
}
|
||||
}// TestNewConfig tests config creation from file
|
||||
} // TestNewConfig tests config creation from file
|
||||
func TestNewConfig(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
cfg, err := NewConfig(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config: %v", err)
|
||||
}
|
||||
|
||||
if cfg == nil {
|
||||
t.Fatal("Expected non-nil config")
|
||||
}
|
||||
if cfg == nil {
|
||||
t.Fatal("Expected non-nil config")
|
||||
}
|
||||
|
||||
if cfg.configPath != configFile {
|
||||
t.Errorf("Expected configPath %s, got %s", configFile, cfg.configPath)
|
||||
}
|
||||
if cfg.configPath != configFile {
|
||||
t.Errorf("Expected configPath %s, got %s", configFile, cfg.configPath)
|
||||
}
|
||||
}
|
||||
|
||||
// TestNewConfigInvalidFile tests handling of invalid config files
|
||||
func TestNewConfigInvalidFile(t *testing.T) {
|
||||
cfg, err := NewConfig("/nonexistent/path/config.yaml")
|
||||
if err == nil {
|
||||
t.Error("Expected error for non-existent file")
|
||||
}
|
||||
if cfg != nil {
|
||||
t.Error("Expected nil config for non-existent file")
|
||||
}
|
||||
cfg, err := NewConfig("/nonexistent/path/config.yaml")
|
||||
if err == nil {
|
||||
t.Error("Expected error for non-existent file")
|
||||
}
|
||||
if cfg != nil {
|
||||
t.Error("Expected nil config for non-existent file")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"strings"
|
||||
"testing"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// TestControllerServeHTTPGet tests the GET request for control page
|
||||
func TestControllerServeHTTPGet(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/test-tcp-client/control", nil)
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/test-tcp-client/control", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
controller.ServeHTTP(w, req)
|
||||
controller.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("Expected status 200, got %d", w.Code)
|
||||
}
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("Expected status 200, got %d", w.Code)
|
||||
}
|
||||
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "test-tcp-client") {
|
||||
t.Errorf("Response should contain tunnel name")
|
||||
}
|
||||
if !strings.Contains(body, "stopped") {
|
||||
t.Errorf("Response should show tunnel status")
|
||||
}
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "test-tcp-client") {
|
||||
t.Errorf("Response should contain tunnel name")
|
||||
}
|
||||
if !strings.Contains(body, "stopped") {
|
||||
t.Errorf("Response should show tunnel status")
|
||||
}
|
||||
}
|
||||
|
||||
// TestControllerStart tests starting a tunnel via POST
|
||||
@@ -109,86 +109,88 @@ func TestControllerStop(t *testing.T) {
|
||||
func TestControllerRestart(t *testing.T) {
|
||||
t.Skip("Skipping test that requires I2P router connection - known i2cp.leaseSetEncType duplicate parameter issue")
|
||||
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
defer controller.Stop()
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
// Start tunnel first
|
||||
if err := controller.Start(); err != nil {
|
||||
t.Fatalf("Failed to start tunnel: %v", err)
|
||||
}
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
defer controller.Stop()
|
||||
|
||||
formData := url.Values{}
|
||||
formData.Set("action", "Restart")
|
||||
// Start tunnel first
|
||||
if err := controller.Start(); err != nil {
|
||||
t.Fatalf("Failed to start tunnel: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/control", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
formData := url.Values{}
|
||||
formData.Set("action", "Restart")
|
||||
|
||||
controller.ServeHTTP(w, req)
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/control", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
// Should redirect on success
|
||||
if w.Code != http.StatusSeeOther {
|
||||
t.Errorf("Expected status 303 (redirect), got %d", w.Code)
|
||||
}
|
||||
controller.ServeHTTP(w, req)
|
||||
|
||||
// Verify tunnel is running after restart
|
||||
status := controller.Status()
|
||||
if status != "running" {
|
||||
t.Errorf("Expected tunnel to be running after restart, got status: %s", status)
|
||||
}
|
||||
// Should redirect on success
|
||||
if w.Code != http.StatusSeeOther {
|
||||
t.Errorf("Expected status 303 (redirect), got %d", w.Code)
|
||||
}
|
||||
|
||||
// Verify tunnel is running after restart
|
||||
status := controller.Status()
|
||||
if status != "running" {
|
||||
t.Errorf("Expected tunnel to be running after restart, got status: %s", status)
|
||||
}
|
||||
}
|
||||
|
||||
// TestControllerInvalidAction tests handling of invalid actions
|
||||
func TestControllerInvalidAction(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
|
||||
formData := url.Values{}
|
||||
formData.Set("action", "InvalidAction")
|
||||
formData := url.Values{}
|
||||
formData.Set("action", "InvalidAction")
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/control", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/test-tcp-client/control", strings.NewReader(formData.Encode()))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
controller.ServeHTTP(w, req)
|
||||
controller.ServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusBadRequest {
|
||||
t.Errorf("Expected status 400, got %d", w.Code)
|
||||
}
|
||||
if w.Code != http.StatusBadRequest {
|
||||
t.Errorf("Expected status 400, got %d", w.Code)
|
||||
}
|
||||
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "Unknown action") {
|
||||
t.Errorf("Error message should mention unknown action")
|
||||
}
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "Unknown action") {
|
||||
t.Errorf("Error message should mention unknown action")
|
||||
}
|
||||
}
|
||||
|
||||
// TestMiniServeHTTP tests the mini control widget rendering
|
||||
func TestMiniServeHTTP(t *testing.T) {
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
configFile := createTestConfig(t, "test-tcp-client", "tcpclient", "example.i2p", 8080)
|
||||
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/home", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
controller.MiniServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("Expected status 200, got %d", w.Code)
|
||||
}
|
||||
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "test-tcp-client") {
|
||||
t.Errorf("Response should contain tunnel name")
|
||||
}
|
||||
controller, err := NewController(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create controller: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/home", nil)
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
controller.MiniServeHTTP(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Errorf("Expected status 200, got %d", w.Code)
|
||||
}
|
||||
|
||||
body := w.Body.String()
|
||||
if !strings.Contains(body, "test-tcp-client") {
|
||||
t.Errorf("Response should contain tunnel name")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user