|
5 | 5 | "errors"
|
6 | 6 | "strings"
|
7 | 7 | "testing"
|
| 8 | + |
| 9 | + "github.com/stretchr/testify/assert" |
| 10 | + "github.com/stretchr/testify/require" |
8 | 11 | )
|
9 | 12 |
|
10 | 13 | // TestConvertJSON_InvalidInput tests the ConvertJSON function with invalid input.
|
@@ -77,34 +80,27 @@ func TestConvertJSON(t *testing.T) {
|
77 | 80 | raw = []byte(in)
|
78 | 81 | default:
|
79 | 82 | raw, err = json.Marshal(in)
|
80 |
| - if err != nil { |
81 |
| - t.Fatalf("failed to marshal input %s: %v", tc.name, err) |
82 |
| - } |
| 83 | + require.NoError(t, err, "failed to marshal input %s", tc.name) |
83 | 84 | }
|
84 | 85 | out, err := ConvertJSON(raw)
|
85 | 86 | if tc.wantErr != nil {
|
86 |
| - if err == nil || !errors.Is(err, tc.wantErr) { |
87 |
| - t.Fatalf("%s: expected error %v, got %v", tc.name, tc.wantErr, err) |
88 |
| - } |
| 87 | + assert.ErrorIs(t, err, tc.wantErr, "error mismatch") |
89 | 88 | return
|
90 | 89 | }
|
91 |
| - if err != nil { |
92 |
| - t.Fatalf("%s: unexpected error: %v", tc.name, err) |
93 |
| - } |
| 90 | + assert.NoError(t, err, "unexpected error") |
94 | 91 | var w v2RootWrapper
|
95 |
| - if err := json.Unmarshal(out, &w); err != nil { |
96 |
| - t.Fatalf("%s: failed to unmarshal output: %v", tc.name, err) |
97 |
| - } |
| 92 | + err = json.Unmarshal(out, &w) |
| 93 | + require.NoErrorf(t, err, "%s: failed to unmarshal output", tc.name) |
| 94 | + |
98 | 95 | if tc.check != nil {
|
99 | 96 | defs := map[string]map[string]any{}
|
100 | 97 | for k, v := range w.Definitions {
|
101 | 98 | if m, ok := v.(map[string]any); ok {
|
102 | 99 | defs[k] = m
|
103 | 100 | }
|
104 | 101 | }
|
105 |
| - if err := tc.check(defs); err != nil { |
106 |
| - t.Errorf("%s: check failed: %v", tc.name, err) |
107 |
| - } |
| 102 | + err := tc.check(defs) |
| 103 | + assert.NoErrorf(t, err, "%s: check failed", tc.name) |
108 | 104 | }
|
109 | 105 | })
|
110 | 106 | }
|
|
0 commit comments