summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/cmd/config_test.go48
-rw-r--r--internal/datafs/fsys_test.go4
-rw-r--r--internal/datafs/getenv_test.go2
-rw-r--r--internal/datafs/mergefs.go2
-rw-r--r--internal/datafs/reader.go4
-rw-r--r--internal/datafs/reader_test.go2
-rw-r--r--internal/datafs/wdfs_test.go4
-rw-r--r--internal/funcs/aws_test.go4
-rw-r--r--internal/funcs/coll_test.go34
-rw-r--r--internal/funcs/crypto.go4
-rw-r--r--internal/funcs/datasource_test.go4
-rw-r--r--internal/funcs/filepath_unix_test.go2
-rw-r--r--internal/funcs/math_test.go10
-rw-r--r--internal/funcs/regexp_test.go20
-rw-r--r--internal/funcs/strings_test.go4
-rw-r--r--internal/iohelpers/writers_test.go4
-rw-r--r--internal/parsers/parsefuncs_test.go38
-rw-r--r--internal/tests/integration/config_test.go4
-rw-r--r--internal/tests/integration/integration_test.go6
-rw-r--r--internal/urlhelpers/urlhelpers_test.go10
20 files changed, 105 insertions, 105 deletions
diff --git a/internal/cmd/config_test.go b/internal/cmd/config_test.go
index 069d10ce..65be5753 100644
--- a/internal/cmd/config_test.go
+++ b/internal/cmd/config_test.go
@@ -50,7 +50,7 @@ func TestReadConfigFile(t *testing.T) {
cfg, err := readConfigFile(ctx, cmd)
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{}, cfg)
+ assert.Equal(t, &gomplate.Config{}, cfg)
cmd.ParseFlags([]string{"--config", "config.yaml"})
@@ -58,7 +58,7 @@ func TestReadConfigFile(t *testing.T) {
cfg, err = readConfigFile(ctx, cmd)
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{Input: "hello world"}, cfg)
+ assert.Equal(t, &gomplate.Config{Input: "hello world"}, cfg)
fsys["config.yaml"] = &fstest.MapFile{Data: []byte("in: hello world\nin: \n")}
@@ -96,7 +96,7 @@ func TestLoadConfig(t *testing.T) {
Stderr: stderr,
}
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
cmd.ParseFlags([]string{"--in", "foo"})
out, err = loadConfig(ctx, cmd, cmd.Flags().Args())
@@ -107,7 +107,7 @@ func TestLoadConfig(t *testing.T) {
Stderr: stderr,
}
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
cmd.ParseFlags([]string{"--in", "foo", "--exec-pipe", "--", "tr", "[a-z]", "[A-Z]"})
out, err = loadConfig(ctx, cmd, cmd.Flags().Args())
@@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) {
Stderr: stderr,
}
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
}
func TestPostExecInput(t *testing.T) {
@@ -154,13 +154,13 @@ func TestCobraConfig(t *testing.T) {
cfg, err := cobraConfig(cmd, cmd.Flags().Args())
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{}, cfg)
+ assert.Equal(t, &gomplate.Config{}, cfg)
cmd.ParseFlags([]string{"--file", "in", "--", "echo", "foo"})
cfg, err = cobraConfig(cmd, cmd.Flags().Args())
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{
+ assert.Equal(t, &gomplate.Config{
InputFiles: []string{"in"},
PostExec: []string{"echo", "foo"},
}, cfg)
@@ -179,7 +179,7 @@ func TestProcessIncludes(t *testing.T) {
}
for _, d := range data {
- assert.EqualValues(t, d.expected, processIncludes(d.inc, d.exc))
+ assert.Equal(t, d.expected, processIncludes(d.inc, d.exc))
}
}
@@ -221,7 +221,7 @@ func TestPickConfigFile(t *testing.T) {
cf, req, skip := pickConfigFile(cmd)
assert.False(t, req)
assert.True(t, skip)
- assert.Equal(t, "", cf)
+ assert.Empty(t, cf)
})
t.Run("GOMPLATE_CONFIG env var with empty value should skip reading", func(t *testing.T) {
@@ -229,7 +229,7 @@ func TestPickConfigFile(t *testing.T) {
cf, req, skip := pickConfigFile(cmd)
assert.False(t, req)
assert.True(t, skip)
- assert.Equal(t, "", cf)
+ assert.Empty(t, cf)
})
}
@@ -308,7 +308,7 @@ func TestApplyEnvVars(t *testing.T) {
actual, err := applyEnvVars(context.Background(), d.input)
require.NoError(t, err)
- assert.EqualValues(t, d.expected, actual)
+ assert.Equal(t, d.expected, actual)
})
}
}
@@ -327,7 +327,7 @@ func TestParseDataSourceFlags(t *testing.T) {
cfg := &gomplate.Config{}
err := parseDataSourceFlags(cfg, nil, nil, nil, nil)
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{}, cfg)
+ assert.Equal(t, &gomplate.Config{}, cfg)
cfg = &gomplate.Config{}
err = parseDataSourceFlags(cfg, []string{"foo/bar/baz.json"}, nil, nil, nil)
@@ -341,7 +341,7 @@ func TestParseDataSourceFlags(t *testing.T) {
"baz": {URL: mustURL("foo/bar/baz.json")},
},
}
- assert.EqualValues(t, expected, cfg, "expected: %+v\nactual: %+v\n", expected, cfg)
+ assert.Equal(t, expected, cfg, "expected: %+v\nactual: %+v\n", expected, cfg)
cfg = &gomplate.Config{}
err = parseDataSourceFlags(cfg,
@@ -350,7 +350,7 @@ func TestParseDataSourceFlags(t *testing.T) {
nil,
[]string{"baz=Accept: application/json"})
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{
+ assert.Equal(t, &gomplate.Config{
DataSources: map[string]gomplate.DataSource{
"baz": {
URL: mustURL("foo/bar/baz.json"),
@@ -372,7 +372,7 @@ func TestParseDataSourceFlags(t *testing.T) {
},
)
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{
+ assert.Equal(t, &gomplate.Config{
DataSources: map[string]gomplate.DataSource{
"baz": {URL: mustURL("foo/bar/baz.json")},
},
@@ -397,7 +397,7 @@ func TestParseDataSourceFlags(t *testing.T) {
[]string{"foo=Accept: application/json", "bar=Authorization: Basic xxxxx"},
)
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{
+ assert.Equal(t, &gomplate.Config{
Templates: map[string]gomplate.DataSource{
"foo": {
URL: mustURL("http://example.com"),
@@ -421,7 +421,7 @@ func TestParsePluginFlags(t *testing.T) {
cfg = &gomplate.Config{}
err = ParsePluginFlags(cfg, []string{"foo=bar"})
require.NoError(t, err)
- assert.EqualValues(t, &gomplate.Config{Plugins: map[string]gomplate.PluginConfig{"foo": {Cmd: "bar"}}}, cfg)
+ assert.Equal(t, &gomplate.Config{Plugins: map[string]gomplate.PluginConfig{"foo": {Cmd: "bar"}}}, cfg)
}
func TestParseDatasourceArgNoAlias(t *testing.T) {
@@ -441,7 +441,7 @@ func TestParseDatasourceArgWithAlias(t *testing.T) {
alias, ds, err := parseDatasourceArg("data=foo.json")
require.NoError(t, err)
assert.Equal(t, "data", alias)
- assert.EqualValues(t, &url.URL{Path: "foo.json"}, ds.URL)
+ assert.Equal(t, &url.URL{Path: "foo.json"}, ds.URL)
alias, ds, err = parseDatasourceArg("data=/otherdir/foo.json")
require.NoError(t, err)
@@ -454,33 +454,33 @@ func TestParseDatasourceArgWithAlias(t *testing.T) {
alias, ds, err = parseDatasourceArg("data=foo.json")
require.NoError(t, err)
assert.Equal(t, "data", alias)
- assert.EqualValues(t, &url.URL{Path: "foo.json"}, ds.URL)
+ assert.Equal(t, &url.URL{Path: "foo.json"}, ds.URL)
alias, ds, err = parseDatasourceArg(`data=\otherdir\foo.json`)
require.NoError(t, err)
assert.Equal(t, "data", alias)
- assert.EqualValues(t, &url.URL{Scheme: "file", Path: "/otherdir/foo.json"}, ds.URL)
+ assert.Equal(t, &url.URL{Scheme: "file", Path: "/otherdir/foo.json"}, ds.URL)
alias, ds, err = parseDatasourceArg("data=C:\\windowsdir\\foo.json")
require.NoError(t, err)
assert.Equal(t, "data", alias)
- assert.EqualValues(t, &url.URL{Scheme: "file", Path: "C:/windowsdir/foo.json"}, ds.URL)
+ assert.Equal(t, &url.URL{Scheme: "file", Path: "C:/windowsdir/foo.json"}, ds.URL)
alias, ds, err = parseDatasourceArg("data=\\\\somehost\\share\\foo.json")
require.NoError(t, err)
assert.Equal(t, "data", alias)
- assert.EqualValues(t, &url.URL{Scheme: "file", Host: "somehost", Path: "/share/foo.json"}, ds.URL)
+ assert.Equal(t, &url.URL{Scheme: "file", Host: "somehost", Path: "/share/foo.json"}, ds.URL)
}
alias, ds, err = parseDatasourceArg("data=sftp://example.com/blahblah/foo.json")
require.NoError(t, err)
assert.Equal(t, "data", alias)
- assert.EqualValues(t, &url.URL{Scheme: "sftp", Host: "example.com", Path: "/blahblah/foo.json"}, ds.URL)
+ assert.Equal(t, &url.URL{Scheme: "sftp", Host: "example.com", Path: "/blahblah/foo.json"}, ds.URL)
alias, ds, err = parseDatasourceArg("merged=merge:./foo.yaml|http://example.com/bar.json%3Ffoo=bar")
require.NoError(t, err)
assert.Equal(t, "merged", alias)
- assert.EqualValues(t, &url.URL{Scheme: "merge", Opaque: "./foo.yaml|http://example.com/bar.json%3Ffoo=bar"}, ds.URL)
+ assert.Equal(t, &url.URL{Scheme: "merge", Opaque: "./foo.yaml|http://example.com/bar.json%3Ffoo=bar"}, ds.URL)
}
func TestParseHeaderArgs(t *testing.T) {
diff --git a/internal/datafs/fsys_test.go b/internal/datafs/fsys_test.go
index 14e2a0bd..b675c6a6 100644
--- a/internal/datafs/fsys_test.go
+++ b/internal/datafs/fsys_test.go
@@ -30,7 +30,7 @@ func TestFSysForPath(t *testing.T) {
fsp := fsimpl.FSProviderFunc(func(u *url.URL) (fs.FS, error) {
assert.Equal(t, "file", u.Scheme)
- if runtime.GOOS == "windows" {
+ if runtime.GOOS == osWindows {
assert.Equal(t, vol+"/tmp/foo/", u.Path)
return os.DirFS(vol + "/"), nil
}
@@ -61,7 +61,7 @@ func TestFSysForPath(t *testing.T) {
t.Run("git+file url", func(t *testing.T) {
fsp := fsimpl.FSProviderFunc(func(u *url.URL) (fs.FS, error) {
assert.Equal(t, "git+file", u.Scheme)
- if runtime.GOOS == "windows" {
+ if runtime.GOOS == osWindows {
assert.Equal(t, vol+"/tmp/repo/", u.Path)
} else {
assert.Equal(t, "/tmp/repo", u.Path)
diff --git a/internal/datafs/getenv_test.go b/internal/datafs/getenv_test.go
index c05a4c4b..8e5cc4df 100644
--- a/internal/datafs/getenv_test.go
+++ b/internal/datafs/getenv_test.go
@@ -46,7 +46,7 @@ func TestExpandEnvFsys(t *testing.T) {
fsys = writeOnly(fsys)
t.Setenv("FOO_FILE", "/tmp/unreadable")
- assert.Equal(t, "", ExpandEnvFsys(fsys, "${FOO}"))
+ assert.Empty(t, ExpandEnvFsys(fsys, "${FOO}"))
}
// Maybe extract this into a separate package sometime...
diff --git a/internal/datafs/mergefs.go b/internal/datafs/mergefs.go
index 4c10fb1d..ac5a5013 100644
--- a/internal/datafs/mergefs.go
+++ b/internal/datafs/mergefs.go
@@ -133,7 +133,7 @@ func (f *mergeFS) Open(name string) (fs.File, error) {
// need to support absolute paths on local filesystem too
// TODO: this is a hack, probably fix this?
- if fsURL.Scheme == "file" && runtime.GOOS != "windows" {
+ if fsURL.Scheme == "file" && runtime.GOOS != osWindows {
base = fsURL.Path + base
}
diff --git a/internal/datafs/reader.go b/internal/datafs/reader.go
index 298fd9da..0297ac69 100644
--- a/internal/datafs/reader.go
+++ b/internal/datafs/reader.go
@@ -18,6 +18,8 @@ import (
"github.com/hairyhenderson/gomplate/v4/internal/iohelpers"
)
+const osWindows = "windows"
+
// typeOverrideParam gets the query parameter used to override the content type
// used to parse a given datasource - use GOMPLATE_TYPE_PARAM to use a different
// parameter name.
@@ -132,7 +134,7 @@ func (d *dsReader) readFileContent(ctx context.Context, u *url.URL, hdr http.Hea
// need to support absolute paths on local filesystem too
// TODO: this is a hack, probably fix this?
- if u.Scheme == "file" && runtime.GOOS != "windows" {
+ if u.Scheme == "file" && runtime.GOOS != osWindows {
fname = u.Path + fname
}
diff --git a/internal/datafs/reader_test.go b/internal/datafs/reader_test.go
index dbb37edc..a89656a7 100644
--- a/internal/datafs/reader_test.go
+++ b/internal/datafs/reader_test.go
@@ -19,8 +19,6 @@ import (
"github.com/stretchr/testify/require"
)
-const osWindows = "windows"
-
func TestResolveURL(t *testing.T) {
out, err := resolveURL(*mustParseURL("http://example.com/foo.json"), "bar.json")
require.NoError(t, err)
diff --git a/internal/datafs/wdfs_test.go b/internal/datafs/wdfs_test.go
index 30fd5cf0..571f1e83 100644
--- a/internal/datafs/wdfs_test.go
+++ b/internal/datafs/wdfs_test.go
@@ -158,14 +158,14 @@ func TestWDFS_WriteOps(t *testing.T) {
func skipWindows(t *testing.T) {
t.Helper()
- if runtime.GOOS == "windows" {
+ if runtime.GOOS == osWindows {
t.Skip("skipping non-Windows test")
}
}
func skipNonWindows(t *testing.T) {
t.Helper()
- if runtime.GOOS != "windows" {
+ if runtime.GOOS != osWindows {
t.Skip("skipping Windows test")
}
}
diff --git a/internal/funcs/aws_test.go b/internal/funcs/aws_test.go
index 396d7826..4804839f 100644
--- a/internal/funcs/aws_test.go
+++ b/internal/funcs/aws_test.go
@@ -33,8 +33,8 @@ func TestAWSFuncs(t *testing.T) {
i := aws.NewDummyEc2Info(m)
af := &Funcs{meta: m, info: i}
assert.Equal(t, "unknown", must(af.EC2Region()))
- assert.Equal(t, "", must(af.EC2Meta("foo")))
- assert.Equal(t, "", must(af.EC2Tag("foo")))
+ assert.Empty(t, must(af.EC2Meta("foo")))
+ assert.Empty(t, must(af.EC2Tag("foo")))
assert.Equal(t, "unknown", must(af.EC2Region()))
}
diff --git a/internal/funcs/coll_test.go b/internal/funcs/coll_test.go
index 86e53e65..178f537d 100644
--- a/internal/funcs/coll_test.go
+++ b/internal/funcs/coll_test.go
@@ -40,11 +40,11 @@ func TestFlatten(t *testing.T) {
out, err := c.Flatten([]any{1, []any{[]int{2}, 3}})
require.NoError(t, err)
- assert.EqualValues(t, []any{1, 2, 3}, out)
+ assert.Equal(t, []any{1, 2, 3}, out)
out, err = c.Flatten(1, []any{1, []any{[]int{2}, 3}})
require.NoError(t, err)
- assert.EqualValues(t, []any{1, []int{2}, 3}, out)
+ assert.Equal(t, []any{1, []int{2}, 3}, out)
}
func TestPick(t *testing.T) {
@@ -74,7 +74,7 @@ func TestPick(t *testing.T) {
}
out, err := c.Pick("baz", in)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{}, out)
+ assert.Equal(t, map[string]any{}, out)
expected := map[string]any{
"foo": "bar",
@@ -82,18 +82,18 @@ func TestPick(t *testing.T) {
}
out, err = c.Pick("foo", "bar", in)
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
expected = map[string]any{
"": "baz",
}
out, err = c.Pick("", in)
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
out, err = c.Pick("foo", "bar", "", in)
require.NoError(t, err)
- assert.EqualValues(t, in, out)
+ assert.Equal(t, in, out)
t.Run("supports slice key", func(t *testing.T) {
t.Parallel()
@@ -105,7 +105,7 @@ func TestPick(t *testing.T) {
}
out, err := c.Pick([]string{"foo", "bar"}, in)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{"foo": "bar", "bar": true}, out)
+ assert.Equal(t, map[string]any{"foo": "bar", "bar": true}, out)
})
}
@@ -136,7 +136,7 @@ func TestOmit(t *testing.T) {
}
out, err := c.Omit("baz", in)
require.NoError(t, err)
- assert.EqualValues(t, in, out)
+ assert.Equal(t, in, out)
expected := map[string]any{
"foo": "bar",
@@ -144,18 +144,18 @@ func TestOmit(t *testing.T) {
}
out, err = c.Omit("", in)
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
expected = map[string]any{
"": "baz",
}
out, err = c.Omit("foo", "bar", in)
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
out, err = c.Omit("foo", "bar", "", in)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{}, out)
+ assert.Equal(t, map[string]any{}, out)
t.Run("supports slice of strings", func(t *testing.T) {
t.Parallel()
@@ -167,7 +167,7 @@ func TestOmit(t *testing.T) {
}
out, err := c.Omit([]string{"foo", "bar"}, in)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{"": "baz"}, out)
+ assert.Equal(t, map[string]any{"": "baz"}, out)
})
t.Run("supports slice of any", func(t *testing.T) {
@@ -180,7 +180,7 @@ func TestOmit(t *testing.T) {
}
out, err := c.Omit([]any{"foo", "bar"}, in)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{"": "baz"}, out)
+ assert.Equal(t, map[string]any{"": "baz"}, out)
})
}
@@ -207,14 +207,14 @@ func TestGoSlice(t *testing.T) {
out, err := c.GoSlice(in)
require.NoError(t, err)
assert.Equal(t, reflect.TypeOf([]int{}), out.Type())
- assert.EqualValues(t, []int{1}, out.Interface())
+ assert.Equal(t, []int{1}, out.Interface())
// valid slice, slicing
in = reflect.ValueOf([]string{"foo", "bar", "baz"})
out, err = c.GoSlice(in, reflect.ValueOf(1), reflect.ValueOf(3))
require.NoError(t, err)
assert.Equal(t, reflect.TypeOf([]string{}), out.Type())
- assert.EqualValues(t, []string{"bar", "baz"}, out.Interface())
+ assert.Equal(t, []string{"bar", "baz"}, out.Interface())
}
func TestCollFuncs_Set(t *testing.T) {
@@ -225,12 +225,12 @@ func TestCollFuncs_Set(t *testing.T) {
m := map[string]any{"foo": "bar"}
out, err := c.Set("foo", "baz", m)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{"foo": "baz"}, out)
+ assert.Equal(t, map[string]any{"foo": "baz"}, out)
// m was modified so foo is now baz
out, err = c.Set("bar", "baz", m)
require.NoError(t, err)
- assert.EqualValues(t, map[string]any{"foo": "baz", "bar": "baz"}, out)
+ assert.Equal(t, map[string]any{"foo": "baz", "bar": "baz"}, out)
}
func TestCollFuncs_Unset(t *testing.T) {
diff --git a/internal/funcs/crypto.go b/internal/funcs/crypto.go
index 63387c1c..28b3b7ce 100644
--- a/internal/funcs/crypto.go
+++ b/internal/funcs/crypto.go
@@ -101,7 +101,7 @@ func (f CryptoFuncs) SHA512(input any) string {
// SHA512_224 -
//
-//nolint:revive,stylecheck
+//nolint:revive
func (f CryptoFuncs) SHA512_224(input any) string {
out, _ := f.SHA512_224Bytes(input)
return fmt.Sprintf("%02x", out)
@@ -109,7 +109,7 @@ func (f CryptoFuncs) SHA512_224(input any) string {
// SHA512_256 -
//
-//nolint:revive,stylecheck
+//nolint:revive
func (f CryptoFuncs) SHA512_256(input any) string {
out, _ := f.SHA512_256Bytes(input)
return fmt.Sprintf("%02x", out)
diff --git a/internal/funcs/datasource_test.go b/internal/funcs/datasource_test.go
index 18050009..3f0c0e97 100644
--- a/internal/funcs/datasource_test.go
+++ b/internal/funcs/datasource_test.go
@@ -82,7 +82,7 @@ func TestDatasource(t *testing.T) {
d := setup("", nil)
actual, err := d.Datasource("foo")
require.NoError(t, err)
- assert.Equal(t, "", actual)
+ assert.Empty(t, actual)
_, err = d.Datasource("bar")
require.Error(t, err)
@@ -168,7 +168,7 @@ func TestDefineDatasource(t *testing.T) {
_, err = d.DefineDatasource("data", "foo.json")
s, _ := reg.Lookup("data")
require.NoError(t, err)
- assert.EqualValues(t, &url.URL{Path: "foo.json"}, s.URL)
+ assert.Equal(t, &url.URL{Path: "foo.json"}, s.URL)
reg = datafs.NewRegistry()
d = &dataSourceFuncs{sr: datafs.NewSourceReader(reg)}
diff --git a/internal/funcs/filepath_unix_test.go b/internal/funcs/filepath_unix_test.go
index 381e7432..a598dda8 100644
--- a/internal/funcs/filepath_unix_test.go
+++ b/internal/funcs/filepath_unix_test.go
@@ -29,5 +29,5 @@ func TestFilePathFuncs(t *testing.T) {
r, _ := f.Rel("/foo/bar", "/foo/bar/baz")
assert.Equal(t, "baz", r)
assert.Equal(t, []string{"/foo/bar/", "baz"}, f.Split("/foo/bar/baz"))
- assert.Equal(t, "", f.VolumeName("/foo/bar"))
+ assert.Empty(t, f.VolumeName("/foo/bar"))
}
diff --git a/internal/funcs/math_test.go b/internal/funcs/math_test.go
index 717db2b6..51f85b79 100644
--- a/internal/funcs/math_test.go
+++ b/internal/funcs/math_test.go
@@ -169,11 +169,11 @@ func TestSeq(t *testing.T) {
t.Parallel()
m := MathFuncs{}
- assert.EqualValues(t, []int64{0, 1, 2, 3}, mustSeq(t, 0, 3))
- assert.EqualValues(t, []int64{1, 0}, mustSeq(t, 0))
- assert.EqualValues(t, []int64{0, 2, 4}, mustSeq(t, 0, 4, 2))
- assert.EqualValues(t, []int64{0, 2, 4}, mustSeq(t, 0, 5, 2))
- assert.EqualValues(t, []int64{0}, mustSeq(t, 0, 5, 8))
+ assert.Equal(t, []int64{0, 1, 2, 3}, mustSeq(t, 0, 3))
+ assert.Equal(t, []int64{1, 0}, mustSeq(t, 0))
+ assert.Equal(t, []int64{0, 2, 4}, mustSeq(t, 0, 4, 2))
+ assert.Equal(t, []int64{0, 2, 4}, mustSeq(t, 0, 5, 2))
+ assert.Equal(t, []int64{0}, mustSeq(t, 0, 5, 8))
_, err := m.Seq()
require.Error(t, err)
}
diff --git a/internal/funcs/regexp_test.go b/internal/funcs/regexp_test.go
index ac038eab..6d0619ce 100644
--- a/internal/funcs/regexp_test.go
+++ b/internal/funcs/regexp_test.go
@@ -63,7 +63,7 @@ func TestFind(t *testing.T) {
f, err = re.Find(false, 42)
require.NoError(t, err)
- assert.Equal(t, "", f)
+ assert.Empty(t, f)
}
func TestFindAll(t *testing.T) {
@@ -72,11 +72,11 @@ func TestFindAll(t *testing.T) {
re := &ReFuncs{}
f, err := re.FindAll(`[a-z]+`, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar", "baz"}, f)
+ assert.Equal(t, []string{"foo", "bar", "baz"}, f)
f, err = re.FindAll(`[a-z]+`, -1, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar", "baz"}, f)
+ assert.Equal(t, []string{"foo", "bar", "baz"}, f)
_, err = re.FindAll(`[a-`, "")
require.Error(t, err)
@@ -93,11 +93,11 @@ func TestFindAll(t *testing.T) {
f, err = re.FindAll(`[a-z]+`, 2, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar"}, f)
+ assert.Equal(t, []string{"foo", "bar"}, f)
f, err = re.FindAll(`[a-z]+`, 14, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar", "baz"}, f)
+ assert.Equal(t, []string{"foo", "bar", "baz"}, f)
f, err = re.FindAll(`qux`, `foo bar baz`)
require.NoError(t, err)
@@ -110,11 +110,11 @@ func TestSplit(t *testing.T) {
re := &ReFuncs{}
f, err := re.Split(` `, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar", "baz"}, f)
+ assert.Equal(t, []string{"foo", "bar", "baz"}, f)
f, err = re.Split(`\s+`, -1, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar", "baz"}, f)
+ assert.Equal(t, []string{"foo", "bar", "baz"}, f)
_, err = re.Split(`[a-`, "")
require.Error(t, err)
@@ -131,15 +131,15 @@ func TestSplit(t *testing.T) {
f, err = re.Split(`\s+`, 2, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar baz"}, f)
+ assert.Equal(t, []string{"foo", "bar baz"}, f)
f, err = re.Split(`\s`, 14, `foo bar baz`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "", "bar", "baz"}, f)
+ assert.Equal(t, []string{"foo", "", "bar", "baz"}, f)
f, err = re.Split(`[\s,.]`, 14, `foo bar.baz,qux`)
require.NoError(t, err)
- assert.EqualValues(t, []string{"foo", "bar", "baz", "qux"}, f)
+ assert.Equal(t, []string{"foo", "bar", "baz", "qux"}, f)
}
func TestReplaceLiteral(t *testing.T) {
diff --git a/internal/funcs/strings_test.go b/internal/funcs/strings_test.go
index 0194d446..57e0054a 100644
--- a/internal/funcs/strings_test.go
+++ b/internal/funcs/strings_test.go
@@ -94,8 +94,8 @@ func TestTrunc(t *testing.T) {
t.Parallel()
sf := &StringFuncs{}
- assert.Equal(t, "", sf.Trunc(5, ""))
- assert.Equal(t, "", sf.Trunc(0, nil))
+ assert.Empty(t, sf.Trunc(5, ""))
+ assert.Empty(t, sf.Trunc(0, nil))
assert.Equal(t, "123", sf.Trunc(3, 123456789))
assert.Equal(t, "hello, world", sf.Trunc(-1, "hello, world"))
}
diff --git a/internal/iohelpers/writers_test.go b/internal/iohelpers/writers_test.go
index 42d68544..90b9336e 100644
--- a/internal/iohelpers/writers_test.go
+++ b/internal/iohelpers/writers_test.go
@@ -59,7 +59,7 @@ func TestEmptySkipper(t *testing.T) {
} else {
assert.NotNil(t, f.w)
assert.True(t, opened)
- assert.EqualValues(t, d.in, w.Bytes())
+ assert.Equal(t, d.in, w.Bytes())
}
}
}
@@ -116,7 +116,7 @@ func TestSameSkipper(t *testing.T) {
} else {
assert.NotNil(t, f.w)
assert.True(t, opened)
- assert.EqualValues(t, d.in, w.Bytes())
+ assert.Equal(t, d.in, w.Bytes())
}
})
}
diff --git a/internal/parsers/parsefuncs_test.go b/internal/parsers/parsefuncs_test.go
index 76e7b2ac..706be30a 100644
--- a/internal/parsers/parsefuncs_test.go
+++ b/internal/parsers/parsefuncs_test.go
@@ -75,7 +75,7 @@ func TestUnmarshalArray(t *testing.T) {
test := func(actual []any, err error) {
require.NoError(t, err)
- assert.EqualValues(t, expected, actual)
+ assert.Equal(t, expected, actual)
}
test(JSONArray(`["foo","bar",{"baz":{"qux": true},"quux":{"42":18},"corge":{"false":"blah"}}]`))
test(YAMLArray(`
@@ -115,7 +115,7 @@ this shouldn't be reached
false: blah
`)
require.NoError(t, err)
- assert.EqualValues(t,
+ assert.Equal(t,
[]any{
map[string]any{
"foo": map[string]any{
@@ -520,11 +520,11 @@ func TestDecryptEJSON(t *testing.T) {
t.Setenv("EJSON_KEY", privateKey)
actual, err := decryptEJSON(in)
require.NoError(t, err)
- assert.EqualValues(t, expected, actual)
+ assert.Equal(t, expected, actual)
actual, err = JSON(in)
require.NoError(t, err)
- assert.EqualValues(t, expected, actual)
+ assert.Equal(t, expected, actual)
tmpDir := fs.NewDir(t, "gomplate-ejsontest",
fs.WithFile(publicKey, privateKey),
@@ -535,14 +535,14 @@ func TestDecryptEJSON(t *testing.T) {
t.Setenv("EJSON_KEY_FILE", tmpDir.Join(publicKey))
actual, err = decryptEJSON(in)
require.NoError(t, err)
- assert.EqualValues(t, expected, actual)
+ assert.Equal(t, expected, actual)
os.Unsetenv("EJSON_KEY")
os.Unsetenv("EJSON_KEY_FILE")
t.Setenv("EJSON_KEYDIR", tmpDir.Path())
actual, err = decryptEJSON(in)
require.NoError(t, err)
- assert.EqualValues(t, expected, actual)
+ assert.Equal(t, expected, actual)
}
func TestDotEnv(t *testing.T) {
@@ -564,7 +564,7 @@ QUX='single quotes ignore $variables'
}
out, err := DotEnv(in)
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
}
func TestStringifyYAMLArrayMapKeys(t *testing.T) {
@@ -613,7 +613,7 @@ func TestStringifyYAMLArrayMapKeys(t *testing.T) {
for _, c := range cases {
err := stringifyYAMLArrayMapKeys(c.input)
require.NoError(t, err)
- assert.EqualValues(t, c.want, c.input)
+ assert.Equal(t, c.want, c.input)
}
}
@@ -655,7 +655,7 @@ func TestStringifyYAMLMapMapKeys(t *testing.T) {
for _, c := range cases {
err := stringifyYAMLMapMapKeys(c.input)
require.NoError(t, err)
- assert.EqualValues(t, c.want, c.input)
+ assert.Equal(t, c.want, c.input)
}
}
@@ -704,7 +704,7 @@ list: [ 1, 2, 3 ]
out, err = CUE(`42`)
require.NoError(t, err)
- assert.EqualValues(t, int64(42), out)
+ assert.Equal(t, 42, out)
out, err = CUE(`42.0`)
require.NoError(t, err)
@@ -742,37 +742,37 @@ func TestToCUE(t *testing.T) {
out, err := ToCUE(in)
require.NoError(t, err)
- assert.EqualValues(t, expected, out)
+ assert.Equal(t, expected, out)
out, err = ToCUE([]any{1, 2, 3})
require.NoError(t, err)
- assert.EqualValues(t, `[1, 2, 3]`, out)
+ assert.Equal(t, `[1, 2, 3]`, out)
out, err = ToCUE("hello world")
require.NoError(t, err)
- assert.EqualValues(t, `"hello world"`, out)
+ assert.Equal(t, `"hello world"`, out)
out, err = ToCUE(true)
require.NoError(t, err)
- assert.EqualValues(t, `true`, out)
+ assert.Equal(t, `true`, out)
out, err = ToCUE([]byte{0, 1, 2, 3, 4})
require.NoError(t, err)
- assert.EqualValues(t, `'\x00\x01\x02\x03\x04'`, out)
+ assert.Equal(t, `'\x00\x01\x02\x03\x04'`, out)
out, err = ToCUE(42)
require.NoError(t, err)
- assert.EqualValues(t, `42`, out)
+ assert.Equal(t, `42`, out)
out, err = ToCUE(42.0)
require.NoError(t, err)
- assert.EqualValues(t, `42.0`, out)
+ assert.Equal(t, `42.0`, out)
out, err = ToCUE(nil)
require.NoError(t, err)
- assert.EqualValues(t, `null`, out)
+ assert.Equal(t, `null`, out)
out, err = ToCUE(struct{}{})
require.NoError(t, err)
- assert.EqualValues(t, `{}`, out)
+ assert.Equal(t, `{}`, out)
}
diff --git a/internal/tests/integration/config_test.go b/internal/tests/integration/config_test.go
index 80c9d904..8800cc4c 100644
--- a/internal/tests/integration/config_test.go
+++ b/internal/tests/integration/config_test.go
@@ -186,7 +186,7 @@ datasources:
o, e, err := cmd(t).withDir(tmpDir.Path()).
withEnv("GOMPLATE_LEFT_DELIM", "<<").run()
require.NoError(t, err)
- assert.Equal(t, "", e)
+ assert.Empty(t, e)
assert.Equal(t, "hello world", o)
}
@@ -210,7 +210,7 @@ datasources:
withDir(tmpDir.Path()).
withEnv("GOMPLATE_LEFT_DELIM", "<<").run()
require.NoError(t, err)
- assert.Equal(t, "", e)
+ assert.Empty(t, e)
assert.Equal(t, "hello world", o)
}
diff --git a/internal/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go
index 10439288..b060fb9f 100644
--- a/internal/tests/integration/integration_test.go
+++ b/internal/tests/integration/integration_test.go
@@ -52,7 +52,7 @@ func inOutContains(t *testing.T, i, o string) {
t.Helper()
stdout, stderr, err := cmd(t, "-i", i).run()
- assert.Equal(t, "", stderr)
+ assert.Empty(t, stderr)
assert.Contains(t, stdout, o)
require.NoError(t, err)
}
@@ -63,7 +63,7 @@ func assertSuccess(t *testing.T, o, e string, err error, expected string) {
require.NoError(t, err)
// Filter out AWS SDK checksum warnings
filteredErr := filterAWSChecksumWarnings(e)
- assert.Equal(t, "", filteredErr)
+ assert.Empty(t, filteredErr)
assert.Equal(t, expected, o)
}
@@ -87,7 +87,7 @@ func assertFailed(t *testing.T, o, e string, err error, expected string) {
t.Helper()
assert.Contains(t, e, expected)
- assert.Equal(t, "", o)
+ assert.Empty(t, o)
require.Error(t, err)
}
diff --git a/internal/urlhelpers/urlhelpers_test.go b/internal/urlhelpers/urlhelpers_test.go
index 2065e7bb..117042d6 100644
--- a/internal/urlhelpers/urlhelpers_test.go
+++ b/internal/urlhelpers/urlhelpers_test.go
@@ -17,26 +17,26 @@ func TestParseSourceURL(t *testing.T) {
}
u, err := ParseSourceURL("http://example.com/foo.json?bar")
require.NoError(t, err)
- assert.EqualValues(t, expected, u)
+ assert.Equal(t, expected, u)
expected = &url.URL{Scheme: "", Path: ""}
u, err = ParseSourceURL("")
require.NoError(t, err)
- assert.EqualValues(t, expected, u)
+ assert.Equal(t, expected, u)
expected = &url.URL{Scheme: "stdin"}
u, err = ParseSourceURL("-")
require.NoError(t, err)
- assert.EqualValues(t, expected, u)
+ assert.Equal(t, expected, u)
// behaviour change in v4 - return relative if it's relative
expected = &url.URL{Path: "./foo/bar.json"}
u, err = ParseSourceURL("./foo/bar.json")
require.NoError(t, err)
- assert.EqualValues(t, expected, u)
+ assert.Equal(t, expected, u)
expected = &url.URL{Scheme: "file", Path: "/absolute/bar.json"}
u, err = ParseSourceURL("/absolute/bar.json")
require.NoError(t, err)
- assert.EqualValues(t, expected, u)
+ assert.Equal(t, expected, u)
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-12 10:27:29 +0000