From 03d0e3a1b5ba6c22e259285e6309c8b4c2b42e97 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 9 Jun 2023 09:22:50 -0600 Subject: [PATCH] Add type check to tests --- pkg/ottl/expression.go | 10 +++++----- pkg/ottl/expression_test.go | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkg/ottl/expression.go b/pkg/ottl/expression.go index e6de270cc004..74b163a090fa 100644 --- a/pkg/ottl/expression.go +++ b/pkg/ottl/expression.go @@ -329,7 +329,7 @@ func (g StandardStringLikeGetter[K]) Get(ctx context.Context, tCtx K) (*string, default: result, err = jsoniter.MarshalToString(v) if err != nil { - return nil, fmt.Errorf("unsupported type: %T", v) + return nil, TypeError(fmt.Sprintf("unsupported type: %T", v)) } } return &result, nil @@ -391,10 +391,10 @@ func (g StandardFloatLikeGetter[K]) Get(ctx context.Context, tCtx K) (*float64, result = float64(0) } default: - return nil, fmt.Errorf("unsupported value type: %v", v.Type()) + return nil, TypeError(fmt.Sprintf("unsupported value type: %v", v.Type())) } default: - return nil, fmt.Errorf("unsupported type: %T", v) + return nil, TypeError(fmt.Sprintf("unsupported type: %T", v)) } return &result, nil } @@ -455,10 +455,10 @@ func (g StandardIntLikeGetter[K]) Get(ctx context.Context, tCtx K) (*int64, erro result = int64(0) } default: - return nil, fmt.Errorf("unsupported value type: %v", v.Type()) + return nil, TypeError(fmt.Sprintf("unsupported value type: %v", v.Type())) } default: - return nil, fmt.Errorf("unsupported type: %T", v) + return nil, TypeError(fmt.Sprintf("unsupported type: %T", v)) } return &result, nil } diff --git a/pkg/ottl/expression_test.go b/pkg/ottl/expression_test.go index 1d9a353b14a5..2b4e3cb21218 100644 --- a/pkg/ottl/expression_test.go +++ b/pkg/ottl/expression_test.go @@ -669,6 +669,7 @@ func Test_StandardStringGetter(t *testing.T) { assert.NoError(t, err) assert.Equal(t, tt.want, val) } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } }) @@ -802,6 +803,7 @@ func Test_StandardStringLikeGetter(t *testing.T) { assert.Equal(t, tt.want, *val) } } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } }) @@ -865,6 +867,7 @@ func Test_StandardFloatGetter(t *testing.T) { assert.NoError(t, err) assert.Equal(t, tt.want, val) } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } }) @@ -1028,6 +1031,7 @@ func Test_StandardFloatLikeGetter(t *testing.T) { assert.Equal(t, tt.want, *val) } } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } }) @@ -1091,6 +1095,7 @@ func Test_StandardIntGetter(t *testing.T) { assert.NoError(t, err) assert.Equal(t, tt.want, val) } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } }) @@ -1254,6 +1259,7 @@ func Test_StandardIntLikeGetter(t *testing.T) { assert.Equal(t, tt.want, *val) } } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } }) @@ -1327,6 +1333,7 @@ func Test_StandardPMapGetter(t *testing.T) { assert.NoError(t, err) assert.Equal(t, tt.want, val) } else { + assert.IsType(t, TypeError(""), err) assert.EqualError(t, err, tt.expectedErrorMsg) } })