sort methods on the mock implementation alphabetically (#500)

Sorting the methods by name will make sure that their order is consistent in source and reflect mode.
golang · Dec 10, 2020 · 1fe605d · 1fe605d
1 parent 99aa927
commit 1fe605d
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 52 deletions.
diff --git a/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go
diff --git a/mockgen/internal/tests/import_embedded_interface/bugreport_mock.go b/mockgen/internal/tests/import_embedded_interface/bugreport_mock.go
diff --git a/mockgen/internal/tests/mock_in_test_package/mock_test.go b/mockgen/internal/tests/mock_in_test_package/mock_test.go
diff --git a/mockgen/internal/tests/test_package/mock_test.go b/mockgen/internal/tests/test_package/mock_test.go
diff --git 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)