summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Rouleau <xblitz@gmail.com>2015-04-13 14:56:36 -0400
committerTim Graham <timograham@gmail.com>2015-04-14 10:57:39 -0400
commitb333d10618f8ddbf665499a2db8eca8bd78d0939 (patch)
tree2809d41d94114a0900f8e2c623c07912d170cec9
parent072947ad3548aab86b79b1a2960a509852c00f1c (diff)
downloaddjango-b333d10618f8ddbf665499a2db8eca8bd78d0939.tar.gz
Added tests with number fields for admin.utils.display_for_field().
-rw-r--r--tests/admin_utils/tests.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py
index 5720fbb64d..c41a89eab2 100644
--- a/tests/admin_utils/tests.py
+++ b/tests/admin_utils/tests.py
@@ -1,6 +1,7 @@
from __future__ import unicode_literals
from datetime import datetime
+from decimal import Decimal
from django import forms
from django.conf import settings
@@ -12,7 +13,7 @@ from django.contrib.admin.utils import (
)
from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
from django.db import DEFAULT_DB_ALIAS, models
-from django.test import TestCase
+from django.test import TestCase, override_settings
from django.utils import six
from django.utils.formats import localize
from django.utils.safestring import mark_safe
@@ -172,6 +173,21 @@ class UtilsTests(TestCase):
display_value = display_for_field(None, models.FloatField())
self.assertEqual(display_value, EMPTY_CHANGELIST_VALUE)
+ def test_number_formats_display_for_field(self):
+ display_value = display_for_field(12345.6789, models.FloatField())
+ self.assertEqual(display_value, '12345.6789')
+
+ display_value = display_for_field(Decimal('12345.6789'), models.DecimalField())
+ self.assertEqual(display_value, '12345.6789')
+
+ @override_settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True)
+ def test_number_formats_with_thousand_seperator_display_for_field(self):
+ display_value = display_for_field(12345.6789, models.FloatField())
+ self.assertEqual(display_value, '12,345.6789')
+
+ display_value = display_for_field(Decimal('12345.6789'), models.DecimalField())
+ self.assertEqual(display_value, '12,345.6789')
+
def test_label_for_field(self):
"""
Tests for label_for_field