simplify, tighten some tests

Author: theodore-s-beers

checks/jq_test.go

@@ -2,7 +2,6 @@ package checks
 
 import (
 	"reflect"
-	"strings"
 	"testing"
 
 	api "github.com/bootdotdev/bootdev/client"
@@ -15,7 +14,7 @@ func TestRunStdoutJqQuery(t *testing.T) {
 		test      api.StdoutJqTest
 		variables map[string]string
 		want      api.CLICommandJqOutput
-		wantError string
+		wantError bool
 	}{
 		{
 			name:   "queries json with interpolated query",
@@ -52,7 +51,7 @@ func TestRunStdoutJqQuery(t *testing.T) {
 			want: api.CLICommandJqOutput{
 				Query: `.name`,
 			},
-			wantError: "invalid character",
+			wantError: true,
 		},
 		{
 			name:   "returns jq error",
@@ -63,20 +62,20 @@ func TestRunStdoutJqQuery(t *testing.T) {
 			},
 			want: api.CLICommandJqOutput{
 				Query: `.name[`,
-				Error: "unexpected EOF",
 			},
+			wantError: true,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := runStdoutJqQuery(tt.stdout, tt.test, tt.variables)
-			if tt.wantError != "" {
+			if tt.wantError {
 				if got.Query != tt.want.Query {
 					t.Fatalf("Query = %q, want %q", got.Query, tt.want.Query)
 				}
-				if !strings.Contains(got.Error, tt.wantError) {
-					t.Fatalf("expected error containing %q, got %q", tt.wantError, got.Error)
+				if got.Error == "" {
+					t.Fatal("expected an error")
 				}
 				return
 			}

checks/local_test.go

@@ -73,28 +73,19 @@ func TestLocalSubmissionEventReportsFirstFailure(t *testing.T) {
 	}
 }
 
-func TestEvaluateCLICommandReportsStdoutVariableParseError(t *testing.T) {
-	cliData := api.CLIData{Steps: []api.CLIStep{
-		{CLICommand: &api.CLIStepCLICommand{Tests: []api.CLICommandTest{
-			{ExitCode: intPtr(0)},
-		}}},
-	}}
-	results := []api.CLIStepResult{
-		{CLICommandResult: &api.CLICommandResult{
-			ExitCode: 0,
-			Err:      "invalid stdout variable configuration",
-		}},
-	}
+func TestEvaluateCLICommandReportsExecutionError(t *testing.T) {
+	const message = "invalid stdout variable configuration"
+	failure := evaluateCLICommandTests(
+		0,
+		api.CLIStepCLICommand{},
+		api.CLICommandResult{Err: message},
+	)
 
-	event := LocalSubmissionEvent(cliData, results)
-	if event.ResultSlug != api.VerificationResultSlugFailure {
-		t.Fatalf("ResultSlug = %q, want failure", event.ResultSlug)
-	}
-	if event.StructuredErrCLI == nil {
+	if failure == nil {
 		t.Fatal("expected structured failure")
 	}
-	if event.StructuredErrCLI.ErrorMessage != "invalid stdout variable configuration" {
-		t.Fatalf("ErrorMessage = %q, want stdout variable error", event.StructuredErrCLI.ErrorMessage)
+	if failure.ErrorMessage != message {
+		t.Fatalf("ErrorMessage = %q, want %q", failure.ErrorMessage, message)
 	}
 }
 

checks/runner_test.go

@@ -3,6 +3,7 @@ package checks
 import (
 	"net/http"
 	"net/http/httptest"
+	"reflect"
 	"testing"
 
 	api "github.com/bootdotdev/bootdev/client"
@@ -155,64 +156,26 @@ func TestApplySubmissionResultsStopsAfterFailedHTTPTest(t *testing.T) {
 
 func applySubmissionResultsMessages(cliData api.CLIData, failure *api.StructuredErrCLI) []tea.Msg {
 	ch := make(chan tea.Msg)
-	done := make(chan struct{})
 	go func() {
 		defer close(ch)
-		defer close(done)
 		ApplySubmissionResults(cliData, failure, ch)
 	}()
 
 	var msgs []tea.Msg
 	for msg := range ch {
 		msgs = append(msgs, msg)
 	}
-	<-done
 	return msgs
 }
 
 func assertMessages(t *testing.T, got []tea.Msg, want []tea.Msg) {
 	t.Helper()
 
-	if len(got) != len(want) {
-		t.Fatalf("got %d messages, want %d\ngot: %#v\nwant: %#v", len(got), len(want), got, want)
-	}
-	for i := range want {
-		assertMessage(t, i, got[i], want[i])
-	}
-}
-
-func assertMessage(t *testing.T, index int, got tea.Msg, want tea.Msg) {
-	t.Helper()
-
-	switch want := want.(type) {
-	case messages.ResolveStepMsg:
-		got, ok := got.(messages.ResolveStepMsg)
-		if !ok {
-			t.Fatalf("message %d = %T, want %T", index, got, want)
-		}
-		if got.Index != want.Index || !sameBoolPtr(got.Passed, want.Passed) {
-			t.Fatalf("message %d = %#v, want %#v", index, got, want)
-		}
-	case messages.ResolveTestMsg:
-		got, ok := got.(messages.ResolveTestMsg)
-		if !ok {
-			t.Fatalf("message %d = %T, want %T", index, got, want)
-		}
-		if got.StepIndex != want.StepIndex || got.TestIndex != want.TestIndex || !sameBoolPtr(got.Passed, want.Passed) {
-			t.Fatalf("message %d = %#v, want %#v", index, got, want)
-		}
-	default:
-		t.Fatalf("unsupported wanted message type %T", want)
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("messages = %#v, want %#v", got, want)
 	}
 }
 
 func boolPtr(v bool) *bool {
 	return &v
 }
-
-func sameBoolPtr(a *bool, b *bool) bool {
-	if a == nil || b == nil {
-		return a == b
-	}
-	return *a == *b
-}

render/variables_test.go

@@ -35,13 +35,7 @@ func TestHTTPVariableSections(t *testing.T) {
 		},
 	}
 
-	got := renderVariableSection("Variables Saved", savedVariablesForHTTPResult(result))
-	got += renderVariableSection("Variables Missing", missingSaveVariablesForHTTPResult(result))
-	available, expectsVariables := availableVariablesForHTTPResult(result)
-	if !expectsVariables {
-		t.Fatalf("expected HTTP request to use variables")
-	}
-	got += renderVariableSection("Variables Available", available)
+	got := printHTTPRequestResult(result)
 
 	wantContains := []string{
 		"Variables Saved:",