From 2b5bf1154a891c872ba728e8aaee2902ebb17f06 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Sun, 28 Jul 2019 19:52:01 +0100 Subject: [PATCH] rename config tests --- config/default_test.go | 75 ++++++++++++++++++++++++++---------------- config/issue18_test.go | 60 --------------------------------- 2 files changed, 46 insertions(+), 89 deletions(-) delete mode 100644 config/issue18_test.go diff --git a/config/default_test.go b/config/default_test.go index 9d1bd03e..8a6adc73 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -8,9 +8,25 @@ import ( "testing" "time" + "github.com/micro/go-micro/config/source/env" "github.com/micro/go-micro/config/source/file" ) +func createFileForIssue18(t *testing.T, content string) *os.File { + data := []byte(content) + path := filepath.Join(os.TempDir(), fmt.Sprintf("file.%d", time.Now().UnixNano())) + fh, err := os.Create(path) + if err != nil { + t.Error(err) + } + _, err = fh.Write(data) + if err != nil { + t.Error(err) + } + + return fh +} + func createFileForTest(t *testing.T) *os.File { data := []byte(`{"foo": "bar"}`) path := filepath.Join(os.TempDir(), fmt.Sprintf("file.%d", time.Now().UnixNano())) @@ -26,7 +42,7 @@ func createFileForTest(t *testing.T) *os.File { return fh } -func TestLoadWithGoodFile(t *testing.T) { +func TestConfigLoadWithGoodFile(t *testing.T) { fh := createFileForTest(t) path := fh.Name() defer func() { @@ -44,7 +60,7 @@ func TestLoadWithGoodFile(t *testing.T) { } } -func TestLoadWithInvalidFile(t *testing.T) { +func TestConfigLoadWithInvalidFile(t *testing.T) { fh := createFileForTest(t) path := fh.Name() defer func() { @@ -68,34 +84,35 @@ func TestLoadWithInvalidFile(t *testing.T) { } } -func TestConsul(t *testing.T) { - /*consulSource := consul.NewSource( - // optionally specify consul address; default to localhost:8500 - consul.WithAddress("131.150.38.111:8500"), - // optionally specify prefix; defaults to /micro/config - consul.WithPrefix("/project"), - // optionally strip the provided prefix from the keys, defaults to false - consul.StripPrefix(true), - consul.WithDatacenter("dc1"), - consul.WithToken("xxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"), +func TestConfigMerge(t *testing.T) { + fh := createFileForIssue18(t, `{ + "amqp": { + "host": "rabbit.platform", + "port": 80 + }, + "handler": { + "exchange": "springCloudBus" + } +}`) + path := fh.Name() + defer func() { + fh.Close() + os.Remove(path) + }() + os.Setenv("AMQP_HOST", "rabbit.testing.com") + + conf := NewConfig() + conf.Load( + file.NewSource( + file.WithPath(path), + ), + env.NewSource(), ) - // Create new config - conf := NewConfig() - - // Load file source - err := conf.Load(consulSource) - if err != nil { - t.Error(err) - return + actualHost := conf.Get("amqp", "host").String("backup") + if actualHost != "rabbit.testing.com" { + t.Fatalf("Expected %v but got %v", + "rabbit.testing.com", + actualHost) } - - m := conf.Map() - t.Log("m: ", m) - - v := conf.Get("project", "dc111", "port") - - t.Log("v: ", v.Int(13))*/ - - t.Log("OK") } diff --git a/config/issue18_test.go b/config/issue18_test.go deleted file mode 100644 index 5fed22bf..00000000 --- a/config/issue18_test.go +++ /dev/null @@ -1,60 +0,0 @@ -package config - -import ( - "fmt" - "os" - "path/filepath" - "testing" - "time" - - "github.com/micro/go-micro/config/source/env" - "github.com/micro/go-micro/config/source/file" -) - -func createFileForIssue18(t *testing.T, content string) *os.File { - data := []byte(content) - path := filepath.Join(os.TempDir(), fmt.Sprintf("file.%d", time.Now().UnixNano())) - fh, err := os.Create(path) - if err != nil { - t.Error(err) - } - _, err = fh.Write(data) - if err != nil { - t.Error(err) - } - - return fh -} - -func TestIssue18(t *testing.T) { - fh := createFileForIssue18(t, `{ - "amqp": { - "host": "rabbit.platform", - "port": 80 - }, - "handler": { - "exchange": "springCloudBus" - } -}`) - path := fh.Name() - defer func() { - fh.Close() - os.Remove(path) - }() - os.Setenv("AMQP_HOST", "rabbit.testing.com") - - conf := NewConfig() - conf.Load( - file.NewSource( - file.WithPath(path), - ), - env.NewSource(), - ) - - actualHost := conf.Get("amqp", "host").String("backup") - if actualHost != "rabbit.testing.com" { - t.Fatalf("Expected %v but got %v", - "rabbit.testing.com", - actualHost) - } -}