Added test for EmComponent.get_max_rank(), replacing the default value for rank by the one processed by get_max_rank

EditorialModel/components.py

@@ -203,7 +203,7 @@ class EmComponent(object):
         dbe = cls.db_engine()
         conn = dbe.connect()
 
-        kwargs['rank'] = -1 #Warning !!!
+        kwargs['rank'] = cls.get_max_rank( kwargs[cls.ranked_in] )+1
 
         table = sql.Table(cls.table, sqlutils.meta(dbe))
         req = table.insert(kwargs)
@@ -265,7 +265,8 @@ class EmComponent(object):
 
     ## get_max_rank
     # Retourne le rank le plus élevé pour le groupe de component au quel apartient l'objet actuelle
-    #return int
+    # @param ranked_in_value mixed: The rank "family"
+    # @param return -1 if no EmComponent found else return an integer >= 0
     @classmethod
     def get_max_rank(cls, ranked_in_value):
         dbe = cls.db_engine()
@@ -275,12 +276,10 @@ class EmComponent(object):
         res = c.execute(req)
         res = res.fetchone()
         c.close()
-        if(res != None):
+        if res != None:
             return res['rank']
         else:
             return -1
-            #logger.error("Bad argument")
-            #raise EmComponentRankingNotExistError('The ranking of the component named : ' + self.name + 'is empty')
 
     ## modify_rank
     #

EditorialModel/test/test_component.py

@@ -39,18 +39,8 @@ def setUpModule():
         
         The goal are to overwrtie Db configs, and prepare objects for test_case initialisation
     """
-    #Overwritting db confs to make tests
-
+    cleanDb(TEST_COMPONENT_DBNAME)
 
-    """
-    settings.LODEL2SQLWRAPPER['db'] = {
-        'default': {
-            'ENGINE': 'sqlite',
-            'NAME': TEST_COMPONENT_DBNAME
-        }
-    }
-    
-    """
     setDbConf(TEST_COMPONENT_DBNAME)
     #Disable logging but CRITICAL
     logging.basicConfig(level=logging.CRITICAL)
@@ -440,7 +430,14 @@ class TestCreate(ComponentTestCase):
             self.fail("create raises but should return the existing EmComponent instance instead")
         self.assertEqual(tc.uid, tc2.uid, "Created twice the same EmComponent")
         pass
-        
+
+    def testGetMaxRank(self):
+        old = EmTestComp.get_max_rank('f')
+        EmTestComp.create(name="foobartest", rank_fam = 'f')
+        n = EmTestComp.get_max_rank('f')
+        self.assertEqual(old+1, n, "Excepted value was "+str(old+1)+" but got "+str(n))
+        self.assertEqual(EmTestComp.get_max_rank('z'), -1)
+        pass
 
 #====================#
 # EmComponent.delete #