diff options
| -rw-r--r-- | internal/bolttest/db.go (renamed from internal/storage/dbtest/dbtest.go) | 2 | ||||
| -rw-r--r-- | internal/bolttest/fs.go | 50 | ||||
| -rw-r--r-- | internal/configloader/configloader_test.go | 48 | ||||
| -rw-r--r-- | internal/configloader/configloader_unix_test.go | 5 | ||||
| -rw-r--r-- | internal/configloader/configloader_windows_test.go | 5 | ||||
| -rw-r--r-- | internal/storage/db_test.go | 6 |
6 files changed, 64 insertions, 52 deletions
diff --git a/internal/storage/dbtest/dbtest.go b/internal/bolttest/db.go index c53c04a..191605b 100644 --- a/internal/storage/dbtest/dbtest.go +++ b/internal/bolttest/db.go @@ -1,4 +1,4 @@ -package dbtest +package bolttest import ( "os" diff --git a/internal/bolttest/fs.go b/internal/bolttest/fs.go new file mode 100644 index 0000000..9edd894 --- /dev/null +++ b/internal/bolttest/fs.go @@ -0,0 +1,50 @@ +package bolttest + +import ( + "os" + "testing" + + "github.com/BurntSushi/toml" + "github.com/eugenetriguba/bolt/internal/configloader" + "gotest.tools/v3/assert" +) + +func CreateConfigFile(t *testing.T, cfg *configloader.Config, filePath string) { + f := CreateTempFile(t, filePath) + + encoder := toml.NewEncoder(f) + err := encoder.Encode(cfg) + assert.NilError(t, err) + + err = f.Close() + assert.NilError(t, err) +} + +func CreateTempFile(t *testing.T, filePath string) *os.File { + f, err := os.Create(filePath) + assert.NilError(t, err) + + t.Cleanup(func() { + err = os.Remove(f.Name()) + if err != nil { + t.Fatal(err) + } + }) + + return f +} + +func ChangeCwd(t *testing.T, path string) { + dir, err := os.Getwd() + assert.NilError(t, err) + + err = os.Chdir(path) + assert.NilError(t, err) + + t.Cleanup(func() { + err = os.Chdir(dir) + if err != nil { + t.Fatal(err) + } + }) +} diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 7fb2456..88c7f94 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -5,13 +5,13 @@ import ( "os" "testing" - "github.com/BurntSushi/toml" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "gotest.tools/v3/assert" ) func TestNewConfigMigrationsDirDefault(t *testing.T) { - changeCwd(t, os.TempDir()) + bolttest.ChangeCwd(t, os.TempDir()) cfg, err := configloader.NewConfig() assert.NilError(t, err) @@ -31,7 +31,7 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { Driver: "postgres", }, } - createConfigFile(t, &expectedCfg, "bolt.toml") + bolttest.CreateConfigFile(t, &expectedCfg, "bolt.toml") cfg, err := configloader.NewConfig() assert.NilError(t, err) @@ -50,7 +50,7 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { Driver: "mysql", }, } - createConfigFile(t, &fileCfg, "bolt.toml") + bolttest.CreateConfigFile(t, &fileCfg, "bolt.toml") envCfg := configloader.Config{ MigrationsDir: "envmigrations", @@ -75,43 +75,3 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { assert.NilError(t, err) assert.DeepEqual(t, *cfg, envCfg) } - -func createConfigFile(t *testing.T, cfg *configloader.Config, filePath string) { - f := createTempFile(t, filePath) - - encoder := toml.NewEncoder(f) - err := encoder.Encode(cfg) - assert.NilError(t, err) - - err = f.Close() - assert.NilError(t, err) -} - -func createTempFile(t *testing.T, filePath string) *os.File { - f, err := os.Create(filePath) - assert.NilError(t, err) - - t.Cleanup(func() { - err = os.Remove(f.Name()) - if err != nil { - t.Fatal(err) - } - }) - - return f -} - -func changeCwd(t *testing.T, path string) { - dir, err := os.Getwd() - assert.NilError(t, err) - - err = os.Chdir(path) - assert.NilError(t, err) - - t.Cleanup(func() { - err = os.Chdir(dir) - if err != nil { - t.Fatal(err) - } - }) -} diff --git a/internal/configloader/configloader_unix_test.go b/internal/configloader/configloader_unix_test.go index 5c65c37..412ef47 100644 --- a/internal/configloader/configloader_unix_test.go +++ b/internal/configloader/configloader_unix_test.go @@ -6,6 +6,7 @@ import ( "os" "testing" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "gotest.tools/v3/assert" ) @@ -14,11 +15,11 @@ func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) { expectedCfg := configloader.Config{ MigrationsDir: "differentmigrationsdir", } - createConfigFile(t, &expectedCfg, "/bolt.toml") + bolttest.CreateConfigFile(t, &expectedCfg, "/bolt.toml") homedir, err := os.UserHomeDir() assert.NilError(t, err) - changeCwd(t, homedir) + bolttest.ChangeCwd(t, homedir) cfg, err := configloader.NewConfig() assert.NilError(t, err) diff --git a/internal/configloader/configloader_windows_test.go b/internal/configloader/configloader_windows_test.go index cc044b1..5c8cee9 100644 --- a/internal/configloader/configloader_windows_test.go +++ b/internal/configloader/configloader_windows_test.go @@ -7,6 +7,7 @@ import ( "path/filepath" "testing" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "gotest.tools/v3/assert" ) @@ -16,12 +17,12 @@ func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) { MigrationsDir: "differentmigrationsdir", } configPath := filepath.Join(os.Getenv("SystemDrive"), "bolt.toml") - createConfigFile(t, &expectedCfg, configPath) + bolttest.CreateConfigFile(t, &expectedCfg, configPath) assert.NilError(t, err) homedir, err := os.UserHomeDir() assert.NilError(t, err) - changeCwd(t, homedir) + bolttest.ChangeCwd(t, homedir) cfg, err := configloader.NewConfig() assert.NilError(t, err) diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 2583cfd..377c8c8 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -4,14 +4,14 @@ import ( "fmt" "testing" + "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/bolt/internal/storage/dbtest" "gotest.tools/v3/assert" ) func TestDBConnectWithPostgres(t *testing.T) { - cfg, err := dbtest.NewTestConnectionConfig("postgres") + cfg, err := bolttest.NewTestConnectionConfig("postgres") assert.NilError(t, err) conn, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) @@ -28,7 +28,7 @@ func TestDBConnectMalformedConnectionString(t *testing.T) { } func TestDBConnectUnsupportedDriver(t *testing.T) { - cfg, err := dbtest.NewTestConnectionConfig("redis") + cfg, err := bolttest.NewTestConnectionConfig("redis") assert.NilError(t, err) _, err = storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) |