Skip to content

Commit 0624608

Browse files
committed
feat: update assertion error.
1 parent c3fda75 commit 0624608

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

equal.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package assert
22

33
import (
4+
"fmt"
45
"reflect"
56
"testing"
67
)
@@ -11,7 +12,7 @@ func Equal(t *testing.T, actual, expect any, message ...string) error {
1112
return nil
1213
}
1314

14-
err := newAssertionError("==", actual, expect, message...)
15+
err := newAssertionError(fmt.Sprintf("%v == %v", actual, expect), message...)
1516

1617
t.Error(err)
1718

@@ -24,7 +25,7 @@ func NotEqual(t *testing.T, actual, expect any, message ...string) error {
2425
return nil
2526
}
2627

27-
err := newAssertionError("!=", actual, expect, message...)
28+
err := newAssertionError(fmt.Sprintf("%v != %v", actual, expect), message...)
2829

2930
t.Error(err)
3031

error.go

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
11
package assert
22

3-
import "fmt"
4-
53
// AssertionError indicates the failure of an assertion.
64
type AssertionError struct {
7-
message *string
8-
actual any
9-
expect any
10-
operator string
5+
message string
116
}
127

13-
func newAssertionError(operator string, actual, expect any, message ...string) AssertionError {
14-
err := AssertionError{
15-
actual: actual,
16-
expect: expect,
17-
operator: operator,
18-
}
8+
// newAssertionError creates a new error with custom message or default message.
9+
func newAssertionError(defaultMsg string, message ...string) AssertionError {
10+
err := AssertionError{}
1911

2012
if len(message) > 0 {
21-
err.message = &message[0]
13+
err.message = message[0]
14+
} else {
15+
err.message = "assert error: " + defaultMsg
2216
}
2317

2418
return err
2519
}
2620

21+
// Error returns the message of the error.
2722
func (err AssertionError) Error() string {
28-
if err.message != nil {
29-
return *err.message
30-
}
31-
32-
return fmt.Sprintf("%v %s %v", err.actual, err.operator, err.expect)
23+
return err.message
3324
}

0 commit comments

Comments
 (0)