From d334a3619a9897ff43b76b8f60fa1a0a41b9cbe9 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Sat, 3 Apr 2021 13:18:17 -0400 Subject: Update linting and fix field alignment issues Signed-off-by: Dave Henderson --- gomplate_test.go | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'gomplate_test.go') diff --git a/gomplate_test.go b/gomplate_test.go index 797eb87e..2ea1d241 100644 --- a/gomplate_test.go +++ b/gomplate_test.go @@ -172,29 +172,26 @@ func TestParseTemplateArg(t *testing.T) { afero.WriteFile(fs, "dir/foo.t", []byte("hi"), 0600) afero.WriteFile(fs, "dir/bar.t", []byte("hi"), 0600) + err := parseTemplateArg("bogus.t", templateAliases{}) + assert.Error(t, err) + testdata := []struct { - arg string expected map[string]string - err bool + arg string }{ - {"bogus.t", nil, true}, - {"foo.t", map[string]string{"foo.t": "foo.t"}, false}, - {"foo=foo.t", map[string]string{"foo": "foo.t"}, false}, - {"dir/foo.t", map[string]string{"dir/foo.t": "dir/foo.t"}, false}, - {"foo=dir/foo.t", map[string]string{"foo": "dir/foo.t"}, false}, - {"dir/", map[string]string{"dir/foo.t": "dir/foo.t", "dir/bar.t": "dir/bar.t"}, false}, - {"t=dir/", map[string]string{"t/foo.t": "dir/foo.t", "t/bar.t": "dir/bar.t"}, false}, + {map[string]string{"foo.t": "foo.t"}, "foo.t"}, + {map[string]string{"foo": "foo.t"}, "foo=foo.t"}, + {map[string]string{"dir/foo.t": "dir/foo.t"}, "dir/foo.t"}, + {map[string]string{"foo": "dir/foo.t"}, "foo=dir/foo.t"}, + {map[string]string{"dir/foo.t": "dir/foo.t", "dir/bar.t": "dir/bar.t"}, "dir/"}, + {map[string]string{"t/foo.t": "dir/foo.t", "t/bar.t": "dir/bar.t"}, "t=dir/"}, } for _, d := range testdata { nested := templateAliases{} err := parseTemplateArg(d.arg, nested) - if d.err { - assert.Error(t, err, d.arg) - } else { - assert.NoError(t, err, d.arg) - assert.Equal(t, templateAliases(d.expected), nested, d.arg) - } + assert.NoError(t, err, d.arg) + assert.Equal(t, templateAliases(d.expected), nested, d.arg) } } -- cgit v1.2.3