Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: eliminate helper func #219

Merged
merged 1 commit into from
Sep 5, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 32 additions & 14 deletions logr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,38 @@ func TestV(t *testing.T) {
}
return level
}
expectEqual(t, "V(0)", 0, logger.V(0).GetV())
expectEqual(t, "V(93)", adjust(93), logger.V(93).GetV())
expectEqual(t, "V(70).V(6)", adjust(76), logger.V(70).V(6).GetV())
expectEqual(t, "V(-1)", 0, logger.V(-1).GetV())
expectEqual(t, "V(1).V(-1)", adjust(1), logger.V(1).V(-1).GetV())
inputs := []struct {
name string
fn func() Logger
exp int
}{{
name: "V(0)",
fn: func() Logger { return logger.V(0) },
exp: 0,
}, {
name: "V(93)",
fn: func() Logger { return logger.V(93) },
exp: adjust(93),
}, {
name: "V(70).V(6)",
fn: func() Logger { return logger.V(70).V(6) },
exp: adjust(76),
}, {
name: "V(-1)",
fn: func() Logger { return logger.V(-1) },
exp: 0,
}, {
name: "V(1).V(-1)",
fn: func() Logger { return logger.V(1).V(-1) },
exp: adjust(1),
}}
for _, in := range inputs {
t.Run(in.name, func(t *testing.T) {
if want, got := in.exp, in.fn().GetV(); got != want {
t.Errorf("expected %d, got %d", want, got)
}
})
}
})
}
}
Expand Down Expand Up @@ -486,12 +513,3 @@ func getCaller(depth int) string {
}
return fp.Name()
}

func expectEqual[T comparable](tb testing.TB, msg string, expected, actual T) bool {
if expected == actual {
return true
}
tb.Helper()
tb.Errorf("Failure: %s: expected to get %v, got %v instead", msg, expected, actual)
return false
}