diff --git a/gomock/mock_matcher/mock_matcher.go b/gomock/internal/mock_matcher/mock_matcher.go similarity index 100% rename from gomock/mock_matcher/mock_matcher.go rename to gomock/internal/mock_matcher/mock_matcher.go diff --git a/gomock/matchers.go b/gomock/matchers.go index 65ad8bab..189796f8 100644 --- a/gomock/matchers.go +++ b/gomock/matchers.go @@ -1,5 +1,3 @@ -//go:generate mockgen -destination mock_matcher/mock_matcher.go github.com/golang/mock/gomock Matcher - // Copyright 2010 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/gomock/matchers_test.go b/gomock/matchers_test.go index 1427640b..db1411eb 100644 --- a/gomock/matchers_test.go +++ b/gomock/matchers_test.go @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:generate mockgen -destination internal/mock_matcher/mock_matcher.go github.com/golang/mock/gomock Matcher + package gomock_test import ( @@ -19,7 +21,7 @@ import ( "testing" "github.com/golang/mock/gomock" - mock_matcher "github.com/golang/mock/gomock/mock_matcher" + mock_matcher "github.com/golang/mock/gomock/internal/mock_matcher" ) func TestMatchers(t *testing.T) { diff --git a/mockgen/tests/aux_imports_embedded_interface/README.md b/mockgen/internal/tests/aux_imports_embedded_interface/README.md similarity index 100% rename from mockgen/tests/aux_imports_embedded_interface/README.md rename to mockgen/internal/tests/aux_imports_embedded_interface/README.md diff --git a/mockgen/tests/aux_imports_embedded_interface/bugreport.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go similarity index 79% rename from mockgen/tests/aux_imports_embedded_interface/bugreport.go rename to mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go index 618a7fd3..7ae2ac4d 100644 --- a/mockgen/tests/aux_imports_embedded_interface/bugreport.go +++ b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go @@ -5,7 +5,7 @@ package bugreport import ( "log" - "github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux" + "github.com/golang/mock/mockgen/internal/tests/aux_imports_embedded_interface/faux" ) // Source is an interface w/ an embedded foreign interface diff --git a/mockgen/tests/aux_imports_embedded_interface/bugreport_mock.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go similarity index 92% rename from mockgen/tests/aux_imports_embedded_interface/bugreport_mock.go rename to mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go index 0feb02ab..f90c2592 100644 --- a/mockgen/tests/aux_imports_embedded_interface/bugreport_mock.go +++ b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go @@ -6,7 +6,7 @@ package bugreport import ( gomock "github.com/golang/mock/gomock" - faux "github.com/golang/mock/mockgen/tests/aux_imports_embedded_interface/faux" + faux "github.com/golang/mock/mockgen/internal/tests/aux_imports_embedded_interface/faux" reflect "reflect" ) diff --git a/mockgen/tests/aux_imports_embedded_interface/bugreport_test.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_test.go similarity index 100% rename from mockgen/tests/aux_imports_embedded_interface/bugreport_test.go rename to mockgen/internal/tests/aux_imports_embedded_interface/bugreport_test.go diff --git a/mockgen/tests/aux_imports_embedded_interface/faux/faux.go b/mockgen/internal/tests/aux_imports_embedded_interface/faux/faux.go similarity index 100% rename from mockgen/tests/aux_imports_embedded_interface/faux/faux.go rename to mockgen/internal/tests/aux_imports_embedded_interface/faux/faux.go diff --git a/mockgen/tests/custom_package_name/README.md b/mockgen/internal/tests/custom_package_name/README.md similarity index 79% rename from mockgen/tests/custom_package_name/README.md rename to mockgen/internal/tests/custom_package_name/README.md index b16da215..418b2615 100644 --- a/mockgen/tests/custom_package_name/README.md +++ b/mockgen/internal/tests/custom_package_name/README.md @@ -2,7 +2,7 @@ This directory contains test for mockgen generating mocks when imported package name does not match import path suffix. For example, package with name "client" -is located under import path "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1". +is located under import path "github.com/golang/mock/mockgen/internal/tests/custom_package_name/client/v1". Prior to this patch: @@ -10,7 +10,7 @@ Prior to this patch: 2018/03/05 22:44:52 Loading input failed: greeter.go:17:11: failed parsing returns: greeter.go:17:14: unknown package "client" greeter/greeter.go:1: running "mockgen": exit status 1 -This can be fixed by manually providing `-imports` flag, like `-imports client=github.com/golang/mock/mockgen/tests/custom_package_name/client/v1`. +This can be fixed by manually providing `-imports` flag, like `-imports client=github.com/golang/mock/mockgen/internal/tests/custom_package_name/client/v1`. But, mockgen should be able to automatically resolve package names in such situations. With this patch applied: diff --git a/mockgen/tests/custom_package_name/client/v1/client.go b/mockgen/internal/tests/custom_package_name/client/v1/client.go similarity index 100% rename from mockgen/tests/custom_package_name/client/v1/client.go rename to mockgen/internal/tests/custom_package_name/client/v1/client.go diff --git a/mockgen/tests/custom_package_name/greeter/greeter.go b/mockgen/internal/tests/custom_package_name/greeter/greeter.go similarity index 79% rename from mockgen/tests/custom_package_name/greeter/greeter.go rename to mockgen/internal/tests/custom_package_name/greeter/greeter.go index 8c2d2937..8f07d51c 100644 --- a/mockgen/tests/custom_package_name/greeter/greeter.go +++ b/mockgen/internal/tests/custom_package_name/greeter/greeter.go @@ -7,10 +7,10 @@ import ( "fmt" // non-matching import suffix and package name - "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1" + "github.com/golang/mock/mockgen/internal/tests/custom_package_name/client/v1" // matching import suffix and package name - "github.com/golang/mock/mockgen/tests/custom_package_name/validator" + "github.com/golang/mock/mockgen/internal/tests/custom_package_name/validator" ) type InputMaker interface { diff --git a/mockgen/tests/custom_package_name/greeter/greeter_mock_test.go b/mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go similarity index 93% rename from mockgen/tests/custom_package_name/greeter/greeter_mock_test.go rename to mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go index 0bf0f46f..fe6139b7 100644 --- a/mockgen/tests/custom_package_name/greeter/greeter_mock_test.go +++ b/mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go @@ -6,7 +6,7 @@ package greeter import ( gomock "github.com/golang/mock/gomock" - v1 "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1" + v1 "github.com/golang/mock/mockgen/internal/tests/custom_package_name/client/v1" reflect "reflect" ) diff --git a/mockgen/tests/custom_package_name/greeter/greeter_test.go b/mockgen/internal/tests/custom_package_name/greeter/greeter_test.go similarity index 88% rename from mockgen/tests/custom_package_name/greeter/greeter_test.go rename to mockgen/internal/tests/custom_package_name/greeter/greeter_test.go index f056ec81..a64d677c 100644 --- a/mockgen/tests/custom_package_name/greeter/greeter_test.go +++ b/mockgen/internal/tests/custom_package_name/greeter/greeter_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1" + "github.com/golang/mock/mockgen/internal/tests/custom_package_name/client/v1" ) func TestGreeter_Greet(t *testing.T) { diff --git a/mockgen/tests/custom_package_name/validator/validate.go b/mockgen/internal/tests/custom_package_name/validator/validate.go similarity index 100% rename from mockgen/tests/custom_package_name/validator/validate.go rename to mockgen/internal/tests/custom_package_name/validator/validate.go diff --git a/mockgen/tests/empty_interface/input.go b/mockgen/internal/tests/empty_interface/input.go similarity index 100% rename from mockgen/tests/empty_interface/input.go rename to mockgen/internal/tests/empty_interface/input.go diff --git a/mockgen/tests/empty_interface/mock.go b/mockgen/internal/tests/empty_interface/mock.go similarity index 100% rename from mockgen/tests/empty_interface/mock.go rename to mockgen/internal/tests/empty_interface/mock.go diff --git a/mockgen/tests/generated_identifier_conflict/README.md b/mockgen/internal/tests/generated_identifier_conflict/README.md similarity index 100% rename from mockgen/tests/generated_identifier_conflict/README.md rename to mockgen/internal/tests/generated_identifier_conflict/README.md diff --git a/mockgen/tests/generated_identifier_conflict/bugreport.go b/mockgen/internal/tests/generated_identifier_conflict/bugreport.go similarity index 100% rename from mockgen/tests/generated_identifier_conflict/bugreport.go rename to mockgen/internal/tests/generated_identifier_conflict/bugreport.go diff --git a/mockgen/tests/generated_identifier_conflict/bugreport_mock.go b/mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go similarity index 100% rename from mockgen/tests/generated_identifier_conflict/bugreport_mock.go rename to mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go diff --git a/mockgen/tests/generated_identifier_conflict/bugreport_test.go b/mockgen/internal/tests/generated_identifier_conflict/bugreport_test.go similarity index 100% rename from mockgen/tests/generated_identifier_conflict/bugreport_test.go rename to mockgen/internal/tests/generated_identifier_conflict/bugreport_test.go diff --git a/mockgen/tests/import_source/Readme.md b/mockgen/internal/tests/import_source/Readme.md similarity index 100% rename from mockgen/tests/import_source/Readme.md rename to mockgen/internal/tests/import_source/Readme.md diff --git a/mockgen/tests/import_source/definition/source.go b/mockgen/internal/tests/import_source/definition/source.go similarity index 100% rename from mockgen/tests/import_source/definition/source.go rename to mockgen/internal/tests/import_source/definition/source.go diff --git a/mockgen/tests/import_source/definition/source_mock.go b/mockgen/internal/tests/import_source/definition/source_mock.go similarity index 100% rename from mockgen/tests/import_source/definition/source_mock.go rename to mockgen/internal/tests/import_source/definition/source_mock.go diff --git a/mockgen/tests/import_source/source_mock.go b/mockgen/internal/tests/import_source/source_mock.go similarity index 92% rename from mockgen/tests/import_source/source_mock.go rename to mockgen/internal/tests/import_source/source_mock.go index 6789ba3a..24649e0b 100644 --- a/mockgen/tests/import_source/source_mock.go +++ b/mockgen/internal/tests/import_source/source_mock.go @@ -6,7 +6,7 @@ package mock_source import ( gomock "github.com/golang/mock/gomock" - definition "github.com/golang/mock/mockgen/tests/import_source/definition" + definition "github.com/golang/mock/mockgen/internal/tests/import_source/definition" reflect "reflect" ) diff --git a/mockgen/tests/internal_pkg/generate.go b/mockgen/internal/tests/internal_pkg/generate.go similarity index 66% rename from mockgen/tests/internal_pkg/generate.go rename to mockgen/internal/tests/internal_pkg/generate.go index 541ed647..717516c1 100644 --- a/mockgen/tests/internal_pkg/generate.go +++ b/mockgen/internal/tests/internal_pkg/generate.go @@ -1,3 +1,3 @@ -//go:generate mockgen -destination subdir/internal/pkg/reflect_output/mock.go github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg Intf +//go:generate mockgen -destination subdir/internal/pkg/reflect_output/mock.go github.com/golang/mock/mockgen/internal/tests/internal_pkg/subdir/internal/pkg Intf //go:generate mockgen -source subdir/internal/pkg/input.go -destination subdir/internal/pkg/source_output/mock.go package test diff --git a/mockgen/tests/internal_pkg/subdir/internal/pkg/input.go b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/input.go similarity index 100% rename from mockgen/tests/internal_pkg/subdir/internal/pkg/input.go rename to mockgen/internal/tests/internal_pkg/subdir/internal/pkg/input.go diff --git a/mockgen/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go similarity index 84% rename from mockgen/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go rename to mockgen/internal/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go index 47ccf0c5..fb494997 100644 --- a/mockgen/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go +++ b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg (interfaces: Intf) +// Source: github.com/golang/mock/mockgen/internal/tests/internal_pkg/subdir/internal/pkg (interfaces: Intf) // Package mock_pkg is a generated GoMock package. package mock_pkg import ( gomock "github.com/golang/mock/gomock" - pkg "github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg" + pkg "github.com/golang/mock/mockgen/internal/tests/internal_pkg/subdir/internal/pkg" reflect "reflect" ) diff --git a/mockgen/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go similarity index 95% rename from mockgen/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go rename to mockgen/internal/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go index 32595ab1..a4bbf855 100644 --- a/mockgen/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go +++ b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go @@ -6,7 +6,7 @@ package mock_pkg import ( gomock "github.com/golang/mock/gomock" - pkg "github.com/golang/mock/mockgen/tests/internal_pkg/subdir/internal/pkg" + pkg "github.com/golang/mock/mockgen/internal/tests/internal_pkg/subdir/internal/pkg" reflect "reflect" ) diff --git a/mockgen/tests/unexported_method/README.md b/mockgen/internal/tests/unexported_method/README.md similarity index 100% rename from mockgen/tests/unexported_method/README.md rename to mockgen/internal/tests/unexported_method/README.md diff --git a/mockgen/tests/unexported_method/bugreport.go b/mockgen/internal/tests/unexported_method/bugreport.go similarity index 100% rename from mockgen/tests/unexported_method/bugreport.go rename to mockgen/internal/tests/unexported_method/bugreport.go diff --git a/mockgen/tests/unexported_method/bugreport_mock.go b/mockgen/internal/tests/unexported_method/bugreport_mock.go similarity index 100% rename from mockgen/tests/unexported_method/bugreport_mock.go rename to mockgen/internal/tests/unexported_method/bugreport_mock.go diff --git a/mockgen/tests/unexported_method/bugreport_test.go b/mockgen/internal/tests/unexported_method/bugreport_test.go similarity index 100% rename from mockgen/tests/unexported_method/bugreport_test.go rename to mockgen/internal/tests/unexported_method/bugreport_test.go diff --git a/mockgen/tests/vendor_dep/README.md b/mockgen/internal/tests/vendor_dep/README.md similarity index 100% rename from mockgen/tests/vendor_dep/README.md rename to mockgen/internal/tests/vendor_dep/README.md diff --git a/mockgen/tests/vendor_dep/doc.go b/mockgen/internal/tests/vendor_dep/doc.go similarity index 71% rename from mockgen/tests/vendor_dep/doc.go rename to mockgen/internal/tests/vendor_dep/doc.go index e751826d..29e424c8 100644 --- a/mockgen/tests/vendor_dep/doc.go +++ b/mockgen/internal/tests/vendor_dep/doc.go @@ -1,4 +1,4 @@ package vendor_dep -//go:generate mockgen -package vendor_dep -destination mock.go github.com/golang/mock/mockgen/tests/vendor_dep VendorsDep +//go:generate mockgen -package vendor_dep -destination mock.go github.com/golang/mock/mockgen/internal/tests/vendor_dep VendorsDep //go:generate mockgen -destination source_mock_package/mock.go -source=vendor_dep.go diff --git a/mockgen/tests/vendor_dep/mock.go b/mockgen/internal/tests/vendor_dep/mock.go similarity index 92% rename from mockgen/tests/vendor_dep/mock.go rename to mockgen/internal/tests/vendor_dep/mock.go index aace06e6..d33cba8a 100644 --- a/mockgen/tests/vendor_dep/mock.go +++ b/mockgen/internal/tests/vendor_dep/mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/golang/mock/mockgen/tests/vendor_dep (interfaces: VendorsDep) +// Source: github.com/golang/mock/mockgen/internal/tests/vendor_dep (interfaces: VendorsDep) // Package vendor_dep is a generated GoMock package. package vendor_dep diff --git a/mockgen/tests/vendor_dep/source_mock_package/mock.go b/mockgen/internal/tests/vendor_dep/source_mock_package/mock.go similarity index 100% rename from mockgen/tests/vendor_dep/source_mock_package/mock.go rename to mockgen/internal/tests/vendor_dep/source_mock_package/mock.go diff --git a/mockgen/tests/vendor_dep/vendor/a/a.go b/mockgen/internal/tests/vendor_dep/vendor/a/a.go similarity index 100% rename from mockgen/tests/vendor_dep/vendor/a/a.go rename to mockgen/internal/tests/vendor_dep/vendor/a/a.go diff --git a/mockgen/tests/vendor_dep/vendor_dep.go b/mockgen/internal/tests/vendor_dep/vendor_dep.go similarity index 100% rename from mockgen/tests/vendor_dep/vendor_dep.go rename to mockgen/internal/tests/vendor_dep/vendor_dep.go diff --git a/mockgen/tests/vendor_pkg/README.md b/mockgen/internal/tests/vendor_pkg/README.md similarity index 100% rename from mockgen/tests/vendor_pkg/README.md rename to mockgen/internal/tests/vendor_pkg/README.md diff --git a/mockgen/tests/vendor_pkg/doc.go b/mockgen/internal/tests/vendor_pkg/doc.go similarity index 100% rename from mockgen/tests/vendor_pkg/doc.go rename to mockgen/internal/tests/vendor_pkg/doc.go diff --git a/mockgen/tests/vendor_pkg/mock.go b/mockgen/internal/tests/vendor_pkg/mock.go similarity index 100% rename from mockgen/tests/vendor_pkg/mock.go rename to mockgen/internal/tests/vendor_pkg/mock.go diff --git a/mockgen/tests/vendor_pkg/vendor/a/a.go b/mockgen/internal/tests/vendor_pkg/vendor/a/a.go similarity index 100% rename from mockgen/tests/vendor_pkg/vendor/a/a.go rename to mockgen/internal/tests/vendor_pkg/vendor/a/a.go diff --git a/mockgen/parse_test.go b/mockgen/parse_test.go index 47e4d79c..c4387081 100644 --- a/mockgen/parse_test.go +++ b/mockgen/parse_test.go @@ -9,7 +9,7 @@ import ( func TestFileParser_ParseFile(t *testing.T) { fs := token.NewFileSet() - file, err := parser.ParseFile(fs, "tests/custom_package_name/greeter/greeter.go", nil, 0) + file, err := parser.ParseFile(fs, "internal/tests/custom_package_name/greeter/greeter.go", nil, 0) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -40,7 +40,7 @@ func TestFileParser_ParseFile(t *testing.T) { func TestFileParser_ParsePackage(t *testing.T) { fs := token.NewFileSet() - _, err := parser.ParseFile(fs, "tests/custom_package_name/greeter/greeter.go", nil, 0) + _, err := parser.ParseFile(fs, "internal/tests/custom_package_name/greeter/greeter.go", nil, 0) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -51,7 +51,7 @@ func TestFileParser_ParsePackage(t *testing.T) { importedInterfaces: make(map[string]map[string]*ast.InterfaceType), } - err = p.parsePackage("github.com/golang/mock/mockgen/tests/custom_package_name/greeter") + err = p.parsePackage("github.com/golang/mock/mockgen/internal/tests/custom_package_name/greeter") if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -61,7 +61,7 @@ func TestFileParser_ParsePackage(t *testing.T) { func TestImportsOfFile(t *testing.T) { fs := token.NewFileSet() - file, err := parser.ParseFile(fs, "tests/custom_package_name/greeter/greeter.go", nil, 0) + file, err := parser.ParseFile(fs, "internal/tests/custom_package_name/greeter/greeter.go", nil, 0) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -85,7 +85,7 @@ func checkGreeterImports(t *testing.T, imports map[string]string) { if validatorPackage, ok := imports["validator"]; !ok { t.Errorf("Expected imports to have key \"fmt\"") } else { - expectedValidatorPackage := "github.com/golang/mock/mockgen/tests/custom_package_name/validator" + expectedValidatorPackage := "github.com/golang/mock/mockgen/internal/tests/custom_package_name/validator" if validatorPackage != expectedValidatorPackage { t.Errorf("Expected validator key to have value %s but got %s", expectedValidatorPackage, validatorPackage) } @@ -95,7 +95,7 @@ func checkGreeterImports(t *testing.T, imports map[string]string) { if clientPackage, ok := imports["client"]; !ok { t.Errorf("Expected imports to have key \"client\"") } else { - expectedClientPackage := "github.com/golang/mock/mockgen/tests/custom_package_name/client/v1" + expectedClientPackage := "github.com/golang/mock/mockgen/internal/tests/custom_package_name/client/v1" if clientPackage != expectedClientPackage { t.Errorf("Expected client key to have value %s but got %s", expectedClientPackage, clientPackage) }