refactor: make all tests more uniform

Author: mallardduck

pkg/teapot/additional_methods_test.go

@@ -179,9 +179,7 @@ func TestMustURLPanic(t *testing.T) {
 		r.MustURL("nonexistent.route")
 	})
 
-	if msg == "" {
-		t.Error("expected MustURL to panic for nonexistent route")
-	}
+	assert.NotEmpty(t, msg, "expected MustURL to panic for nonexistent route")
 }
 
 // Test: Query and QueryValue chaining

tests/late_propagation_test.go

@@ -5,6 +5,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/mallardduck/teapot-router/internal/testutil"
 	"github.com/mallardduck/teapot-router/pkg/teapot"
 )
@@ -30,31 +33,21 @@ func TestLatePropagation(t *testing.T) {
 			break
 		}
 	}
-	if !foundSub {
-		t.Errorf("Expected to find propagated route /api/hello in main router")
-	}
+	assert.True(t, foundSub, "Expected to find propagated route /api/hello in main router")
 
 	// 5. Verify URL generation
 	url, err := r.URL("sub.hello")
-	if err != nil {
-		t.Fatalf("Failed to generate URL for propagated route: %v", err)
-	}
-	if url != "/api/hello" {
-		t.Errorf("Expected URL /api/hello, got %s", url)
-	}
+	require.NoError(t, err, "Failed to generate URL for propagated route")
+	assert.Equal(t, "/api/hello", url)
 
 	// 6. Verify functional routing
 	ts := httptest.NewServer(r)
 	defer ts.Close()
 
 	res, err := http.Get(ts.URL + "/api/hello")
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		t.Errorf("Expected status OK, got %d", res.StatusCode)
-	}
+	assert.Equal(t, http.StatusOK, res.StatusCode, "Expected status OK, got %d", res.StatusCode)
 }
 
 func TestLatePropagation_Homing(t *testing.T) {
@@ -71,12 +64,8 @@ func TestLatePropagation_Homing(t *testing.T) {
 
 	// Verify propagation
 	url, err := r.URL("sub.world")
-	if err != nil {
-		t.Fatalf("Failed to generate URL for late-added route: %v", err)
-	}
-	if url != "/v1/world" {
-		t.Errorf("Expected URL /v1/world, got %s", url)
-	}
+	require.NoError(t, err, "Failed to generate URL for late-added route")
+	assert.Equal(t, "/v1/world", url)
 }
 
 func TestLatePropagation_DeepHoming(t *testing.T) {
@@ -90,10 +79,6 @@ func TestLatePropagation_DeepHoming(t *testing.T) {
 	r3.GET("/users", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})).Name("users.index")
 
 	url, err := r1.URL("users.index")
-	if err != nil {
-		t.Fatalf("Failed to generate URL for deep homing: %v", err)
-	}
-	if url != "/api/v1/users" {
-		t.Errorf("Expected URL /api/v1/users, got %s", url)
-	}
+	require.NoError(t, err, "Failed to generate URL for deep homing")
+	assert.Equal(t, "/api/v1/users", url)
 }

tests/mount_naming_test.go

@@ -3,6 +3,9 @@ package tests
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/mallardduck/teapot-router/internal/testutil"
 	"github.com/mallardduck/teapot-router/pkg/teapot"
 )
