Merging resolution with settings validator

lodel/leapi/datahandlers/datas_base.py

@@ -114,6 +114,10 @@ class Text(DataField):
     
     def _check_data_value(self, value):
         error = None
+        try:
+            value = str(value)
+        except (ValueError, TypeError):
+            error = ValueError("The content passed to this Text field is not a convertible to a string")
         return value, error
 
 ##@brief Data field designed to handle Files

tests/datahandlers/test_boolean.py

@@ -10,12 +10,12 @@ class BooleanTestCase(unittest.TestCase):
 
         # correct values
         for test_value in [True, False]:
-            value, error = test_boolean._check_data_value(test_value)
+            value, error = test_boolean.check_data_value(test_value)
             self.assertIsNone(error)
 
         # incorrect values
         for test_value in ['ok', 'True', 'False']:
-            value, error = test_boolean._check_data_value(test_value)
+            value, error = test_boolean.check_data_value(test_value)
             self.assertIsNotNone(error)
 
     def test_can_override(self):

tests/datahandlers/test_integer.py

@@ -10,12 +10,12 @@ class IntegerTestCase(unittest.TestCase):
 
         # Incorrect values
         for test_bad_value in ['ok','ceci est un test', '15.2', 15.2]:
-            _, error = test_int._check_data_value(test_bad_value)
+            _, error = test_int.check_data_value(test_bad_value)
             self.assertIsNotNone(error)
 
         # Correct values
         for test_correct_value in [10, '15', '15.0']:
-            _, error = test_int._check_data_value(test_correct_value)
+            _, error = test_int.check_data_value(test_correct_value)
             self.assertIsNone(error)
 
     def test_can_override(self):

tests/datahandlers/test_regex.py

@@ -9,7 +9,7 @@ class RegexTestCase(unittest.TestCase):
         test_value = '126.205.255.12'
         test_regex = Regex('^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$',
                            max_length=100)
-        value, error = test_regex._check_data_value(test_value)
+        value, error = test_regex.check_data_value(test_value)
         self.assertIsNone(error)
         self.assertEqual(value, test_value)
 
@@ -17,7 +17,7 @@ class RegexTestCase(unittest.TestCase):
         test_regex = Regex('^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$',
                            max_length=15)
         for test_value in ['800.9.10.5', 'test_string_value', '999.999.999.999']:
-            value, error = test_regex._check_data_value(test_value)
+            value, error = test_regex.check_data_value(test_value)
             self.assertEqual(value, '')
             self.assertIsNotNone(error)
 
@@ -25,7 +25,7 @@ class RegexTestCase(unittest.TestCase):
         test_max_length = 15
         test_regex = Regex('[a-z]+8?', max_length=15)
         for test_value in ['cccccc8', 'ccccccccccccccccccccccccccccccccc8']:
-            value, error = test_regex._check_data_value(test_value)
+            value, error = test_regex.check_data_value(test_value)
             if len(test_value)>test_max_length:
                 self.assertEqual(value, '')
                 self.assertIsNotNone(error)

tests/datahandlers/test_text.py

@@ -0,0 +1,15 @@
+import unittest
+
+from lodel.leapi.datahandlers.datas import Text
+
+
+class TextTestCase(unittest.TestCase):
+
+    def test_check_data(self):
+        test_value = """ Ceci est un texte multiligne pour tester le check
+        sur le datahandler
+        Text
+        """
+        test_text = Text()
+        _, error = test_text.check_data_value(test_value)
+        self.assertIsNone(error)

tests/datahandlers/test_varchar.py

@@ -8,13 +8,13 @@ class VarcharTestCase(unittest.TestCase):
     def test_check_data_value(self):
         test_varchar = Varchar(max_length=10)
 
-        _, error = test_varchar._check_data_value("c" * 10)
+        _, error = test_varchar.check_data_value("c" * 10)
         self.assertIsNone(error)
 
-        _, error = test_varchar._check_data_value("c" * 9)
+        _, error = test_varchar.check_data_value("c" * 9)
         self.assertIsNone(error)
 
-        _, error = test_varchar._check_data_value("c" * 11)
+        _, error = test_varchar.check_data_value("c" * 11)
         self.assertIsNotNone(error)
         self.assertIsInstance(error, ValueError)