Skip to content
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

Align error message assertion to new missing custom setting error formatting #1256

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Align error message assertion to new missing custom setting error formatting #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions tests/conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"os"
"runtime"
"strconv"
"strings"
"sync"
"testing"
"time"
Expand Down Expand Up @@ -320,13 +321,13 @@ func TestCustomSettings(t *testing.T) {
require.NoError(t, row.Err())

var setting string
require.NoError(t, row.Scan(&setting))
require.Equal(t, "custom_value", setting)
assert.NoError(t, row.Scan(&setting))
assert.Equal(t, "custom_value", setting)
})

t.Run("get non-existing custom setting value", func(t *testing.T) {
row := conn.QueryRow(context.Background(), "SELECT getSetting('custom_non_existing_setting')")
require.ErrorContains(t, row.Err(), "Unknown setting custom_non_existing_setting")
assert.Contains(t, strings.ReplaceAll(row.Err().Error(), "'", ""), "Unknown setting custom_non_existing_setting")
})

t.Run("get custom setting value from query context", func(t *testing.T) {
Expand All @@ -335,11 +336,11 @@ func TestCustomSettings(t *testing.T) {
}))

row := conn.QueryRow(ctx, "SELECT getSetting('custom_query_setting')")
require.NoError(t, row.Err())
assert.NoError(t, row.Err())

var setting string
require.NoError(t, row.Scan(&setting))
require.Equal(t, "custom_query_value", setting)
assert.NoError(t, row.Scan(&setting))
assert.Equal(t, "custom_query_value", setting)
})
}

Expand Down
12 changes: 6 additions & 6 deletions tests/std/conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,13 @@ func TestCustomSettings(t *testing.T) {
require.NoError(t, row.Err())

var setting string
require.NoError(t, row.Scan(&setting))
require.Equal(t, "custom_value", setting)
assert.NoError(t, row.Scan(&setting))
assert.Equal(t, "custom_value", setting)
})

t.Run("get non-existing custom setting value", func(t *testing.T) {
row := conn.QueryRowContext(context.Background(), "SELECT getSetting('custom_non_existing_setting')")
require.ErrorContains(t, row.Err(), "Unknown setting custom_non_existing_setting")
assert.Contains(t, strings.ReplaceAll(row.Err().Error(), "'", ""), "Unknown setting custom_non_existing_setting")
})

t.Run("get custom setting value from query context", func(t *testing.T) {
Expand All @@ -445,11 +445,11 @@ func TestCustomSettings(t *testing.T) {
}))

row := conn.QueryRowContext(ctx, "SELECT getSetting('custom_query_setting')")
require.NoError(t, row.Err())
assert.NoError(t, row.Err())

var setting string
require.NoError(t, row.Scan(&setting))
require.Equal(t, "custom_query_value", setting)
assert.NoError(t, row.Scan(&setting))
assert.Equal(t, "custom_query_value", setting)
})
})
}
Expand Down
Loading