Simplify assertion type

cmoog · cmoog · commit 3f11516da7cc · 2020-07-28T21:58:10.000-05:00
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -207,16 +207,14 @@ func (a Assertable) Assert(t *testing.T, option ...Assertion) {
 		slog.F("duration", cmdResult.Duration),
 	)
 
-	for _, o := range option {
-		o.Valid(t, &cmdResult)
+	for _, assertion := range option {
+		assertion(t, &cmdResult)
 	}
 }
 
 // Assertion specifies an assertion on the given CommandResult.
-// Pass custom Assertion types to cover special cases.
-type Assertion interface {
-	Valid(t *testing.T, r *CommandResult)
-}
+// Pass custom Assertion functions to cover special cases.
+type Assertion func(t *testing.T, r *CommandResult)
 
 // Named is an optional extension of Assertion that provides a helpful label
 // to *testing.T
@@ -231,20 +229,6 @@ type CommandResult struct {
 	Duration       time.Duration
 }
 
-type simpleFuncAssert struct {
-	valid func(t *testing.T, r *CommandResult)
-	name  string
-}
-
-func (s simpleFuncAssert) Valid(t *testing.T, r *CommandResult) {
-	slog.Helper()
-	s.valid(t, r)
-}
-
-func (s simpleFuncAssert) Name() string {
-	return s.name
-}
-
 // Success asserts that the command exited with an exit code of 0
 func Success() Assertion {
 	slog.Helper()
@@ -253,92 +237,68 @@ func Success() Assertion {
 
 // Error asserts that the command exited with a nonzero exit code
 func Error() Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			assert.True(t, "exit code is nonzero", r.ExitCode != 0)
-		},
-		name: fmt.Sprintf("error"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		assert.True(t, "exit code is nonzero", r.ExitCode != 0)
 	}
 }
 
 // ExitCodeIs asserts that the command exited with the given code
 func ExitCodeIs(code int) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			assert.Equal(t, "exit code is as expected", code, r.ExitCode)
-		},
-		name: fmt.Sprintf("exitcode"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		assert.Equal(t, "exit code is as expected", code, r.ExitCode)
 	}
 }
 
 // StdoutEmpty asserts that the command did not write any data to Stdout
 func StdoutEmpty() Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			empty(t, "stdout", r.Stdout)
-		},
-		name: fmt.Sprintf("stdout-empty"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		empty(t, "stdout", r.Stdout)
 	}
 }
 
 // GetResult offers an escape hatch from tcli
 // The pointer passed as "result" will be assigned to the command's *CommandResult
 func GetResult(result **CommandResult) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			empty(t, "stdout", r.Stdout)
-			*result = r
-		},
-		name: "get-result",
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		empty(t, "stdout", r.Stdout)
+		*result = r
 	}
 }
 
 // StderrEmpty asserts that the command did not write any data to Stderr
 func StderrEmpty() Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			empty(t, "stderr", r.Stderr)
-		},
-		name: fmt.Sprintf("stderr-empty"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		empty(t, "stderr", r.Stderr)
 	}
 }
 
 // StdoutMatches asserts that Stdout contains a substring which matches the given regexp
 func StdoutMatches(pattern string) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			matches(t, "stdout", pattern, r.Stdout)
-		},
-		name: fmt.Sprintf("stdout-matches"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		matches(t, "stdout", pattern, r.Stdout)
 	}
 }
 
 // StderrMatches asserts that Stderr contains a substring which matches the given regexp
 func StderrMatches(pattern string) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			matches(t, "stderr", pattern, r.Stderr)
-		},
-		name: fmt.Sprintf("stderr-matches"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		matches(t, "stderr", pattern, r.Stderr)
 	}
 }
 
 // CombinedMatches asserts that either Stdout or Stderr a substring which matches the given regexp
 func CombinedMatches(pattern string) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			StdoutMatches(pattern).Valid(t, r)
-			StderrMatches(pattern).Valid(t, r)
-		},
-		name: fmt.Sprintf("combined-matches"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		StdoutMatches(pattern)(t, r)
+		StderrMatches(pattern)(t, r)
 	}
 }
 
@@ -371,32 +331,26 @@ func empty(t *testing.T, name string, a []byte) {
 
 // DurationLessThan asserts that the command completed in less than the given duration
 func DurationLessThan(dur time.Duration) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			if r.Duration > dur {
-				slogtest.Fatal(t, "duration longer than expected",
-					slog.F("expected_less_than", dur.String),
-					slog.F("actual", r.Duration.String()),
-				)
-			}
-		},
-		name: fmt.Sprintf("duration-lessthan"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		if r.Duration > dur {
+			slogtest.Fatal(t, "duration longer than expected",
+				slog.F("expected_less_than", dur.String),
+				slog.F("actual", r.Duration.String()),
+			)
+		}
 	}
 }
 
 // DurationGreaterThan asserts that the command completed in greater than the given duration
 func DurationGreaterThan(dur time.Duration) Assertion {
-	return simpleFuncAssert{
-		valid: func(t *testing.T, r *CommandResult) {
-			slog.Helper()
-			if r.Duration < dur {
-				slogtest.Fatal(t, "duration shorter than expected",
-					slog.F("expected_greater_than", dur.String),
-					slog.F("actual", r.Duration.String()),
-				)
-			}
-		},
-		name: fmt.Sprintf("duration-greaterthan"),
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		if r.Duration < dur {
+			slogtest.Fatal(t, "duration shorter than expected",
+				slog.F("expected_greater_than", dur.String),
+				slog.F("actual", r.Duration.String()),
+			)
+		}
 	}
 }
