Sort classes by name before renaming

tests/codegen/handlers/test_class_name_conflict.py

@@ -77,11 +77,11 @@ def test_rename_classes(self, mock_rename_class):
 
         mock_rename_class.assert_has_calls(
             [
-                mock.call(classes[0], False),
                 mock.call(classes[1], False),
+                mock.call(classes[0], False),
                 mock.call(classes[2], False),
-                mock.call(classes[0], True),
                 mock.call(classes[1], True),
+                mock.call(classes[0], True),
                 mock.call(classes[2], True),
             ]
         )

xsdata/codegen/handlers/attribute_default_value.py

@@ -1,3 +1,4 @@
+from operator import attrgetter
 from typing import Optional
 
 from xsdata.codegen.mixins import RelativeHandlerInterface
@@ -85,6 +86,5 @@ def find_enum(self, attr_type: AttrType) -> Optional[Class]:
         if attr_type.native:
             return None
 
-        return self.container.find(
-            attr_type.qname, condition=lambda x: x.is_enumeration
-        )
+        is_enumeration = attrgetter("is_enumeration")
+        return self.container.find(attr_type.qname, condition=is_enumeration)

xsdata/codegen/handlers/class_name_conflict.py

@@ -40,7 +40,7 @@ def rename_classes(self, classes: List[Class], use_name: bool):
         the list.
         """
         total_elements = sum(x.is_element for x in classes)
-        for target in classes:
+        for target in sorted(classes, key=operator.attrgetter("name")):
             if not target.is_element or total_elements > 1:
                 self.rename_class(target, use_name)