Bugfix in lefactory method that allow to sort EmClass by dependencies + test update

lodel/leapi/lefactory.py

@@ -46,20 +46,9 @@ from lodel.leapi.datahandlers.base_classes import DataField
 # @return a list of EmClass instances
 def emclass_sorted_by_deps(emclass_list):
     def emclass_deps_cmp(cls_a, cls_b):
-        if len(cls_a.parents) + len(cls_b.parents) == 0:
-            return 0
-        elif len(cls_a.parents) == 0:
-            return -1
-        elif len(cls_b.parents) == 0:
-            return 1
-
-        if cls_a in cls_b.parents_recc:
-            return -1
-        elif cls_b in cls_a.parents_recc:
-            return 1
-        else:
-            return 0
-    return sorted(emclass_list, key = functools.cmp_to_key(emclass_deps_cmp))
+        return len(cls_a.parents_recc) - len(cls_b.parents_recc)
+    ret = sorted(emclass_list, key = functools.cmp_to_key(emclass_deps_cmp))
+    return ret
 
 ## @brief Returns a list of EmClass that will be represented as LeObject child classes
 def get_classes(model):

tests/leapi/test_lefactory.py

@@ -1,6 +1,8 @@
 #-*- coding: utf-8 -*-
 
 import unittest
+import random
+
 from lodel.editorial_model.model import EditorialModel
 from lodel.leapi import lefactory
 
@@ -20,7 +22,7 @@ class LeFactoryTestCase(unittest.TestCase):
         cls3 = model.new_class('testclass3', parents = [cls2])
         cls4 = model.new_class('testclass4', parents = [cls1, cls3])
         cls5 = model.new_class('testclass5', parents = [cls4])
-        cls6 = model.new_class('testclass6')
+        cls6 = model.new_class('testclass6', parents = [cls5])
 
         cls1.new_field('testfield1', data_handler='varchar')
         cls1.new_field('testfield2', data_handler='varchar', nullable = True)
@@ -35,12 +37,13 @@ class LeFactoryTestCase(unittest.TestCase):
     def test_emclass_sorted_by_deps(self):
         """ Test the function that sort EmClass by dependencies """
         cls_list = self.model.classes()
-        sorted_cls = lefactory.emclass_sorted_by_deps(cls_list)
-        seen = set() # Stores the EmClass allready seen will walking through array
         
-        for _ in range(10): #Bad sorts algorithm can have random behavior
+        for _ in range(100): #Bad sorts algorithm can have random behavior
+            random.shuffle(cls_list)
+            sorted_cls = lefactory.emclass_sorted_by_deps(cls_list)
+            seen = set() # Stores the EmClass allready seen will walking through array
             for emclass in sorted_cls:
-                for parent in emclass.parents:
+                for parent in emclass.parents_recc:
                     self.assertIn(parent, seen)
                 seen |= set((emclass,))