diff --git a/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go index e5326c80..26a80d65 100644 --- a/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go +++ b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go @@ -34,20 +34,6 @@ func (m *MockSource) EXPECT() *MockSourceMockRecorder { return m.recorder } -// Method mocks base method. -func (m *MockSource) Method() faux.Return { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Method") - ret0, _ := ret[0].(faux.Return) - return ret0 -} - -// Method indicates an expected call of Method. -func (mr *MockSourceMockRecorder) Method() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Method", reflect.TypeOf((*MockSource)(nil).Method)) -} - // Error mocks base method. func (m *MockSource) Error() string { m.ctrl.T.Helper() @@ -61,3 +47,17 @@ func (mr *MockSourceMockRecorder) Error() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockSource)(nil).Error)) } + +// Method mocks base method. +func (m *MockSource) Method() faux.Return { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Method") + ret0, _ := ret[0].(faux.Return) + return ret0 +} + +// Method indicates an expected call of Method. +func (mr *MockSourceMockRecorder) Method() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Method", reflect.TypeOf((*MockSource)(nil).Method)) +} diff --git a/mockgen/internal/tests/import_embedded_interface/bugreport_mock.go b/mockgen/internal/tests/import_embedded_interface/bugreport_mock.go index 4cc17e95..b5b7be3c 100644 --- a/mockgen/internal/tests/import_embedded_interface/bugreport_mock.go +++ b/mockgen/internal/tests/import_embedded_interface/bugreport_mock.go @@ -35,6 +35,20 @@ func (m *MockSource) EXPECT() *MockSourceMockRecorder { return m.recorder } +// Error mocks base method. +func (m *MockSource) Error() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Error") + ret0, _ := ret[0].(string) + return ret0 +} + +// Error indicates an expected call of Error. +func (mr *MockSourceMockRecorder) Error() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockSource)(nil).Error)) +} + // Ersatz mocks base method. func (m *MockSource) Ersatz() ersatz.Return { m.ctrl.T.Helper() @@ -62,17 +76,3 @@ func (mr *MockSourceMockRecorder) OtherErsatz() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OtherErsatz", reflect.TypeOf((*MockSource)(nil).OtherErsatz)) } - -// Error mocks base method. -func (m *MockSource) Error() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Error") - ret0, _ := ret[0].(string) - return ret0 -} - -// Error indicates an expected call of Error. -func (mr *MockSourceMockRecorder) Error() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockSource)(nil).Error)) -} diff --git a/mockgen/internal/tests/mock_in_test_package/mock_test.go b/mockgen/internal/tests/mock_in_test_package/mock_test.go index 4d598f03..f17a49ed 100644 --- a/mockgen/internal/tests/mock_in_test_package/mock_test.go +++ b/mockgen/internal/tests/mock_in_test_package/mock_test.go @@ -34,6 +34,18 @@ func (m *MockFinder) EXPECT() *MockFinderMockRecorder { return m.recorder } +// Add mocks base method. +func (m *MockFinder) Add(u mock_in_test_package.User) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Add", u) +} + +// Add indicates an expected call of Add. +func (mr *MockFinderMockRecorder) Add(u interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockFinder)(nil).Add), u) +} + // FindUser mocks base method. func (m *MockFinder) FindUser(name string) mock_in_test_package.User { m.ctrl.T.Helper() @@ -47,15 +59,3 @@ func (mr *MockFinderMockRecorder) FindUser(name interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindUser", reflect.TypeOf((*MockFinder)(nil).FindUser), name) } - -// Add mocks base method. -func (m *MockFinder) Add(u mock_in_test_package.User) { - m.ctrl.T.Helper() - m.ctrl.Call(m, "Add", u) -} - -// Add indicates an expected call of Add. -func (mr *MockFinderMockRecorder) Add(u interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockFinder)(nil).Add), u) -} diff --git a/mockgen/internal/tests/test_package/mock_test.go b/mockgen/internal/tests/test_package/mock_test.go index cc35b43d..b357165b 100644 --- a/mockgen/internal/tests/test_package/mock_test.go +++ b/mockgen/internal/tests/test_package/mock_test.go @@ -33,6 +33,18 @@ func (m *MockFinder) EXPECT() *MockFinderMockRecorder { return m.recorder } +// Add mocks base method. +func (m *MockFinder) Add(u User) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Add", u) +} + +// Add indicates an expected call of Add. +func (mr *MockFinderMockRecorder) Add(u interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockFinder)(nil).Add), u) +} + // FindUser mocks base method. func (m *MockFinder) FindUser(name string) User { m.ctrl.T.Helper() @@ -46,15 +58,3 @@ func (mr *MockFinderMockRecorder) FindUser(name interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindUser", reflect.TypeOf((*MockFinder)(nil).FindUser), name) } - -// Add mocks base method. -func (m *MockFinder) Add(u User) { - m.ctrl.T.Helper() - m.ctrl.Call(m, "Add", u) -} - -// Add indicates an expected call of Add. -func (mr *MockFinderMockRecorder) Add(u interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockFinder)(nil).Add), u) -} diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go index ce483f87..e02b752f 100644 --- a/mockgen/mockgen.go +++ b/mockgen/mockgen.go @@ -424,7 +424,14 @@ func (g *generator) GenerateMockInterface(intf *model.Interface, outputPackagePa return nil } +type byMethodName []*model.Method + +func (b byMethodName) Len() int { return len(b) } +func (b byMethodName) Swap(i, j int) { b[i], b[j] = b[j], b[i] } +func (b byMethodName) Less(i, j int) bool { return b[i].Name < b[j].Name } + func (g *generator) GenerateMockMethods(mockType string, intf *model.Interface, pkgOverride string) { + sort.Sort(byMethodName(intf.Methods)) for _, m := range intf.Methods { g.p("") _ = g.GenerateMockMethod(mockType, m, pkgOverride)