From b06eba3df09a8fcd777b8fe350c2b184758963d1 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:10:14 -0500 Subject: Use checkmate for tests --- internal/storage/db_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/storage/db_test.go') diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index d9e22d0..2f4c7db 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -7,30 +7,30 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "gotest.tools/v3/assert" + "github.com/eugenetriguba/checkmate" ) func TestDBConnectWithPostgres(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "postgres") conn, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - assert.NilError(t, err) + checkmate.AssertNil(t, err) defer conn.Close() _, err = conn.Exec("SELECT 1;") - assert.NilError(t, err) + checkmate.AssertNil(t, err) } func TestDBConnectMalformedConnectionString(t *testing.T) { _, err := storage.DBConnect("postgres", "pizza=123") - assert.ErrorContains(t, err, "connection refused") + checkmate.AssertErrorContains(t, err, "connection refused") } func TestDBConnectUnsupportedDriver(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "redis") _, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - assert.ErrorContains(t, err, `unknown driver "redis"`) + checkmate.AssertErrorContains(t, err, `unknown driver "redis"`) } func TestDBConnectionString(t *testing.T) { @@ -49,5 +49,5 @@ func TestDBConnectionString(t *testing.T) { "host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName, ) - assert.Equal(t, cs, expectedConnectionString) + checkmate.AssertEqual(t, cs, expectedConnectionString) } -- cgit v1.2.3 From 345e28bd44ba6a38bf7ee9bfe2066f333bbbe894 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:29:00 -0500 Subject: Update to checkmate v0.2.0 --- internal/storage/db_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/storage/db_test.go') diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 2f4c7db..61a9bf4 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -7,30 +7,30 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestDBConnectWithPostgres(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "postgres") conn, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - checkmate.AssertNil(t, err) + assert.Nil(t, err) defer conn.Close() _, err = conn.Exec("SELECT 1;") - checkmate.AssertNil(t, err) + assert.Nil(t, err) } func TestDBConnectMalformedConnectionString(t *testing.T) { _, err := storage.DBConnect("postgres", "pizza=123") - checkmate.AssertErrorContains(t, err, "connection refused") + assert.ErrorContains(t, err, "connection refused") } func TestDBConnectUnsupportedDriver(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "redis") _, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - checkmate.AssertErrorContains(t, err, `unknown driver "redis"`) + assert.ErrorContains(t, err, `unknown driver "redis"`) } func TestDBConnectionString(t *testing.T) { @@ -49,5 +49,5 @@ func TestDBConnectionString(t *testing.T) { "host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName, ) - checkmate.AssertEqual(t, cs, expectedConnectionString) + assert.Equal(t, cs, expectedConnectionString) } -- cgit v1.2.3 From ed987d2d21e4063fcdb83e86d9f87b08f8e2165a Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 16:03:14 -0500 Subject: Add better error handling for db connect --- internal/storage/db_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'internal/storage/db_test.go') diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 61a9bf4..c871c47 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -10,7 +10,7 @@ import ( "github.com/eugenetriguba/checkmate/assert" ) -func TestDBConnectWithPostgres(t *testing.T) { +func TestDBConnect_Success(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "postgres") conn, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) @@ -21,15 +21,17 @@ func TestDBConnectWithPostgres(t *testing.T) { assert.Nil(t, err) } -func TestDBConnectMalformedConnectionString(t *testing.T) { +func TestDBConnect_BadConnectionString(t *testing.T) { _, err := storage.DBConnect("postgres", "pizza=123") + assert.ErrorIs(t, err, storage.ErrUnableToConnect) assert.ErrorContains(t, err, "connection refused") } -func TestDBConnectUnsupportedDriver(t *testing.T) { +func TestDBConnect_UnsupportedDriver(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "redis") _, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) + assert.ErrorIs(t, err, storage.ErrInvalidConnectionString) assert.ErrorContains(t, err, `unknown driver "redis"`) } -- cgit v1.2.3 From 46f7f49ebeb7f4e8fa1f395805a0b14baee5e5bc Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 16:08:04 -0500 Subject: Tweak error and doc for storage module --- internal/storage/db_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/storage/db_test.go') diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index c871c47..e85cc57 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -31,7 +31,7 @@ func TestDBConnect_UnsupportedDriver(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "redis") _, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - assert.ErrorIs(t, err, storage.ErrInvalidConnectionString) + assert.ErrorIs(t, err, storage.ErrMalformedConnectionString) assert.ErrorContains(t, err, `unknown driver "redis"`) } -- cgit v1.2.3