Skip to content

log/logtest: change AssertEqual to accept TestingT for benchmark support #6908

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.

Sign up for GitHub

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

Merged
pellared merged 11 commits into from
Jul 7, 2025
Merged

log/logtest: change AssertEqual to accept TestingT for benchmark support #6908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0dc9190
refactor(assert): change AssertEqual to accept testing.TB and add ben…
flc1125 Jun 17, 2025
36f4735
test(assert): add subtests for AssertEqual with testing.T and testing.B
flc1125 Jun 17, 2025
61dc6b3
refactor(assert): update AssertEqual to use TestingT interface
flc1125 Jun 17, 2025
77236b9
refactor(assert): rename assertEqual to AssertEqual for consistency a…
flc1125 Jun 17, 2025
a78227b
Merge remote-tracking branch 'upstream/main' into testing-tb
flc1125 Jun 25, 2025
8f5b0f1
test(log): update `AssertEqual` to support benchmark tests
flc1125 Jun 25, 2025
1eb603f
test(log): update `AssertEqual` to support benchmark tests
flc1125 Jun 25, 2025
308e9e5
Merge branch 'main' into testing-tb
pellared Jun 25, 2025
72b73fb
Update CHANGELOG.md
pellared Jun 25, 2025
24ac08f
Update CHANGELOG.md
pellared Jun 25, 2025
ffb47c2
Merge branch 'main' into testing-tb
pellared Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions log/logtest/assert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
)

// AssertEqual asserts that the two concrete data-types from the logtest package are equal.
func AssertEqual[T Recording | Record](t *testing.T, want, got T, opts ...AssertOption) bool {
t.Helper()
return assertEqual(t, want, got, opts...)
func AssertEqual[T Recording | Record](tb testing.TB, want, got T, opts ...AssertOption) bool {
tb.Helper()
return assertEqual(tb, want, got, opts...)
}

// testingT reports failure messages.
Expand Down
16 changes: 16 additions & 0 deletions log/logtest/assert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ func TestAssertEqual(t *testing.T) {
assert.True(t, got, "expected recordings to be equal")
}

func BenchmarkAssertEqual(b *testing.B) {
Comment thread
flc1125 marked this conversation as resolved.
Outdated
ar := Recording{
Scope{Name: b.Name()}: []Record{
{Body: log.StringValue("msg"), Attributes: []log.KeyValue{log.String("foo", "bar"), log.Int("n", 1)}},
},
}
br := Recording{
Scope{Name: b.Name()}: []Record{
{Body: log.StringValue("msg"), Attributes: []log.KeyValue{log.Int("n", 1), log.String("foo", "bar")}},
},
}

got := AssertEqual(b, ar, br)
assert.True(b, got, "expected recordings to be equal")
}

func TestAssertEqualRecording(t *testing.T) {
tests := []struct {
name string
Expand Down