diff --git a/pkg/moq/moq_test.go b/pkg/moq/moq_test.go index dee91f4..bfdab08 100644 --- a/pkg/moq/moq_test.go +++ b/pkg/moq/moq_test.go @@ -8,7 +8,7 @@ import ( ) func TestMoq(t *testing.T) { - m, err := New("testdata/example", "") + m, err := New("testpackages/example", "") if err != nil { t.Fatalf("moq.New: %s", err) } @@ -41,7 +41,7 @@ func TestMoq(t *testing.T) { } func TestMoqExplicitPackage(t *testing.T) { - m, err := New("testdata/example", "different") + m, err := New("testpackages/example", "different") if err != nil { t.Fatalf("moq.New: %s", err) } @@ -71,7 +71,7 @@ func TestMoqExplicitPackage(t *testing.T) { // expected. // see https://github.com/matryer/moq/issues/5 func TestVariadicArguments(t *testing.T) { - m, err := New("testdata/variadic", "") + m, err := New("testpackages/variadic", "") if err != nil { t.Fatalf("moq.New: %s", err) } @@ -96,7 +96,7 @@ func TestVariadicArguments(t *testing.T) { } func TestNothingToReturn(t *testing.T) { - m, err := New("testdata/example", "") + m, err := New("testpackages/example", "") if err != nil { t.Fatalf("moq.New: %s", err) } @@ -121,7 +121,7 @@ func TestNothingToReturn(t *testing.T) { } func TestChannelNames(t *testing.T) { - m, err := New("testdata/channels", "") + m, err := New("testpackages/channels", "") if err != nil { t.Fatalf("moq.New: %s", err) } @@ -142,7 +142,7 @@ func TestChannelNames(t *testing.T) { } func TestImports(t *testing.T) { - m, err := New("testdata/imports/two", "") + m, err := New("testpackages/imports/two", "") if err != nil { t.Fatalf("moq.New: %s", err) } @@ -154,7 +154,7 @@ func TestImports(t *testing.T) { s := buf.String() var strs = []string{ ` "sync"`, - ` "github.com/matryer/moq/pkg/moq/testdata/imports/one"`, + ` "github.com/matryer/moq/pkg/moq/testpackages/imports/one"`, } for _, str := range strs { if !strings.Contains(s, str) { @@ -174,7 +174,7 @@ func TestTemplateFuncs(t *testing.T) { } func TestVendoredPackages(t *testing.T) { - m, err := New("testdata/vendoring/user", "") + m, err := New("testpackages/vendoring/user", "") if err != nil { t.Fatalf("moq.New: %s", err) } diff --git a/pkg/moq/testdata/channels/example.go b/pkg/moq/testpackages/channels/example.go similarity index 100% rename from pkg/moq/testdata/channels/example.go rename to pkg/moq/testpackages/channels/example.go diff --git a/pkg/moq/testdata/example/example.go b/pkg/moq/testpackages/example/example.go similarity index 100% rename from pkg/moq/testdata/example/example.go rename to pkg/moq/testpackages/example/example.go diff --git a/pkg/moq/testdata/imports/one/one.go b/pkg/moq/testpackages/imports/one/one.go similarity index 100% rename from pkg/moq/testdata/imports/one/one.go rename to pkg/moq/testpackages/imports/one/one.go diff --git a/pkg/moq/testdata/imports/two/two.go b/pkg/moq/testpackages/imports/two/two.go similarity index 71% rename from pkg/moq/testdata/imports/two/two.go rename to pkg/moq/testpackages/imports/two/two.go index 1ebba15..d5929ee 100644 --- a/pkg/moq/testdata/imports/two/two.go +++ b/pkg/moq/testpackages/imports/two/two.go @@ -1,7 +1,7 @@ package two import ( - "github.com/matryer/moq/pkg/moq/testdata/imports/one" + "github.com/matryer/moq/pkg/moq/testpackages/imports/one" ) // DoSomething does something. diff --git a/pkg/moq/testdata/variadic/greeter.go b/pkg/moq/testpackages/variadic/greeter.go similarity index 100% rename from pkg/moq/testdata/variadic/greeter.go rename to pkg/moq/testpackages/variadic/greeter.go diff --git a/pkg/moq/testdata/vendoring/user/user.go b/pkg/moq/testpackages/vendoring/user/user.go similarity index 100% rename from pkg/moq/testdata/vendoring/user/user.go rename to pkg/moq/testpackages/vendoring/user/user.go diff --git a/pkg/moq/testdata/vendoring/user/vendor/github.com/matryer/somerepo/code.go b/pkg/moq/testpackages/vendoring/user/vendor/github.com/matryer/somerepo/code.go similarity index 100% rename from pkg/moq/testdata/vendoring/user/vendor/github.com/matryer/somerepo/code.go rename to pkg/moq/testpackages/vendoring/user/vendor/github.com/matryer/somerepo/code.go