@@ -45,23 +48,15 @@ func TestMountWithNamePrefix(t *testing.T) {
 	r.MountNamed("/v1", "api.v1", sub)
 
 	_, err = r.URL("api.v1.list")
-	if err != nil {
-		t.Logf("Expected api.v1.list but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found api.v1.list")
-	}
+	require.NoError(t, err, "Expected api.v1.list to be found")
+	t.Log("Successfully found api.v1.list")
 
 	// Test Homing with MountNamed
 	sub.GET("/profile", handler).Name("profile")
 
 	_, err = r.URL("api.v1.profile")
-	if err != nil {
-		t.Logf("Expected api.v1.profile but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found api.v1.profile")
-	}
+	require.NoError(t, err, "Expected api.v1.profile to be found")
+	t.Log("Successfully found api.v1.profile")
 
 	// Test Mount with .Name() builder
 	sub2 := teapot.New()
@@ -70,22 +65,14 @@ func TestMountWithNamePrefix(t *testing.T) {
 	r.Mount("/v2", sub2).Name("api.v2")
 
 	_, err = r.URL("api.v2.list")
-	if err != nil {
-		t.Logf("Expected api.v2.list but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found api.v2.list")
-	}
+	require.NoError(t, err, "Expected api.v2.list to be found")
+	t.Log("Successfully found api.v2.list")
 
 	// Test Homing with Mount builder
 	sub2.GET("/detail", handler).Name("detail")
 	_, err = r.URL("api.v2.detail")
-	if err != nil {
-		t.Logf("Expected api.v2.detail but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found api.v2.detail")
-	}
+	require.NoError(t, err, "Expected api.v2.detail to be found")
+	t.Log("Successfully found api.v2.detail")
 
 	// Test Hierarchical Mount builder
 	r0 := teapot.New()
@@ -98,12 +85,8 @@ func TestMountWithNamePrefix(t *testing.T) {
 
 	// Current name should be p0.p1.list
 	_, err = r0.URL("p0.p1.list")
-	if err != nil {
-		t.Logf("Expected p0.p1.list but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found p0.p1.list")
-	}
+	require.NoError(t, err, "Expected p0.p1.list to be found")
+	t.Log("Successfully found p0.p1.list")
 
 	// Now RENAME the mount in r1
 	// Find the mount builder? Wait, Mount returns a new one each time.
@@ -112,27 +95,16 @@ func TestMountWithNamePrefix(t *testing.T) {
 
 	// Check r0 again. Should have p0.p1_new.list
 	_, err = r0.URL("p0.p1_new.list")
-	if err != nil {
-		t.Logf("Expected p0.p1_new.list but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found p0.p1_new.list")
-	}
+	require.NoError(t, err, "Expected p0.p1_new.list to be found")
+	t.Log("Successfully found p0.p1_new.list")
 
 	// What happens to the old name? It should be gone.
 	_, err = r0.URL("p0.p1.list")
-	if err == nil {
-		t.Log("Expected p0.p1.list to be gone, but it's still there")
-		t.Fail()
-	}
+	assert.Error(t, err, "Expected p0.p1.list to be gone, but it's still there")
 
 	// Test deep homing with prefix change
 	r2.GET("/r4", handler).Name("new_route")
 	_, err = r0.URL("p0.p1_new.new_route")
-	if err != nil {
-		t.Logf("Expected p0.p1_new.new_route but got error: %v", err)
-		t.Fail()
-	} else {
-		t.Log("Successfully found p0.p1_new.new_route")
-	}
+	require.NoError(t, err, "Expected p0.p1_new.new_route to be found")
+	t.Log("Successfully found p0.p1_new.new_route")
 }

tests/router_improvements_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/mallardduck/teapot-router/pkg/teapot"
 )
@@ -22,22 +23,14 @@ func TestRouterImprovements(t *testing.T) {
 		defer ts.Close()
 
 		res, err := http.Get(ts.URL + "/test")
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 		defer res.Body.Close()
-		if res.StatusCode != http.StatusOK {
-			t.Errorf("expected OK, got %v", res.Status)
-		}
+		assert.Equal(t, http.StatusOK, res.StatusCode, "expected OK, got %v", res.Status)
 
 		// Verify name registration
 		url, err := r.URL("test")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if url != "/test" {
-			t.Errorf("expected /test, got %q", url)
-		}
+		require.NoError(t, err)
+		assert.Equal(t, "/test", url)
 	})
 
 	t.Run("RegisterExternal (phantom routes)", func(t *testing.T) {
@@ -52,28 +45,20 @@ func TestRouterImprovements(t *testing.T) {
 				break
 			}
 		}
-		if !found {
-			t.Error("RegisterExternal route not found in Routes()")
-		}
+		assert.True(t, found, "RegisterExternal route not found in Routes()")
 
 		// Verify URL generation works for phantom routes
 		url, err := r.URL("ext")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if url != "/external" {
-			t.Errorf("expected /external, got %q", url)
-		}
+		require.NoError(t, err)
+		assert.Equal(t, "/external", url)
 
 		// Verify it doesn't actually dispatch
 		ts := httptest.NewServer(r)
 		defer ts.Close()
 		res, err := http.Get(ts.URL + "/external")
 		assert.NoError(t, err)
 		defer res.Body.Close()
-		if res.StatusCode != http.StatusNotFound {
-			t.Errorf("expected 404 for phantom route, got %v", res.Status)
-		}
+		assert.Equal(t, http.StatusNotFound, res.StatusCode, "expected 404 for phantom route, got %v", res.Status)
 	})
 
 	t.Run("Mount propagation", func(t *testing.T) {
@@ -91,18 +76,12 @@ func TestRouterImprovements(t *testing.T) {
 				break
 			}
 		}
-		if !found {
-			t.Error("Mounted route not propagated correctly")
-		}
+		assert.True(t, found, "Mounted route not propagated correctly")
 
 		// Verify URL generation in parent
 		url, err := parent.URL("hello")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if url != "/api/hello" {
-			t.Errorf("expected /api/hello, got %q", url)
-		}
+		require.NoError(t, err)
+		assert.Equal(t, "/api/hello", url)
 	})
 
 	t.Run("SubRouter", func(t *testing.T) {
@@ -118,18 +97,12 @@ func TestRouterImprovements(t *testing.T) {
 				break
 			}
 		}
-		if !found {
-			t.Error("SubRouter route not propagated correctly")
-		}
+		assert.True(t, found, "SubRouter route not propagated correctly")
 
 		// Verify URL generation in parent
 		url, err := r.URL("dash")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if url != "/admin/dashboard" {
-			t.Errorf("expected /admin/dashboard, got %q", url)
-		}
+		require.NoError(t, err)
+		assert.Equal(t, "/admin/dashboard", url)
 	})
 
 	t.Run("SubRouter with wildcards", func(t *testing.T) {
@@ -138,12 +111,8 @@ func TestRouterImprovements(t *testing.T) {
 		sub.GET("/{bucket}/{key:.*}", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})).Name("get_file")
 
 		url, err := r.URL("get_file", "bucket", "mybucket", "key", "path/to/file.txt")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if url != "/files/mybucket/path/to/file.txt" {
-			t.Errorf("expected /files/mybucket/path/to/file.txt, got %q", url)
-		}
+		require.NoError(t, err)
+		assert.Equal(t, "/files/mybucket/path/to/file.txt", url)
 	})
 
 	t.Run("AggregateRoutes", func(t *testing.T) {
@@ -154,8 +123,6 @@ func TestRouterImprovements(t *testing.T) {
 		r2.GET("/r2", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
 
 		combined := teapot.AggregateRoutes(r1, r2)
-		if len(combined) != 2 {
-			t.Errorf("expected 2 routes, got %d", len(combined))
-		}
+		assert.Len(t, combined, 2)
 	})
 }