Implements the EmClass::linked_type() method and add 2 new property method to EmField : em_class and fieldgroup

Associated tests has been added/updated

EditorialModel/classes.py

@@ -97,10 +97,15 @@ class EmClass(EmComponent):
     ## Add a new EditorialModel.types.EmType that can ben linked to this class
     # @param  em_type EditorialModel.types.EmType: type to link
     # @return success bool: done or not
+    # @deprecated To do this add a rel2type field to any fieldtype of this EmClass
     def link_type(self, em_type):
         pass
 
     ## Retrieve list of EditorialModel.types.EmType that are linked to this class
     #  @return types [EditorialModel.types.EmType]:
     def linked_types(self):
-        pass
+        res = list()
+        for field in self.fields():
+            if field.fieldtype_instance().name == 'rel2type':
+                res.append(self.model.component(field.rel_to_type_id))
+        return res

EditorialModel/fields.py

@@ -79,6 +79,16 @@ class EmField(EmComponent):
     def fieldtypes_list():
         return [f for f in EditorialModel.fieldtypes.__all__ if f != '__init__' and f != 'generic' ]
 
+    ##@brief Return the EmFieldgroup this EmField belongs to
+    @property
+    def fieldgroup(self):
+        return self.model.component(self.fieldgroup_id)
+    
+    ## @brief Returns the EmClass this EmField belongs to
+    @property
+    def em_class(self):
+        return self.fieldgroup.em_class
+
     ## @brief Get the fieldtype instance
     # @return a fieldtype instance
     def fieldtype_instance(self):

EditorialModel/test/test_classes.py

@@ -219,7 +219,6 @@ class TestEmClassFields(ClassesTestCase):
 # Creating a new EmClass should :
 # - create a table named like the created EmClass
 # - insert a new line in em_classes
-@unittest.skip("Not implemented yet")
 class TestEmClassLinkType(ClassesTestCase):
 
     # create a new EmClass, then test on it
@@ -228,31 +227,9 @@ class TestEmClassLinkType(ClassesTestCase):
         ClassesTestCase.setUpClass()
         test_entity = EM_TEST_OBJECT.create_component(EmClass.__name__, {'name': 'testEntity', 'classtype': EmClassType.entity['name']})
         test_entry = EM_TEST_OBJECT.create_component(EmClass.__name__, {'name': 'testEntry', 'classtype': EmClassType.entry['name']})
-        keywords = EM_TEST_OBJECT.create_component(EmType.__name__, {'name': 'keywords', 'class_id': test_entry.uid})
-        test_entity.link_type(keywords)
 
-    '''
+    def testLinkedTypes(self):
+        """ Test the EmClass.linked_types() method """
+        for field, linked_type in [ (f, EM_TEST_OBJECT.component(f.rel_to_type_id)) for f in EM_TEST_OBJECT.components(EmField) if 'rel_to_type_id' in f.__dict__]:
+            self.assertIn(linked_type, field.em_class.linked_types())
 
-    # test if a table 'testEntity_keywords' was created
-    # should be able to select on the created table
-    def test_table_classes_types(self):
-        """ Test if a table 'testEntity_keywords' was created """
-        conn = sqlutils.get_engine().connect()
-        a = sqlutils.meta(conn)
-        try:
-            newtable = sqla.Table('testEntity_keywords', sqlutils.meta(conn))
-            req = sqla.sql.select([newtable])
-            res = conn.execute(req)
-            res = res.fetchall()
-            conn.close()
-        except:
-            self.fail("unable to select table testEntity_keywords")
-        self.assertEqual(res, [])
-
-    # test if we can retrieve the linked type
-    def test_linked_types(self):
-        """ Test linked_types """
-        testEntity = EmClass('testEntity')
-        linked_types = testEntity.linked_types()
-        self.assertEqual(linked_types[0].name, 'keywords')
-    '''

EditorialModel/test/test_field.py

@@ -83,3 +83,9 @@ class TestField(FieldTestCase):
             # We check that the field object is not in the EmField components list
             field_components_records = EM_TEST_OBJECT.components(EmField)
             self.assertNotIn(field, field_components_records)
+
+    def test_emclass(self):
+        """ Test if the EmField.em_class @property method is correct """
+        for field in EM_TEST_OBJECT.components(EmField):
+            self.assertIn(field, field.em_class.fields())
+            self.assertIn(field.fieldgroup, field.em_class.fieldgroups())