simplify test code

Author: theodore-s-beers

checks/http_test.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"slices"
 	"strings"
 	"testing"
 
@@ -47,14 +48,9 @@ func TestInterpolateVariables(t *testing.T) {
 func TestInterpolationNames(t *testing.T) {
 	got := InterpolationNames("${baseURL}/users/${id}/${id}")
 	want := []string{"baseURL", "id", "id"}
-	if len(got) != len(want) {
+	if !slices.Equal(got, want) {
 		t.Fatalf("InterpolationNames() = %#v, want %#v", got, want)
 	}
-	for i := range want {
-		if got[i] != want[i] {
-			t.Fatalf("InterpolationNames() = %#v, want %#v", got, want)
-		}
-	}
 }
 
 func TestRunHTTPRequestInterpolatesRequestAndCapturesResponseVariables(t *testing.T) {

checks/local_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	api "github.com/bootdotdev/bootdev/client"
+	"github.com/goccy/go-json"
 )
 
 func TestLocalSubmissionEventPassesCLIAndHTTPResults(t *testing.T) {
@@ -256,7 +257,7 @@ func TestValuesEqualPreservesTypes(t *testing.T) {
 		{name: "string and bool", got: "true", want: true, ok: false},
 		{name: "same bools", got: true, want: true, ok: true},
 		{name: "numeric int and float", got: 1, want: 1.0, ok: true},
-		{name: "numeric json number and int", got: testJSONNumber("1"), want: 1, ok: true},
+		{name: "numeric json number and int", got: json.Number("1"), want: 1, ok: true},
 		{name: "nil and string", got: nil, want: "<nil>", ok: false},
 	}
 
@@ -269,12 +270,6 @@ func TestValuesEqualPreservesTypes(t *testing.T) {
 	}
 }
 
-type testJSONNumber string
-
-func (n testJSONNumber) String() string {
-	return string(n)
-}
-
 func intPtr(v int) *int {
 	return &v
 }

checks/runner_test.go

@@ -146,7 +146,9 @@ func TestApplySubmissionResultsMarksAllStepsAndTestsPassedWhenNoFailure(t *testi
 		messages.ResolveTestMsg{StepIndex: 1, TestIndex: 0, Passed: boolPtr(true)},
 	}
 
-	assertMessages(t, got, want)
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("messages = %#v, want %#v", got, want)
+	}
 }
 
 func TestApplySubmissionResultsStopsAfterFailedCLITest(t *testing.T) {
@@ -166,7 +168,9 @@ func TestApplySubmissionResultsStopsAfterFailedCLITest(t *testing.T) {
 		messages.ResolveTestMsg{StepIndex: 1, TestIndex: 1, Passed: boolPtr(false)},
 	}
 
-	assertMessages(t, got, want)
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("messages = %#v, want %#v", got, want)
+	}
 }
 
 func applySubmissionResultsMessages(cliData api.CLIData, failure *api.StructuredErrCLI) []tea.Msg {
@@ -177,14 +181,6 @@ func applySubmissionResultsMessages(cliData api.CLIData, failure *api.Structured
 	return msgs
 }
 
-func assertMessages(t *testing.T, got []tea.Msg, want []tea.Msg) {
-	t.Helper()
-
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("messages = %#v, want %#v", got, want)
-	}
-}
-
 func boolPtr(v bool) *bool {
 	return &v
 }

cmd/login_test.go

@@ -59,6 +59,11 @@ func TestLoginHTTPHandlerRejectsMissingOrigin(t *testing.T) {
 	if response.Code != http.StatusForbidden {
 		t.Fatalf("status = %d, want %d", response.Code, http.StatusForbidden)
 	}
+	select {
+	case code := <-inputChan:
+		t.Fatalf("unexpected login code accepted: %q", code)
+	default:
+	}
 }
 
 func TestLoginHTTPHandlerLimitsCodeSize(t *testing.T) {