Compare commits

..

No commits in common. "12983e395b1bb5c617026fd86425b04b7c3212dc" and "a58dca649a99f15ed0bebeb0ff8592c54380ec48" have entirely different histories.

3 changed files with 66 additions and 49 deletions

1
.gitignore vendored
View file

@ -9,7 +9,6 @@
*.so *.so
*.dylib *.dylib
target/** target/**
coverage/**
# Test binary, built with `go test -c` # Test binary, built with `go test -c`
*.test *.test

View file

@ -96,57 +96,75 @@ func Test_PilgrimContext_EnvDriverOverridesEnvUrlDriver(t *testing.T) {
) )
} }
func Test_PilgrimContext_CliUrlDriverOverridesEnvDriver(t *testing.T) { // func Test_PilgrimContext_EnvDriverOverridesEnvUrlDriver(t *testing.T) {
runTest( // context, _, _ := createPilgrimContextWithDependencies(
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // map[string]string{},
env.EXPECT().Driver().Return(pilgrim_conf.DbDriver_Postgres, true) // map[string]string{
cli.EXPECT().Url().Return("mssql://cli_host:1433", true) // EnvVarKey_Url: "mariadb://env_host:3306/env_segment1/env_segment2?env_arg1=env_val1&env_arg2=env_val2",
}, // EnvVarKey_Driver: "postgres",
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // },
ctx := pilgrim_conf.NewPilgrimContext(cli, env) // )
assert.Equal(t, pilgrim_conf.DbDriver_MSSQL, ctx.UrlParts().Driver) // assert.Equal(t, DbDriver_Postgres, context.UrlParts().Driver)
}, // }
)
}
func Test_PilgrimContext_CliDriverOverridesEnvDriver(t *testing.T) { // func Test_PilgrimContext_CliUrlDriverOverridesEnvDriver(t *testing.T) {
runTest( // context, _, _ := createPilgrimContextWithDependencies(
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // map[string]string{
env.EXPECT().Driver().Return(pilgrim_conf.DbDriver_MSSQL, true) // Flag_Url: CliUrlValue,
cli.EXPECT().Driver().Return(pilgrim_conf.DbDriver_MariaDB, true) // },
}, // map[string]string{
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // EnvVarKey_Driver: "mariadb",
ctx := pilgrim_conf.NewPilgrimContext(cli, env) // },
// )
assert.Equal(t, pilgrim_conf.DbDriver_MariaDB, ctx.UrlParts().Driver) // assert.Equal(t, CliDriverValue, context.UrlParts().Driver)
}, // }
)
}
func Test_PilgrimContext_EnvDriverIsUsedIfNoCliDriverProvided(t *testing.T) { // func Test_PilgrimContext_CliDriverOverridesEnvDriver(t *testing.T) {
runTest( // context, _, _ := createPilgrimContextWithDependencies(
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // map[string]string{
env.EXPECT().Driver().Return(pilgrim_conf.DbDriver_MSSQL, true) // Flag_Driver: string(CliDriverValue),
}, // },
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // map[string]string{
ctx := pilgrim_conf.NewPilgrimContext(cli, env) // EnvVarKey_Driver: "mariadb",
// },
// )
assert.Equal(t, pilgrim_conf.DbDriver_MSSQL, ctx.UrlParts().Driver) // assert.Equal(t, CliDriverValue, context.UrlParts().Driver)
}, // }
)
}
func Test_PilgrimContext_EnvUrlDriverIsNotUsedIfCliDriverOverrideProvided(t *testing.T) { // func Test_PilgrimContext_EnvDriverIsUsedIfNoCliDriverProvided(t *testing.T) {
runTest( // context, _, _ := createPilgrimContextWithDependencies(
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // map[string]string{},
env.EXPECT().Url().Return("mysql://localhost:3306", true) // map[string]string{
cli.EXPECT().Driver().Return(pilgrim_conf.DbDriver_MariaDB, true) // EnvVarKey_Driver: "mariadb",
}, // },
func(env *pilgrim_mock.EnvVarRetriever, cli *pilgrim_mock.CliFlagRetriever) { // )
ctx := pilgrim_conf.NewPilgrimContext(cli, env)
assert.Equal(t, pilgrim_conf.DbDriver_MariaDB, ctx.UrlParts().Driver) // assert.Equal(t, DbDriver_MariaDB, context.UrlParts().Driver)
}, // }
)
} // func Test_PilgrimContext_EnvUrlDriverIsUsedIfNoCliDriverProvided(t *testing.T) {
// context, _, _ := createPilgrimContextWithDependencies(
// map[string]string{},
// map[string]string{
// EnvVarKey_Url: "mariadb://env_host:3306/env_segment1/env_segment2?env_arg1=env_val1&env_arg2=env_val2",
// },
// )
// assert.Equal(t, DbDriver_MariaDB, context.UrlParts().Driver)
// }
// func Test_PilgrimContext_EnvUrlDriverIsNotUsedIfNoCliDriverOverrideProvided(t *testing.T) {
// context, _, _ := createPilgrimContextWithDependencies(
// map[string]string{
// Flag_Driver: "postgres",
// },
// map[string]string{
// EnvVarKey_Url: "mariadb://env_host:3306/env_segment1/env_segment2?env_arg1=env_val1&env_arg2=env_val2",
// },
// )
// assert.Equal(t, DbDriver_Postgres, context.UrlParts().Driver)
// }

View file

@ -1,4 +1,4 @@
package main package pilgrim
import ( import (
"log" "log"