Add tests for pickediff datasource and fixes 'autosql' beahvior for fieldtypes + some others modifications

DataSource/MySQL/leapidatasource.py

@@ -18,6 +18,8 @@ from DataSource.MySQL import utils
 from EditorialModel.classtypes import EmNature
 from EditorialModel.fieldtypes.generic import MultiValueFieldType
 
+from EditorialModel.fieldtypes import datetime, rank, pk
+
 from Lodel.settings import Settings
 from .fieldtypes import fieldtype_cast
 
@@ -25,6 +27,14 @@ from .fieldtypes import fieldtype_cast
 class LeapiDataSource(DataSource.dummy.leapidatasource.LeapiDataSource):
 
     RELATIONS_POSITIONS_FIELDS = {REL_SUP: 'superior_id', REL_SUB: 'subordinate_id'}
+    
+    ## @brief List of fieldtypes that should not try to construct their values
+    autohandled_fieldtypes = [
+        {'ftype': pk.EmFieldType},
+        {'ftype': datetime.EmFieldType, 'now_on_update': True},
+        {'ftype': datetime.EmFieldType, 'now_on_create': True},
+        {'ftype': rank.EmFieldType, 'internal': 'autosql'}
+    ]
 
     def __init__(self, module = pymysql, **kwargs):
         super().__init__()

DataSource/dummy/leapidatasource.py

@@ -1,5 +1,7 @@
 #-*- coding: utf-8 -*-
 
+from EditorialModel.fieldtypes import pk, rank, datetime
+
 ## @brief Dummy datasource for LeObject
 #
 # This class has to be extended to apply to a real datasource
@@ -8,6 +10,14 @@
 # @todo Settings fetch/pass generalisation for datasources.
 class LeapiDataSource(object):
     
+    ## @brief List of fieldtypes that should not try to construct their values
+    autohandled_fieldtypes = [
+        {'ftype': pk.EmFieldType},
+        {'ftype': datetime.EmFieldType, 'now_on_update': True},
+        {'ftype': datetime.EmFieldType, 'now_on_create': True},
+        {'ftype': rank.EmFieldType, 'internal': 'autosql'}
+    ]
+
     ## @todo Settings fetch/pass generalisation for datasources.
     def __init__(self, module=None, *conn_args, **conn_kargs):
         self.module = module

DataSource/picklediff/leapidatasource.py

@@ -3,10 +3,13 @@
 import os, os.path
 import pickle
 import re
+import copy
 from collections import OrderedDict
-from Lodel import logger
 
 from Lodel.settings import Settings
+from Lodel import logger
+
+from EditorialModel.fieldtypes import pk
 
 ## @brief Datasource designed to stores datas and datas diff in pickle files
 # 
@@ -22,10 +25,14 @@ from Lodel.settings import Settings
 #  - modifications_datas : dict with action key and arguements for actions (example : { 'action': 'insert', 'target_class': EmClass, 'datas': dict() }
 #
 class LeapiDataSource(object):
-    
+ 
+    autohandled_fieldtypes = [
+        {'ftype': pk.EmFieldType}
+    ]
+
     def __init__(self, filename = None):
         if filename is None:
-            filename = Settings.datasource['default']['filename']
+            filename = Settings.datasource_options['filename']
         self.__filename = filename
         self.__content = None
         self.__load_file()
@@ -64,7 +71,7 @@ class LeapiDataSource(object):
                         lodel_ids = [ lid for lid in lodel_ids if self.__field_value(lodel_id, field) < value]
         # Now we got filtered lodel_id list in lodel_ids
         result = []
-        for datas in [ self.__content['editorial_model']['components'][lodel_id] for lodel_id in lodel_ids ]:
+        for datas in [ copy.copy(self.__content['editorial_model']['components'][lodel_id]) for lodel_id in lodel_ids ]:
             comp_class = target_cls.name2class(datas['__component_leapi_class__'])
             del(datas['__component_leapi_class__'])
 

DataSource/picklediff/test/test_datasource.py

