summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2018-08-18 00:17:19 -0400
committerDave Henderson <dhenderson@gmail.com>2018-08-18 00:17:19 -0400
commit4e0bb2579fa6f6d8b04356b170198f1a212ab0ff (patch)
treed8e9972a95d8d5b344265961f164d54ddcb877ae /data
parent7fce44e24bc73b24fdea8eb56515d12d227cbb34 (diff)
Removing unnecessary uses of NewSource
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'data')
-rw-r--r--data/datasource_env_test.go10
-rw-r--r--data/datasource_file_test.go8
2 files changed, 9 insertions, 9 deletions
diff --git a/data/datasource_env_test.go b/data/datasource_env_test.go
index 9700b068..e368397a 100644
--- a/data/datasource_env_test.go
+++ b/data/datasource_env_test.go
@@ -20,31 +20,31 @@ func TestReadEnv(t *testing.T) {
os.Setenv("HELLO_UNIVERSE", "hello universe")
defer os.Unsetenv("HELLO_UNIVERSE")
- source, _ := NewSource("foo", mustParseURL("env:HELLO_WORLD"))
+ source := &Source{Alias: "foo", URL: mustParseURL("env:HELLO_WORLD")}
actual, err := readEnv(source)
assert.NoError(t, err)
assert.Equal(t, content, actual)
- source, _ = NewSource("foo", mustParseURL("env:/HELLO_WORLD"))
+ source = &Source{Alias: "foo", URL: mustParseURL("env:/HELLO_WORLD")}
actual, err = readEnv(source)
assert.NoError(t, err)
assert.Equal(t, content, actual)
- source, _ = NewSource("foo", mustParseURL("env:///HELLO_WORLD"))
+ source = &Source{Alias: "foo", URL: mustParseURL("env:///HELLO_WORLD")}
actual, err = readEnv(source)
assert.NoError(t, err)
assert.Equal(t, content, actual)
- source, _ = NewSource("foo", mustParseURL("env:HELLO_WORLD?foo=bar"))
+ source = &Source{Alias: "foo", URL: mustParseURL("env:HELLO_WORLD?foo=bar")}
actual, err = readEnv(source)
assert.NoError(t, err)
assert.Equal(t, content, actual)
- source, _ = NewSource("foo", mustParseURL("env:///HELLO_WORLD?foo=bar"))
+ source = &Source{Alias: "foo", URL: mustParseURL("env:///HELLO_WORLD?foo=bar")}
actual, err = readEnv(source)
assert.NoError(t, err)
diff --git a/data/datasource_file_test.go b/data/datasource_file_test.go
index f4f9da61..bfbaaedb 100644
--- a/data/datasource_file_test.go
+++ b/data/datasource_file_test.go
@@ -24,25 +24,25 @@ func TestReadFile(t *testing.T) {
_, _ = vfs.Create(fs, "/tmp/partial/bar.txt")
_, _ = vfs.Create(fs, "/tmp/partial/baz.txt")
- source, _ := NewSource("foo", mustParseURL("file:///tmp/foo"))
+ source := &Source{Alias: "foo", URL: mustParseURL("file:///tmp/foo")}
source.FS = fs
actual, err := readFile(source)
assert.NoError(t, err)
assert.Equal(t, content, actual)
- source, _ = NewSource("bogus", mustParseURL("file:///bogus"))
+ source = &Source{Alias: "bogus", URL: mustParseURL("file:///bogus")}
source.FS = fs
_, err = readFile(source)
assert.Error(t, err)
- source, _ = NewSource("partial", mustParseURL("file:///tmp/partial"))
+ source = &Source{Alias: "partial", URL: mustParseURL("file:///tmp/partial")}
source.FS = fs
actual, err = readFile(source, "foo.txt")
assert.NoError(t, err)
assert.Equal(t, content, actual)
- source, _ = NewSource("dir", mustParseURL("file:///tmp/partial/"))
+ source = &Source{Alias: "dir", URL: mustParseURL("file:///tmp/partial/")}
source.FS = fs
actual, err = readFile(source)
assert.NoError(t, err)