From df8c9aab0c056dce7a6ca68aa2b8490efa0daf02 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 8 Jan 2025 22:27:19 +0000 Subject: [PATCH] Rehabilitate tests --- cmd/africastalking/main.go | 8 +------- cmd/async/main.go | 8 +------- cmd/http/main.go | 8 +------- cmd/main.go | 8 +------- devtools/store/generate/main.go | 2 +- initializers/load.go | 10 +++++++--- internal/storage/storageservice.go | 8 -------- internal/testutil/engine.go | 4 +++- menutraversal_test/menu_traversal_test.go | 3 +-- 9 files changed, 16 insertions(+), 43 deletions(-) diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go index 6be7a11..053eab9 100644 --- a/cmd/africastalking/main.go +++ b/cmd/africastalking/main.go @@ -15,7 +15,6 @@ import ( "git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/lang" - testdataloader "github.com/peteole/testdata-loader" "git.grassecon.net/urdt/ussd/config" "git.grassecon.net/urdt/ussd/initializers" @@ -28,14 +27,13 @@ import ( var ( logg = logging.NewVanilla().WithDomain("AfricasTalking").WithContextKey("at-session-id") - baseDir = testdataloader.GetBasePath() scriptDir = path.Join("services", "registration") build = "dev" menuSeparator = ": " ) func init() { - initializers.LoadEnvVariables(baseDir) + initializers.LoadEnvVariables() } func main() { @@ -44,8 +42,6 @@ func main() { var connStr string var resourceDir string var size uint - var database string - var dbSchema string var engineDebug bool var host string var port uint @@ -75,8 +71,6 @@ func main() { logg.Infof("start command", "build", build, "conn", connData, "resourcedir", resourceDir, "outputsize", size) ctx := context.Background() - ctx = context.WithValue(ctx, "Database", database) - ctx = context.WithValue(ctx, "Schema", dbSchema) ln, err := lang.LanguageFromCode(config.DefaultLanguage) if err != nil { fmt.Fprintf(os.Stderr, "default language set error: %v", err) diff --git a/cmd/async/main.go b/cmd/async/main.go index 59af2e5..0b9a233 100644 --- a/cmd/async/main.go +++ b/cmd/async/main.go @@ -13,7 +13,6 @@ import ( "git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/lang" - testdataloader "github.com/peteole/testdata-loader" "git.grassecon.net/urdt/ussd/config" "git.grassecon.net/urdt/ussd/initializers" @@ -25,13 +24,12 @@ import ( var ( logg = logging.NewVanilla() - baseDir = testdataloader.GetBasePath() scriptDir = path.Join("services", "registration") menuSeparator = ": " ) func init() { - initializers.LoadEnvVariables(baseDir) + initializers.LoadEnvVariables() } type asyncRequestParser struct { @@ -54,8 +52,6 @@ func main() { var sessionId string var resourceDir string var size uint - var database string - var dbSchema string var engineDebug bool var host string var port uint @@ -86,8 +82,6 @@ func main() { logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId) ctx := context.Background() - ctx = context.WithValue(ctx, "Database", database) - ctx = context.WithValue(ctx, "Schema", dbSchema) ln, err := lang.LanguageFromCode(config.DefaultLanguage) if err != nil { diff --git a/cmd/http/main.go b/cmd/http/main.go index af0aefc..761ee72 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -15,7 +15,6 @@ import ( "git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/lang" - testdataloader "github.com/peteole/testdata-loader" "git.grassecon.net/urdt/ussd/config" "git.grassecon.net/urdt/ussd/initializers" @@ -28,13 +27,12 @@ import ( var ( logg = logging.NewVanilla() - baseDir = testdataloader.GetBasePath() scriptDir = path.Join("services", "registration") menuSeparator = ": " ) func init() { - initializers.LoadEnvVariables(baseDir) + initializers.LoadEnvVariables() } func main() { @@ -43,8 +41,6 @@ func main() { var connStr string var resourceDir string var size uint - var database string - var dbSchema string var engineDebug bool var host string var port uint @@ -74,8 +70,6 @@ func main() { logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size) ctx := context.Background() - ctx = context.WithValue(ctx, "Database", database) - ctx = context.WithValue(ctx, "Schema", dbSchema) ln, err := lang.LanguageFromCode(config.DefaultLanguage) if err != nil { diff --git a/cmd/main.go b/cmd/main.go index 5c89c05..8c06094 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -17,18 +17,16 @@ import ( "git.grassecon.net/urdt/ussd/internal/storage" "git.grassecon.net/urdt/ussd/internal/args" "git.grassecon.net/urdt/ussd/remote" - testdataloader "github.com/peteole/testdata-loader" ) var ( logg = logging.NewVanilla() - baseDir = testdataloader.GetBasePath() scriptDir = path.Join("services", "registration") menuSeparator = ": " ) func init() { - initializers.LoadEnvVariables(baseDir) + initializers.LoadEnvVariables() } // TODO: external script automatically generate language handler list from select language vise code OR consider dynamic menu generation script possibility @@ -38,8 +36,6 @@ func main() { var connStr string var size uint var sessionId string - var database string - var dbSchema string var engineDebug bool var resourceDir string var err error @@ -72,8 +68,6 @@ func main() { ctx := context.Background() ctx = context.WithValue(ctx, "SessionId", sessionId) - ctx = context.WithValue(ctx, "Database", database) - ctx = context.WithValue(ctx, "Schema", dbSchema) ln, err := lang.LanguageFromCode(config.DefaultLanguage) if err != nil { diff --git a/devtools/store/generate/main.go b/devtools/store/generate/main.go index 58a9808..c421d1a 100644 --- a/devtools/store/generate/main.go +++ b/devtools/store/generate/main.go @@ -23,7 +23,7 @@ var ( ) func init() { - initializers.LoadEnvVariables(baseDir) + initializers.LoadEnvVariables() } func main() { diff --git a/initializers/load.go b/initializers/load.go index 4cbeb0e..fc61746 100644 --- a/initializers/load.go +++ b/initializers/load.go @@ -9,9 +9,13 @@ import ( "github.com/joho/godotenv" ) -func LoadEnvVariables(baseDir string) { - envDir := path.Join(baseDir, ".env") - err := godotenv.Load(envDir) +func LoadEnvVariables() { + LoadEnvVariablesPath(".") +} + +func LoadEnvVariablesPath(dir string) { + fp := path.Join(dir, ".env") + err := godotenv.Load(fp) if err != nil { log.Fatal("Error loading .env file", err) } diff --git a/internal/storage/storageservice.go b/internal/storage/storageservice.go index f2ac273..617c0ef 100644 --- a/internal/storage/storageservice.go +++ b/internal/storage/storageservice.go @@ -55,14 +55,6 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D connStr := ms.conn.String() dbTyp := ms.conn.DbType() if dbTyp == DBTYPE_POSTGRES { -// // Ensure the schema exists -// err = ensureSchemaExists(ctx, connStr, schema) -// if err != nil { -// return nil, fmt.Errorf("failed to ensure schema exists: %w", err) -// } -// -// newDb = postgres.NewPgDb().WithSchema(schema) - newDb = postgres.NewPgDb() } else if dbTyp == DBTYPE_GDBM { err = ms.ensureDbDir() diff --git a/internal/testutil/engine.go b/internal/testutil/engine.go index a1eefa8..8d5d3e4 100644 --- a/internal/testutil/engine.go +++ b/internal/testutil/engine.go @@ -17,17 +17,19 @@ import ( "git.grassecon.net/urdt/ussd/internal/testutil/testservice" "git.grassecon.net/urdt/ussd/internal/testutil/testtag" "git.grassecon.net/urdt/ussd/remote" + testdataloader "github.com/peteole/testdata-loader" ) var ( logg = logging.NewVanilla() + baseDir = testdataloader.GetBasePath() scriptDir = path.Join(baseDir, "services", "registration") selectedDatabase = "" selectedDbSchema = "" ) func init() { - initializers.LoadEnvVariables() + initializers.LoadEnvVariablesPath(baseDir) } // SetDatabase updates the database used by TestEngine diff --git a/menutraversal_test/menu_traversal_test.go b/menutraversal_test/menu_traversal_test.go index db4586a..4003641 100644 --- a/menutraversal_test/menu_traversal_test.go +++ b/menutraversal_test/menu_traversal_test.go @@ -12,7 +12,6 @@ import ( "regexp" "testing" - "git.grassecon.net/urdt/ussd/internal/storage" "git.grassecon.net/urdt/ussd/internal/testutil" "git.grassecon.net/urdt/ussd/internal/testutil/driver" "github.com/gofrs/uuid" @@ -106,7 +105,7 @@ func TestMain(m *testing.M) { defer func() { if *database == "postgres" { ctx := context.Background() - connStr := storage.BuildConnStr() + connStr := "postgres://" //storage.BuildConnStr() dbConn, err := pgxpool.New(ctx, connStr) if err != nil { log.Fatalf("Failed to connect to database for cleanup: %v", err)