From d8dfdb69b3f6ebd22f2197facb601cbb7632ad64 Mon Sep 17 00:00:00 2001 From: "John Barton (joho)" Date: Tue, 30 Jul 2013 17:48:37 +1000 Subject: [PATCH] Extract a test helper --- godotenv_test.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/godotenv_test.go b/godotenv_test.go index 72f2b28..d51b382 100644 --- a/godotenv_test.go +++ b/godotenv_test.go @@ -5,6 +5,21 @@ import ( "testing" ) +func loadEnvAndCompareValues(t *testing.T, envFileName string, expectedValues map[string]string) { + err := Load(envFileName) + if err != nil { + t.Fatalf("Error loading %v", envFileName) + } + + for k := range expectedValues { + envValue := os.Getenv(k) + v := expectedValues[k] + if envValue != v { + t.Errorf("Mismatch for key '%v': expected '%v' got '%v'", k, v, envValue) + } + } +} + func TestLoadFileNotFound(t *testing.T) { err := Load("somefilethatwillneverexistever.env") if err == nil { @@ -14,11 +29,6 @@ func TestLoadFileNotFound(t *testing.T) { func TestLoadPlainEnv(t *testing.T) { envFileName := "fixtures/plain.env" - err := Load(envFileName) - if err != nil { - t.Fatalf("Error loading %v", envFileName) - } - plainValues := map[string]string{ "OPTION_A": "1", "OPTION_B": "2", @@ -27,11 +37,5 @@ func TestLoadPlainEnv(t *testing.T) { "OPTION_E": "5", } - for k := range plainValues { - envValue := os.Getenv(k) - v := plainValues[k] - if envValue != v { - t.Errorf("Mismatch for key '%v': expected '%v' got '%v'", k, v, envValue) - } - } + loadEnvAndCompareValues(t, envFileName, plainValues) }