@@ -0,0 +1,65 @@
+#-*- coding:utf-8 -*-
+
+import unittest
+import tempfile
+import os, os.path
+
+import leapi.test.utils
+from Lodel.settings import Settings
+from DataSource.picklediff.leapidatasource import LeapiDataSource
+from leapi.lecrud import _LeCrud
+from Lodel import logger
+from Lodel.utils.mlstring import MlString
+
+class PickleDiffDataSourceTestCase(unittest.TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        """ Set settings for pickle datasource """
+        logger.remove_console_handlers()
+
+        _, filename = tempfile.mkstemp(prefix="picklediff_test_")
+        cls.filename = filename
+        if os.path.isfile(filename):
+            os.unlink(filename)
+        cls.ds_package_bck = Settings.ds_package
+        cls.ds_opt_bck = Settings.datasource_options
+        Settings.ds_package = 'picklediff'
+        Settings.datasource_options = { 'filename': filename }
+        cls.tmpdir = leapi.test.utils.tmp_load_factory_code()
+    
+    @classmethod
+    def tearDownClass(cls):
+        """ Delete temporary file """
+        if os.path.isfile(cls.filename):
+            os.unlink(cls.filename)
+        leapi.test.utils.cleanup(cls.tmpdir)
+        Settings.ds_package = cls.ds_package_bck
+        Settings.datasource_options = cls.ds_opt_bck
+        _LeCrud._datasource = None
+
+    def test_insert(self):
+        from dyncode import Article
+        uid = Article.insert({'titre': 'fooBar', 'soustitre': 'Barfoo'})
+        res = Article.get([])
+
+        e_titre = MlString(default_value = 'fooBar')
+        e_stitre = MlString(default_value = 'Barfoo')
+
+        self.assertEqual(len(res), 1)
+        self.assertEqual(res[0].uidget(), uid)
+        self.assertEqual(res[0].titre, e_titre)
+        self.assertEqual(res[0].soustitre, e_stitre)
+    
+
+    def test_load(self):
+        from dyncode import Article, LeCrud
+        
+        uid = Article.insert({'titre': 'wowwo', 'soustitre': 'randomdsfsdfqsofjze'})
+        orig = Article.get([('lodel_id','=', uid)])
+
+        new_ds = LeapiDataSource(self.filename)
+        Article._datasource = new_ds
+        # Article._datasource = 42 #uncomment this line to verify that this hack works
+        new = Article.get([('lodel_id','=', uid)])
+        self.assertEqual(orig, new)

EditorialModel/fieldtypes/generic.py

@@ -36,7 +36,7 @@ class GenericFieldType(object):
     
     ## @return True if a fieldtype is internal
     def is_internal(self):
-        return self.internal != False
+        return self.internal is not False
     
     ## @brief Take care to call the fieldtype defined _check_data_value() method
     # @return a tuple (value, error|None)

Lodel/utils/mlstring.py

@@ -66,6 +66,9 @@ class MlString(object):
     # @return A json dump of the MlString::translations dict
     def __str__(self):
         return self.get_default()
+
+    def __repr__(self):
+        return "<MlString : %s >" % self.dumps()
     
     ## @brief Serialize the MlString in Json
     def json_dumps(self):

Makefile

@@ -2,7 +2,7 @@ all: check doc pip
 
 # Running unit tests
 check:
-	python -m unittest -v
+	./runtest
 
 # Rule to update libs
 pip: cleanpycache

leapi/lecrud.py

@@ -518,14 +518,28 @@ class _LeCrud(object, metaclass = _MetaLeCrud):
     # @param cls
     # @param datas dict : Datas that have been returned by LeCrud.check_datas_value() methods
     # @return A new dict of datas
+    # @todo change the internal value 'autosql' to 'auto_datasource'
     @classmethod
     def _construct_datas(cls, datas):
         constructor = DatasConstructor(cls, datas, cls.fieldtypes())
-        ret = {
-                fname:constructor[fname]
-                for fname, ftype in cls.fieldtypes().items()
-                if not ftype.is_internal() or ftype.internal != 'autosql'
-        }
+        ret = dict()
+
+        for fname, ftype in cls.fieldtypes().items():
+            construct = True
+            for autods_ftype in cls._datasource.autohandled_fieldtypes:
+                if isinstance(ftype, autods_ftype['ftype']):
+                    test_false = False
+                    for optname, optval in autods_ftype.items():
+                        if optname != 'ftype':
+                            if not hasattr(ftype, optname) or getattr(ftype, optname) != optval:
+                                test_false = True
+                                break
+                    if not test_false:
+                        construct = False
+                        break
+
+            if construct:
+                ret[fname] = constructor[fname]
         return ret
 
     ## @brief Check datas consistency

leapi/leobject.py

@@ -47,9 +47,16 @@ class _LeObject(_LeCrud):
     # @todo check class
     def __eq__(self, other):
         uid_fname = self.uidname()
-        if not hasattr(other, uid_fname):
+        if not hasattr(other, uid_fname) \
+            or self.uidget() != other.uidget() \
+            or self.__class__ != other.__class__:
             return False
-        return getattr(self, uid_fname) == getattr(other, uid_fname)
+        if self.is_complete() and other.is_complete():
+            for fname in self.fieldlist():
+                if not hasattr(other, fname) or getattr(other, fname) != getattr(self, fname):
+                    print(fname, 'differ', getattr(other, fname), getattr(self, fname))
+                    return False
+        return True
         
         
     ## @brief Quick str cast method implementation

runtest

@@ -1,49 +1,12 @@
 #!/bin/bash
-#
-# Usage : ./runtest [OPTIONS] [test_module[.test_class][ test_module2[.test_class2]...]
-#########
-#
-# Options list :
-################
-#
-# -b, --buffer
-#
-#    The standard output and standard error streams are buffered during the test run. Output during a passing test is discarded. Output is echoed normally on test fail or error and is added to the failure messages.
-#
-# -c, --catch
-#
-#    Control-C during the test run waits for the current test to end and then reports all the results so far. A second control-C raises the normal KeyboardInterrupt exception.
-#
-#
-# -f, --failfast
-#
-#    Stop the test run on the first error or failure.
-#
-# -h, --help
-#
-#    Get some help
-#
-# -v, --verbose
-#
-#   higher verbosity
-#
-# Examples :
-############
-#
-# Running all discoverables tests :
-# ./runtest
-#
-# Running only Em test about component object (only tests about the __init__ and modify_rank methods) with higher verbosity and failfast :
-# ./runtest -fv EditorialModel.test.test_component.TestInit EditorialModel.test.test_component.TestModifyRank
-#
-#
-# Running only Em tests
-# ./runtest discover EditorialModel
-#
-# More details :
-################
-#
-# https://docs.python.org/3.4/library/unittest.html
-#
 
-python -W ignore -m unittest $@
+# Old runtest is broken because of DataSource.picklediff tests
+# we have to run each test package in differents python instances
+
+test_package_name='test'
+
+for d in $(find . -type d -name "$test_package_name")
+do
+	echo -e "\tTesting\t$(dirname $d)\n"
+	python -W ignore -m unittest discover -qf -s "$d" || break
+done