further test cleanup

Author: theodore-s-beers

checks/cli_test.go

@@ -122,7 +122,7 @@ func TestRunCLICommandInterpolatesCapturedStdoutVariables(t *testing.T) {
 	}
 }
 
-func TestParseStdoutVariablesUsesGenericConfigurationError(t *testing.T) {
+func TestParseStdoutVariablesRejectsInvalidConfiguration(t *testing.T) {
 	tests := []struct {
 		name   string
 		vardef api.CLICommandStdoutVariable
@@ -152,9 +152,6 @@ func TestParseStdoutVariablesUsesGenericConfigurationError(t *testing.T) {
 			if err == nil {
 				t.Fatal("expected parse error")
 			}
-			if err.Error() != "invalid stdout variable configuration" {
-				t.Fatalf("error = %q, want invalid stdout variable configuration", err.Error())
-			}
 		})
 	}
 }

checks/local_test.go

@@ -93,23 +93,6 @@ func TestEvaluateCLICommandReportsExecutionError(t *testing.T) {
 	}
 }
 
-func TestEvaluateStdoutJq(t *testing.T) {
-	err := evaluateStdoutJq(
-		"{\"ok\":true}",
-		api.StdoutJqTest{
-			InputMode: "json",
-			Query:     ".ok",
-			ExpectedResults: []api.JqExpectedResult{
-				{Type: api.JqTypeBool, Operator: "==", Value: true},
-			},
-		},
-		map[string]string{},
-	)
-	if err != nil {
-		t.Fatalf("unexpected jq failure: %v", err)
-	}
-}
-
 func TestEvaluateStdoutJqNumericComparisons(t *testing.T) {
 	for _, tt := range []struct {
 		operator api.JqOperator
@@ -360,6 +343,7 @@ func TestEvaluateStdoutJqResultTypes(t *testing.T) {
 		{"fractional expected", "6", api.JqTypeInt, ">", 5.5, false},
 		{"exact large integer", "9007199254740992", api.JqTypeInt, "==", json.Number("9007199254740993"), false},
 		{"out of range float", "0", api.JqTypeInt, "<=", -float64(math.MinInt), false},
+		{"boolean", "true", api.JqTypeBool, "==", true, true},
 		{"boolean strings", `"true"`, api.JqTypeBool, "==", "true", true},
 		{"invalid boolean", `"yes"`, api.JqTypeBool, "==", true, false},
 		{"interpolated string", `"5"`, api.JqTypeString, "==", "${value}", true},

cmd/localtest_test.go

@@ -11,18 +11,9 @@ import (
 
 func TestReadLocalCLIDataAcceptsLessonDirectory(t *testing.T) {
 	dir := t.TempDir()
-	manifest := []byte(`allowedOperatingSystems:
-  - linux
-  - darwin
-baseURLDefault: http://localhost:3000
-steps:
-  - description: Prints a greeting
-    cliCommand:
+	manifest := []byte(`steps:
+  - cliCommand:
       command: echo hello
-      tests:
-        - exitCode: 0
-        - stdoutContainsAll:
-            - hello
 `)
 	if err := os.WriteFile(filepath.Join(dir, "cli.yaml"), manifest, 0o600); err != nil {
 		t.Fatalf("failed to write test manifest: %v", err)
@@ -32,17 +23,8 @@ steps:
 	if err != nil {
 		t.Fatalf("readLocalCLIData() error = %v", err)
 	}
-	if data.BaseURLDefault != "http://localhost:3000" {
-		t.Fatalf("BaseURLDefault = %q, want localhost default", data.BaseURLDefault)
-	}
-	if len(data.Steps) != 1 || data.Steps[0].CLICommand == nil {
-		t.Fatalf("expected one CLI command step, got %#v", data.Steps)
-	}
-	if data.Steps[0].Description != "Prints a greeting" {
-		t.Fatalf("Description = %q, want manifest description", data.Steps[0].Description)
-	}
-	if len(data.Steps[0].CLICommand.Tests[1].StdoutContainsAll) != 1 {
-		t.Fatalf("expected stdoutContainsAll test to load")
+	if len(data.Steps) != 1 || data.Steps[0].CLICommand == nil || data.Steps[0].CLICommand.Command != "echo hello" {
+		t.Fatalf("expected one command loaded from cli.yaml, got %#v", data.Steps)
 	}
 }