diff options
Diffstat (limited to 'search/search_test.go')
| -rw-r--r-- | search/search_test.go | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/search/search_test.go b/search/search_test.go index 3671f75..7246ffc 100644 --- a/search/search_test.go +++ b/search/search_test.go @@ -4,121 +4,121 @@ package search import ( "github.com/stretchr/testify/assert" - "pik/testx" + "pik/runner" "testing" ) func TestSearch_TargetOnly(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "def")) + st := runner.TState(runner.TSource("src", "abc", "def")) res := Search(st, "def") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "def", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "def", res.Target) } func TestSearch_TargetAndSource(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "def")) + st := runner.TState(runner.TSource("src", "abc", "def")) res := Search(st, "src", "def") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "def", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "def", res.Target) } func TestSearch_TargetAndSource_CaseInsensitive(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "def")) + st := runner.TState(runner.TSource("src", "abc", "def")) res := Search(st, "SRC", "DeF") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "def", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "def", res.Target) } func TestSearch_SourceDefaultTarget(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "src")) + st := runner.TState(runner.TSource("src", "abc", "src")) res := Search(st, "src") - testx.AssertSourceIs(t, "src", res.Source) + runner.AssertSourceIs(t, "src", res.Source) assert.NotNil(t, res.Target) } func TestSearch_SubdirWrong(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "src")) - st.Sources[0].Targets = append(st.Sources[0].Targets, testx.TTarget("script", "subdir")) + st := runner.TState(runner.TSource("src", "abc", "src")) + st.Sources[0].Targets = append(st.Sources[0].Targets, runner.TTarget("script", "subdir")) res := Search(st, "wrong", "script") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "script", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "script", res.Target) assert.Equal(t, []string{"wrong"}, res.Sub) assert.NotNil(t, res.Target) assert.True(t, res.NeedsConfirmation) } func TestSearch_SubdirMissing(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "src")) - st.Sources[0].Targets = append(st.Sources[0].Targets, testx.TTarget("script", "subdir")) + st := runner.TState(runner.TSource("src", "abc", "src")) + st.Sources[0].Targets = append(st.Sources[0].Targets, runner.TTarget("script", "subdir")) res := Search(st, "script") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "script", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "script", res.Target) assert.Nil(t, res.Sub) assert.NotNil(t, res.Target) assert.False(t, res.NeedsConfirmation) } func TestSearch_Args(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "def")) + st := runner.TState(runner.TSource("src", "abc", "def")) res := Search(st, "def", "a1", "a2") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "def", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "def", res.Target) assert.Equal(t, []string{"a1", "a2"}, res.Args) } func TestSearch_Args_SubdirMissing(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "src")) - st.Sources[0].Targets = append(st.Sources[0].Targets, testx.TTarget("script", "subdir")) + st := runner.TState(runner.TSource("src", "abc", "src")) + st.Sources[0].Targets = append(st.Sources[0].Targets, runner.TTarget("script", "subdir")) res := Search(st, "script", "a1", "a2") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "script", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "script", res.Target) assert.Equal(t, []string{"a1", "a2"}, res.Args) } func TestSearch_Args_SubdirPresent(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "src")) - st.Sources[0].Targets = append(st.Sources[0].Targets, testx.TTarget("script", "subdir")) + st := runner.TState(runner.TSource("src", "abc", "src")) + st.Sources[0].Targets = append(st.Sources[0].Targets, runner.TTarget("script", "subdir")) res := Search(st, "subdir", "script", "a1", "a2") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "script", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "script", res.Target) assert.Equal(t, []string{"a1", "a2"}, res.Args) } func TestSearch_SecondarySource(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "def"), testx.TSource("aaa", "hjkl")) + st := runner.TState(runner.TSource("src", "abc", "def"), runner.TSource("aaa", "hjkl")) res := Search(st, "aaa", "hjkl") - testx.AssertSourceIs(t, "aaa", res.Source) - testx.AssertTargetIs(t, "hjkl", res.Target) + runner.AssertSourceIs(t, "aaa", res.Source) + runner.AssertTargetIs(t, "hjkl", res.Target) } func TestSearch_SecondarySource_DuplicateTargetName(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc", "def"), testx.TSource("aaa", "abc")) + st := runner.TState(runner.TSource("src", "abc", "def"), runner.TSource("aaa", "abc")) res := Search(st, "aaa", "def") - testx.AssertSourceIs(t, "src", res.Source) - testx.AssertTargetIs(t, "def", res.Target) + runner.AssertSourceIs(t, "src", res.Source) + runner.AssertTargetIs(t, "def", res.Target) assert.True(t, res.NeedsConfirmation) } func TestSearch_SourceTargetMixup(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc"), testx.TSource("aaa", "ccc")) + st := runner.TState(runner.TSource("src", "abc"), runner.TSource("aaa", "ccc")) res := Search(st, "src", "ccc") - testx.AssertSourceIs(t, "aaa", res.Source) - testx.AssertTargetIs(t, "ccc", res.Target) + runner.AssertSourceIs(t, "aaa", res.Source) + runner.AssertTargetIs(t, "ccc", res.Target) assert.True(t, res.NeedsConfirmation) } func TestSearch_Override(t *testing.T) { - st := testx.TState(testx.TSource("src", "abc.override.sh", "abc.sh")) + st := runner.TState(runner.TSource("src", "abc.override.sh", "abc.sh")) res := Search(st, "src", "abc") - assert.Equal(t, "abc.override.sh", res.Target.(*testx.TestTarget).Id.Full) + assert.Equal(t, "abc.override.sh", res.Target.(*runner.TestTarget).Id.Full) assert.False(t, res.NeedsConfirmation) } func TestSearch_SubdirDefault(t *testing.T) { - tgt := testx.TTarget("subname", "subname") - src := testx.TSource("src") + tgt := runner.TTarget("subname", "subname") + src := runner.TSource("src") src.Targets = append(src.Targets, tgt) - st := testx.TState(src) + st := runner.TState(src) res := Search(st, "subname") assert.Nil(t, res.Args) assert.Equal(t, res.Target, tgt) @@ -126,8 +126,8 @@ func TestSearch_SubdirDefault(t *testing.T) { } func TestSearch_SourceDefault(t *testing.T) { - src := testx.TSource("sourcename", "sourcename") - st := testx.TState(src) + src := runner.TSource("sourcename", "sourcename") + st := runner.TState(src) res := Search(st, "sourcename") assert.Nil(t, res.Args) assert.Equal(t, res.Target, src.Targets[0]) @@ -135,8 +135,8 @@ func TestSearch_SourceDefault(t *testing.T) { } func TestSearch_SourceDefault_Other(t *testing.T) { - src := testx.TSource("src", "src", "other") - st := testx.TState(src) + src := runner.TSource("src", "src", "other") + st := runner.TState(src) res := Search(st, "src", "other") assert.Nil(t, res.Args) assert.Equal(t, res.Target, src.Targets[1]) @@ -144,11 +144,11 @@ func TestSearch_SourceDefault_Other(t *testing.T) { } func TestSearch_SubdirDefault_Other(t *testing.T) { - tgt := testx.TTarget("subname", "subname") - other := testx.TTarget("othername", "subname") - src := testx.TSource("src") + tgt := runner.TTarget("subname", "subname") + other := runner.TTarget("othername", "subname") + src := runner.TSource("src") src.Targets = append(src.Targets, tgt, other) - st := testx.TState(src) + st := runner.TState(src) res := Search(st, "subname", "othername") assert.Nil(t, res.Args) assert.Equal(t, other, res.Target) |
