From 74eebfe72253e654989969a6f4e18d592e7dbb9e Mon Sep 17 00:00:00 2001 From: raittes Date: Tue, 31 Mar 2020 21:11:54 -0300 Subject: [PATCH] tests(reader) fix tests to support multiple args in state flag --- file/reader_test.go | 12 ++++++------ file/readfile_test.go | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/file/reader_test.go b/file/reader_test.go index a37b4a312..1cdaaf9b5 100644 --- a/file/reader_test.go +++ b/file/reader_test.go @@ -40,9 +40,9 @@ func Test_ensureJSON(t *testing.T) { } func TestReadKongStateFromStdinFailsToParseText(t *testing.T) { - var filename = "-" + var filenames = []string{"-"} assert := assert.New(t) - assert.Equal("-", filename) + assert.Equal("-", filenames[0]) var content bytes.Buffer content.Write([]byte("hunter2\n")) @@ -66,15 +66,15 @@ func TestReadKongStateFromStdinFailsToParseText(t *testing.T) { os.Stdin = tmpfile - c, err := GetContentFromFile(filename) + c, err := GetContentFromFiles(filenames) assert.NotNil(err) assert.Nil(c) } func TestReadKongStateFromStdin(t *testing.T) { - var filename = "-" + var filenames = []string{"-"} assert := assert.New(t) - assert.Equal("-", filename) + assert.Equal("-", filenames[0]) var content bytes.Buffer content.Write([]byte("services:\n- host: test.com\n name: test service\n")) @@ -98,7 +98,7 @@ func TestReadKongStateFromStdin(t *testing.T) { os.Stdin = tmpfile - c, err := GetContentFromFile(filename) + c, err := GetContentFromFiles(filenames) assert.NotNil(c) assert.Nil(err) diff --git a/file/readfile_test.go b/file/readfile_test.go index eb6fe278d..ce0572266 100644 --- a/file/readfile_test.go +++ b/file/readfile_test.go @@ -126,7 +126,7 @@ func Test_getReaders(t *testing.T) { func Test_getContent(t *testing.T) { type args struct { - fileOrDir string + filenames []string } tests := []struct { name string @@ -136,37 +136,37 @@ func Test_getContent(t *testing.T) { }{ { name: "directory does not exist", - args: args{"testdata/does-not-exist"}, + args: args{[]string{"testdata/does-not-exist"}}, want: nil, wantErr: true, }, { name: "empty directory", - args: args{"testdata/emptydir"}, + args: args{[]string{"testdata/emptydir"}}, want: &Content{}, wantErr: false, }, { name: "directory with empty files", - args: args{"testdata/emptyfiles"}, + args: args{[]string{"testdata/emptyfiles"}}, want: &Content{}, wantErr: false, }, { name: "bad yaml", - args: args{"testdata/badyaml"}, + args: args{[]string{"testdata/badyaml"}}, want: nil, wantErr: true, }, { name: "bad JSON", - args: args{"testdata/badjson"}, + args: args{[]string{"testdata/badjson"}}, want: nil, wantErr: true, }, { name: "single file", - args: args{"testdata/file.yaml"}, + args: args{[]string{"testdata/file.yaml"}}, want: &Content{ Services: []FService{ { @@ -196,7 +196,7 @@ func Test_getContent(t *testing.T) { }, { name: "valid directory", - args: args{"testdata/valid"}, + args: args{[]string{"testdata/valid"}}, want: &Content{ Info: &Info{ SelectorTags: []string{"tag1"}, @@ -262,7 +262,7 @@ func Test_getContent(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := getContent(tt.args.fileOrDir) + got, err := getContent(tt.args.filenames) if (err != nil) != tt.wantErr { t.Errorf("getContent() error = %v, wantErr %v", err, tt.wantErr) return