Merge pull request #1246 from BuhtigithuB/improve-test-validators

Improve PEP8 just a bit + more coverage

gluon/tests/test_validators.py

@@ -242,6 +242,9 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, ('abc', 'Enter an integer'))
 
     def test_IS_FLOAT_IN_RANGE(self):
+        # with None
+        rtn = IS_FLOAT_IN_RANGE(1, 5)(None)
+        self.assertEqual(rtn, (None, 'Enter a number between 1 and 5'))
         rtn = IS_FLOAT_IN_RANGE(1, 5)('4')
         self.assertEqual(rtn, (4.0, None))
         rtn = IS_FLOAT_IN_RANGE(1, 5)(4)
@@ -270,10 +273,19 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, ('6,5', 'Enter a number'))
         rtn = IS_FLOAT_IN_RANGE(dot=',')('6.5')
         self.assertEqual(rtn, (6.5, None))
+        # With .formatter(None)
+        rtn = IS_FLOAT_IN_RANGE(dot=',').formatter(None)
+        self.assertEqual(rtn, None)
         rtn = IS_FLOAT_IN_RANGE(dot=',').formatter(0.25)
         self.assertEqual(rtn, '0,25')
+        # To trigger str2dec "if not '.' in s:" line
+        rtn = IS_FLOAT_IN_RANGE(dot=',').formatter(1)
+        self.assertEqual(rtn, '1,00')
 
     def test_IS_DECIMAL_IN_RANGE(self):
+        # with None
+        rtn = IS_DECIMAL_IN_RANGE(1, 5)(None)
+        self.assertEqual(rtn, (None, 'Enter a number between 1 and 5'))
         rtn = IS_DECIMAL_IN_RANGE(1, 5)('4')
         self.assertEqual(rtn, (decimal.Decimal('4'), None))
         rtn = IS_DECIMAL_IN_RANGE(1, 5)(4)
@@ -318,6 +330,9 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, (decimal.Decimal('6.5'), None))
         rtn = IS_DECIMAL_IN_RANGE(1, 5)(decimal.Decimal('4'))
         self.assertEqual(rtn, (decimal.Decimal('4'), None))
+        # With .formatter(None)
+        rtn = IS_DECIMAL_IN_RANGE(dot=',').formatter(None)
+        self.assertEqual(rtn, None)
         rtn = IS_DECIMAL_IN_RANGE(dot=',').formatter(0.25)
         self.assertEqual(rtn, '0,25')
 
@@ -964,7 +979,6 @@ this is the content of the fake file
         rtn = IS_IPADDRESS()('aaa')
         self.assertEqual(rtn, ('aaa', 'Enter valid IP address'))
 
-
         rtn = IS_IPADDRESS()('fe80::126c:8ffa:fe22:b3af')
         self.assertEqual(rtn, ('fe80::126c:8ffa:fe22:b3af', None))
         rtn = IS_IPADDRESS(is_ipv4=False)('fe80::126c:8ffa:fe22:b3af')
@@ -1001,16 +1015,5 @@ this is the content of the fake file
         self.assertEqual(rtn, ('2001::8ffa:fe22:b3af', 'invalid subnet provided'))
 
 
-
-
-
-
-
-
-
-
-
-
-
 if __name__ == '__main__':
     unittest.main()