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/configloader/configloader_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/configloader/configloader_test.go') diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index a41c2be..3cb9d71 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -7,16 +7,16 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" - "gotest.tools/v3/assert" + "github.com/eugenetriguba/checkmate" ) func TestNewConfigMigrationsDirPathDefault(t *testing.T) { bolttest.ChangeCwd(t, os.TempDir()) cfg, err := configloader.NewConfig() - assert.NilError(t, err) + checkmate.AssertNil(t, err) - assert.Equal(t, cfg.Migrations.DirectoryPath, "migrations") + checkmate.AssertEqual(t, cfg.Migrations.DirectoryPath, "migrations") } func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { @@ -34,8 +34,8 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { bolttest.CreateConfigFile(t, &expectedCfg, "bolt.toml") cfg, err := configloader.NewConfig() - assert.NilError(t, err) - assert.DeepEqual(t, *cfg, expectedCfg) + checkmate.AssertNil(t, err) + checkmate.AssertDeepEqual(t, *cfg, expectedCfg) } func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { @@ -72,6 +72,6 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { t.Setenv("BOLT_DB_CONN_DRIVER", envCfg.Connection.Driver) cfg, err := configloader.NewConfig() - assert.NilError(t, err) - assert.DeepEqual(t, *cfg, envCfg) + checkmate.AssertNil(t, err) + checkmate.AssertDeepEqual(t, *cfg, envCfg) } -- 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/configloader/configloader_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'internal/configloader/configloader_test.go') diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 3cb9d71..f08f12f 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -7,16 +7,16 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestNewConfigMigrationsDirPathDefault(t *testing.T) { bolttest.ChangeCwd(t, os.TempDir()) cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) + assert.Nil(t, err) - checkmate.AssertEqual(t, cfg.Migrations.DirectoryPath, "migrations") + assert.Equal(t, cfg.Migrations.DirectoryPath, "migrations") } func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { @@ -34,8 +34,8 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { bolttest.CreateConfigFile(t, &expectedCfg, "bolt.toml") cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) - checkmate.AssertDeepEqual(t, *cfg, expectedCfg) + assert.Nil(t, err) + assert.DeepEqual(t, *cfg, expectedCfg) } func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { @@ -72,6 +72,6 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { t.Setenv("BOLT_DB_CONN_DRIVER", envCfg.Connection.Driver) cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) - checkmate.AssertDeepEqual(t, *cfg, envCfg) + assert.Nil(t, err) + assert.DeepEqual(t, *cfg, envCfg) } -- cgit v1.2.3 From 77f54361419914991093a7d5a2b2566bcd2e208b Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:55:23 -0500 Subject: Fix config tests --- internal/configloader/configloader_test.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'internal/configloader/configloader_test.go') diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index f08f12f..d33a19b 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -10,18 +10,22 @@ import ( "github.com/eugenetriguba/checkmate/assert" ) -func TestNewConfigMigrationsDirPathDefault(t *testing.T) { +func TestNewConfigDefaults(t *testing.T) { bolttest.ChangeCwd(t, os.TempDir()) cfg, err := configloader.NewConfig() assert.Nil(t, err) assert.Equal(t, cfg.Migrations.DirectoryPath, "migrations") + assert.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleSequential) } func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { expectedCfg := configloader.Config{ - Migrations: configloader.MigrationsConfig{DirectoryPath: "myfancymigrations"}, + Migrations: configloader.MigrationsConfig{ + DirectoryPath: "myfancymigrations", + VersionStyle: configloader.VersionStyleSequential, + }, Connection: configloader.ConnectionConfig{ Host: "testhost", Port: 1234, @@ -40,7 +44,10 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { fileCfg := configloader.Config{ - Migrations: configloader.MigrationsConfig{DirectoryPath: "cfgmigrations"}, + Migrations: configloader.MigrationsConfig{ + DirectoryPath: "cfgmigrations", + VersionStyle: configloader.VersionStyleSequential, + }, Connection: configloader.ConnectionConfig{ Host: "testhost", Port: 1234, @@ -53,7 +60,10 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { bolttest.CreateConfigFile(t, &fileCfg, "bolt.toml") envCfg := configloader.Config{ - Migrations: configloader.MigrationsConfig{DirectoryPath: "envmigrations"}, + Migrations: configloader.MigrationsConfig{ + DirectoryPath: "envmigrations", + VersionStyle: configloader.VersionStyleTimestamp, + }, Connection: configloader.ConnectionConfig{ Host: "envtesthost", Port: 4321, @@ -63,6 +73,7 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { Driver: "postgres", }, } + t.Setenv("BOLT_MIGRATIONS_VERSION_STYLE", string(envCfg.Migrations.VersionStyle)) t.Setenv("BOLT_MIGRATIONS_DIR_PATH", envCfg.Migrations.DirectoryPath) t.Setenv("BOLT_DB_CONN_HOST", envCfg.Connection.Host) t.Setenv("BOLT_DB_CONN_PORT", fmt.Sprintf("%d", envCfg.Connection.Port)) -- cgit v1.2.3 From b8b23e393dcda33cc98b22f4083977b543861bf2 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 17:29:19 -0500 Subject: Add test for invalid version style in config --- internal/configloader/configloader_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'internal/configloader/configloader_test.go') diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index d33a19b..6229cf6 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -20,6 +20,19 @@ func TestNewConfigDefaults(t *testing.T) { assert.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleSequential) } +func TestNewConfigWithInvalidVersionStyle(t *testing.T) { + fileCfg := configloader.Config{ + Migrations: configloader.MigrationsConfig{ + DirectoryPath: "myfancymigrations", + VersionStyle: "invalid", + }, + } + bolttest.CreateConfigFile(t, &fileCfg, "bolt.toml") + + _, err := configloader.NewConfig() + assert.ErrorIs(t, err, configloader.ErrInvalidVersionStyle) +} + func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { expectedCfg := configloader.Config{ Migrations: configloader.MigrationsConfig{ -- cgit v1.2.3 From 32d10125d82aa7933fffac474105bf5897f3853a Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 7 Feb 2024 20:05:53 -0500 Subject: Use checkmate 0.3.0 --- internal/configloader/configloader_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'internal/configloader/configloader_test.go') diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 6229cf6..6ab21e0 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -8,6 +8,7 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/checkmate/assert" + "github.com/eugenetriguba/checkmate/check" ) func TestNewConfigDefaults(t *testing.T) { @@ -16,8 +17,8 @@ func TestNewConfigDefaults(t *testing.T) { cfg, err := configloader.NewConfig() assert.Nil(t, err) - assert.Equal(t, cfg.Migrations.DirectoryPath, "migrations") - assert.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleSequential) + check.Equal(t, cfg.Migrations.DirectoryPath, "migrations") + check.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleSequential) } func TestNewConfigWithInvalidVersionStyle(t *testing.T) { -- cgit v1.2.3 From bf1d3b3e1fc42132678b244e479839416a03a6ce Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 29 Feb 2024 19:53:20 -0500 Subject: Add service tests --- internal/configloader/configloader_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/configloader/configloader_test.go') diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 6ab21e0..0ad6930 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -18,7 +18,7 @@ func TestNewConfigDefaults(t *testing.T) { assert.Nil(t, err) check.Equal(t, cfg.Migrations.DirectoryPath, "migrations") - check.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleSequential) + check.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleTimestamp) } func TestNewConfigWithInvalidVersionStyle(t *testing.T) { -- cgit v1.2.3