Skip to content

Feature implementation from commits b534400..c519b79 #1

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

Open
yashuatla wants to merge 16 commits into
base: feature-base-1
Choose a base branch
from
Open

Feature implementation from commits b534400..c519b79 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
559d23a
check test failure message for Empty and NotEmpty
ccoVeille May 17, 2025
e2ad959
mock/tests: add method Helper() to all mock of *testing.T
dolmen Jul 11, 2023
8f73f15
assert.CollectT: add Helper() method
dolmen Jul 11, 2023
c98ef6e
Merge pull request #1423 from stretchr/add-Helper-method-in-tests
brackendawson May 27, 2025
3c1541a
Improve usage of Sprintf with Same/NotSame
ccoVeille May 13, 2025
4eb688b
assert.JSONEq: shortcut if same strings
dolmen May 28, 2025
4f71159
assert.YAMLEq: shortcut if same strings
dolmen May 28, 2025
8b3dc18
mock: enable parallel testing on internal testsuite
dolmen May 28, 2025
186f165
Merge pull request #1756 from stretchr/dolmen/mock-Parallel-testing
dolmen May 30, 2025
82767ae
suite: cleanup use of 'testing' internals at runtime
dolmen May 27, 2025
0ff4bb4
Merge pull request #1751 from stretchr/dolmen/suite-fix-use-of-testin…
dolmen May 30, 2025
a5d5c33
Merge pull request #1745 from ccoveille-forks/improve-tests-empty-not…
dolmen May 31, 2025
250eaa5
deps: fix dependency cycle with objx
dolmen Mar 4, 2024
553e822
go.mod: add comment about how to fix dep cycle with objx
dolmen May 25, 2025
5d95b18
Merge pull request #1567 from stretchr/fix-dependency-cycle
brackendawson Jun 2, 2025
c519b79
assert.Empty: comprehensive doc of "Empty"-ness rules
dolmen May 28, 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
16 changes: 12 additions & 4 deletions assert/assertion_format.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 24 additions & 8 deletions assert/assertion_forward.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 30 additions & 8 deletions assert/assertions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,9 @@ func Same(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) b
if !same {
// both are pointers but not the same type & pointing to the same address
return Fail(t, fmt.Sprintf("Not same: \n"+
"expected: %p %#v\n"+
"actual : %p %#v", expected, expected, actual, actual), msgAndArgs...)
"expected: %p %#[1]v\n"+
"actual : %p %#[2]v",
expected, actual), msgAndArgs...)
}

return true
Expand All @@ -569,8 +570,8 @@ func NotSame(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}

if same {
return Fail(t, fmt.Sprintf(
"Expected and actual point to the same object: %p %#v",
expected, expected), msgAndArgs...)
"Expected and actual point to the same object: %p %#[1]v",
expected), msgAndArgs...)
}
return true
}
Expand Down Expand Up @@ -772,10 +773,19 @@ func isEmpty(object interface{}) bool {
}
}

// Empty asserts that the specified object is empty. I.e. nil, "", false, 0 or either
// a slice or a channel with len == 0.
// Empty asserts that the given value is "empty".
//
// [Zero values] are "empty".
//
// Arrays are "empty" if every element is the zero value of the type (stricter than "empty").
//
// Slices, maps and channels with zero length are "empty".
//
// Pointer values are "empty" if the pointer is nil or if the pointed value is "empty".
//
// assert.Empty(t, obj)
//
// [Zero values]: https://go.dev/ref/spec#The_zero_value
func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
pass := isEmpty(object)
if !pass {
Expand All @@ -788,8 +798,7 @@ func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
return pass
}

// NotEmpty asserts that the specified object is NOT empty. I.e. not nil, "", false, 0 or either
// a slice or a channel with len == 0.
// NotEmpty asserts that the specified object is NOT [Empty].
//
// if assert.NotEmpty(t, obj) {
// assert.Equal(t, "two", obj[1])
Expand Down Expand Up @@ -1852,6 +1861,11 @@ func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{
return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid json.\nJSON parsing error: '%s'", expected, err.Error()), msgAndArgs...)
}

// Shortcut if same bytes
if actual == expected {
return true
}

if err := json.Unmarshal([]byte(actual), &actualJSONAsInterface); err != nil {
return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid json.\nJSON parsing error: '%s'", actual, err.Error()), msgAndArgs...)
}
Expand All @@ -1870,6 +1884,11 @@ func YAMLEq(t TestingT, expected string, actual string, msgAndArgs ...interface{
return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid yaml.\nYAML parsing error: '%s'", expected, err.Error()), msgAndArgs...)
}

// Shortcut if same bytes
if actual == expected {
return true
}

if err := yaml.Unmarshal([]byte(actual), &actualYAMLAsInterface); err != nil {
return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid yaml.\nYAML error: '%s'", actual, err.Error()), msgAndArgs...)
}
Expand Down Expand Up @@ -2008,6 +2027,9 @@ type CollectT struct {
errors []error
}

// Helper is like [testing.T.Helper] but does nothing.
func (CollectT) Helper() {}

// Errorf collects the error.
func (c *CollectT) Errorf(format string, args ...interface{}) {
c.errors = append(c.errors, fmt.Errorf(format, args...))
Expand Down
Loading