encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add specific test for coerced to string and localized float and integer fields

Browse Source
This commit is contained in:
Kevin Georgy 2016-10-18 08:42:08 +02:00
parent 2475476d9d
commit a5bd6d7ae3
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/fields.py
View File

@ -930,7 +930,7 @@ class IntegerField(NumberField):
if self.localize:
return number_format(value)
if self.coerce_to_string:
return str(value)
return str(int(value))
return int(value)
@ -953,7 +953,7 @@ class FloatField(NumberField):
if self.localize:
return number_format(value)
if self.coerce_to_string:
return str(value)
return str(float(value))
return float(value)

61
tests/test_fields.py
View File

@ -850,6 +850,37 @@ class TestMinMaxIntegerField(FieldValues):
field = serializers.IntegerField(min_value=1, max_value=3)
class TestCoerceToStringIntegerField(FieldValues):
valid_inputs = {}
invalid_inputs = {}
outputs = {
'1': '1',
'0': '0',
1: '1',
0: '0',
1.0: '1',
0.0: '0',
}
field = serializers.IntegerField(coerce_to_string=True)
class TestLocalizedIntegerField(TestCase):
@override_settings(USE_L10N=True, LANGUAGE_CODE='it')
def test_to_internal_value(self):
field = serializers.IntegerField(localize=True)
self.assertEqual(field.to_internal_value('1,0'), 1)
@override_settings(USE_L10N=True, LANGUAGE_CODE=None, DECIMAL_SEPARATOR=',', THOUSAND_SEPARATOR='\'',
NUMBER_GROUPING=3, USE_THOUSAND_SEPARATOR=True)
def test_to_representation(self):
field = serializers.IntegerField(localize=True)
self.assertEqual(field.to_representation(1000), '1\'000')
def test_localize_forces_coerce_to_string(self):
field = serializers.IntegerField(localize=True)
self.assertTrue(isinstance(field.to_representation(3), six.string_types))
class TestFloatField(FieldValues):
"""
Valid and invalid values for `FloatField`.
@ -898,6 +929,36 @@ class TestMinMaxFloatField(FieldValues):
field = serializers.FloatField(min_value=1, max_value=3)
class TestCoerceToStringFloatField(FieldValues):
valid_inputs = {}
invalid_inputs = {}
outputs = {
'1': str(1.0),
'0': str(0.0),
1: str(1.0),
0: str(0.0),
1.5: str(1.5),
}
field = serializers.FloatField(coerce_to_string=True)
class TestLocalizedFloatField(TestCase):
@override_settings(USE_L10N=True, LANGUAGE_CODE='it')
def test_to_internal_value(self):
field = serializers.FloatField(localize=True)
self.assertEqual(field.to_internal_value('1,5'), 1.5)
@override_settings(USE_L10N=True, LANGUAGE_CODE=None, DECIMAL_SEPARATOR=',', THOUSAND_SEPARATOR='\'',
NUMBER_GROUPING=3, USE_THOUSAND_SEPARATOR=True)
def test_to_representation(self):
field = serializers.FloatField(localize=True)
self.assertEqual(field.to_representation(1000.75), '1\'000,75')
def test_localize_forces_coerce_to_string(self):
field = serializers.FloatField(localize=True)
self.assertTrue(isinstance(field.to_representation(3), six.string_types))
class TestDecimalField(FieldValues):
"""
Valid and invalid values for `DecimalField`.