Merge branch 'master' of https://code.haedhutner.dev/haedhutner/pilgrim

.gitignore

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

internal/pilgrim_conf_test/context_test.go

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

main.go

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