Modified and added test for varchar. Modified strict test for datahandler integer

lodel/leapi/datahandlers/datas_base.py

@@ -50,14 +50,12 @@ class Integer(DataField):
             raise FieldValidationError("The value '%s' is not a python type integer" % value)
         try:
             if strict:
-                if float(value) != int(value):
-                    raise FieldValidationError("The value '%s' is castable \
-into integer. But the DataHandler is strict and there is a floating part")
-            else:
                 value = int(value)
+            else:
+                value = int(float(value))
         except(ValueError, TypeError):
             raise FieldValidationError("The value '%s' is not, and will never, be an integer" % value)
-        return int(value)
+        return value
 
 ##@brief Data field designed to handle string
 class Varchar(DataField):

tests/datahandlers/test_boolean.py

@@ -1,25 +1,23 @@
 import unittest
+from lodel.exceptions import *
 
 from lodel.leapi.datahandlers.datas import Boolean, Varchar, Integer
 
 
+test_boolean = Boolean()
 class BooleanTestCase(unittest.TestCase):
 
-    def test_boolean_check_data_value(self):
-        test_boolean = Boolean()
-
-        # correct values
+    def test_boolean_good_check_data_value(self):
         for test_value in [True, False]:
-            _, error = test_boolean.check_data_value(test_value)
-            self.assertIsNone(error)
+            value = test_boolean._check_data_value(test_value)
+            self.assertEqual(value, bool(test_value))
 
-        # incorrect values
+    def test_boolean_bad_check_data_value(self):
         for test_value in ['ok', 'True', 'False']:
-            _, error = test_boolean.check_data_value(test_value)
-            self.assertIsNotNone(error)
+            with self.assertRaises(FieldValidationError):
+                test_boolean._check_data_value(test_value)
 
     def test_can_override(self):
-        test_boolean = Boolean()
 
         test_varchar = Varchar()
         test_int = Integer()

tests/datahandlers/test_integer.py

@@ -1,7 +1,5 @@
 import unittest
-
 from lodel.leapi.datahandlers.datas import Integer, Boolean
-
 from lodel.exceptions import *
 
 test_int = Integer()
@@ -10,13 +8,13 @@ class IntegerTestCase(unittest.TestCase):
     
     def test_integer_check_bad_data_value(self):
         # Incorrect values
-        for test_bad_value in ['ok','ceci est un test', '15.2']:
+        for test_bad_value in ['ok','ceci est un test']:
             with self.assertRaises(FieldValidationError):
                 test_int._check_data_value(test_bad_value)
 
     def test_integer_check_good_data_value(self):
         # Correct values
-        for test_correct_value in [10, '15', 15.0, '-15.0']:
+        for test_correct_value in [10, '15.2', 15.0, '-15.0']:
             value = test_int._check_data_value(test_correct_value)
             self.assertEqual(value, int(float(test_correct_value)))
 

tests/datahandlers/test_varchar.py

@@ -1,22 +1,20 @@
 import unittest
-
 from lodel.leapi.datahandlers.datas import Varchar, Integer
 from lodel.leapi.datahandlers.base_classes import FieldValidationError
+from lodel.exceptions import *
 
+test_varchar = Varchar(max_length=10)
 class VarcharTestCase(unittest.TestCase):
 
-    def test_check_data_value(self):
-        test_varchar = Varchar(max_length=10)
-
-        _, error = test_varchar.check_data_value("c" * 10)
-        self.assertIsNone(error)
-
-        _, error = test_varchar.check_data_value("c" * 9)
-        self.assertIsNone(error)
+    def test_check_good_data_value(self):
+        for test_value in ["c" * 10, "c" * 9]:
+            value = test_varchar._check_data_value(test_value)
+            self.assertEqual(value, test_value)
 
-        _, error = test_varchar.check_data_value("c" * 11)
-        self.assertIsNotNone(error)
-        self.assertIsInstance(error, FieldValidationError)
+    def test_check_bad_data_value(self):
+        for test_value in ["c" * 11]:
+            with self.assertRaises(FieldValidationError):
+                value = test_varchar._check_data_value(test_value)
 
     def test_can_override(self):
         test_varchar1 = Varchar()