1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2025-10-31 03:29:03 +01:00

Changed the used method for the check_data tests (using now the public one instead of the protected)

This commit is contained in:
Roland Haroutiounian 2016-08-19 09:05:08 +02:00
commit e9174bb847
5 changed files with 11 additions and 11 deletions

View file

@ -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):

View file

@ -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):

View file

@ -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)

View file

@ -11,5 +11,5 @@ class TextTestCase(unittest.TestCase):
Text
"""
test_text = Text()
_, error = test_text._check_data_value(test_value)
_, error = test_text.check_data_value(test_value)
self.assertIsNone(error)

View file

@ -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)