Skip to content

Commit a89b2e1

Browse files
committed
cli/command/formatter: rewrite some tests with gotest.tools
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 90ae5b8 commit a89b2e1

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

cli/command/formatter/reflect_test.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
package formatter
55

66
import (
7-
"reflect"
87
"testing"
8+
9+
"gotest.tools/v3/assert"
10+
is "gotest.tools/v3/assert/cmp"
911
)
1012

1113
type dummy struct{}
@@ -45,24 +47,18 @@ var dummyExpected = map[string]any{
4547
func TestMarshalMap(t *testing.T) {
4648
d := dummy{}
4749
m, err := marshalMap(&d)
48-
if err != nil {
49-
t.Fatal(err)
50-
}
51-
if !reflect.DeepEqual(dummyExpected, m) {
52-
t.Fatalf("expected %+v, got %+v",
53-
dummyExpected, m)
54-
}
50+
assert.NilError(t, err)
51+
assert.Check(t, is.DeepEqual(m, dummyExpected))
5552
}
5653

5754
func TestMarshalMapBad(t *testing.T) {
58-
if _, err := marshalMap(nil); err == nil {
59-
t.Fatal("expected an error (argument is nil)")
60-
}
61-
if _, err := marshalMap(dummy{}); err == nil {
62-
t.Fatal("expected an error (argument is non-pointer)")
63-
}
55+
_, err := marshalMap(nil)
56+
assert.Check(t, is.Error(err, "expected a pointer to a struct, got invalid"), "expected an error (argument is nil)")
57+
58+
_, err = marshalMap(dummy{})
59+
assert.Check(t, is.Error(err, "expected a pointer to a struct, got struct"), "expected an error (argument is non-pointer)")
60+
6461
x := 42
65-
if _, err := marshalMap(&x); err == nil {
66-
t.Fatal("expected an error (argument is a pointer to non-struct)")
67-
}
62+
_, err = marshalMap(&x)
63+
assert.Check(t, is.Error(err, "expected a pointer to a struct, got a pointer to int"), "expected an error (argument is a pointer to non-struct)")
6864
}

0 commit comments

Comments
 (0)