line 1
') - self.assertEqual(linebreaks_filter('line 1\nline 2'), - 'line 1
line 2
line 1
line 2
line 1
line 2
line 2') - self.assertEqual(linebreaksbr('line 1\rline 2'), - 'line 1
line 2') - self.assertEqual(linebreaksbr('line 1\r\nline 2'), - 'line 1
line 2') - - def test_removetags(self): - with warnings.catch_warnings(record=True): - warnings.simplefilter("always") - self.assertEqual(removetags('some html with disallowed
- \n\t\t
- item 1.1 \n\t
- \n\t\t
- item 1.1 \n\t\t
- item1.2' - ' \n\t
- \n\t\t
- item 1.1\n\t\t
- \n\t\t\t
- '
- 'item 1.1.1\n\t\t\t
- \n\t\t\t\t
- item 1.1.1.1 \n\t\t\t' - '
\n\t\t
\n\t - '
- 'item 1.1.1\n\t\t\t
- \n\t\t
- Kansas\n\t\t
- \n\t\t\t
- ' - 'Lawrence \n\t\t\t
- Topeka \n\t\t
'
- '\n\t\t - Illinois \n\t
- \n\t\t
- item 1.1 \n\t
- \n\t\t
- item 1.1' - ' \n\t\t
- item 1.2 \n\t
- \n\t\t
- Kansas\n\t\t
- \n\t\t\t
- Lawrence ' - '\n\t\t\t
- Topeka \n\t\t
\n\t\t - ' - 'Illinois \n\t
123
') - self.assertEqual(linebreaksbr(123), '123') - with warnings.catch_warnings(record=True): - warnings.simplefilter("always") - self.assertEqual(removetags(123, 'a'), '123') - self.assertEqual(striptags(123), '123') - - -class DefaultFiltersI18NTests(TestCase): - - def test_localized_filesizeformat(self): - # NOTE: \xa0 avoids wrapping between value and unit - with self.settings(USE_L10N=True), translation.override('de'): - self.assertEqual(filesizeformat(1023), '1023\xa0Bytes') - self.assertEqual(filesizeformat(1024), '1,0\xa0KB') - self.assertEqual(filesizeformat(10 * 1024), '10,0\xa0KB') - self.assertEqual(filesizeformat(1024 * 1024 - 1), '1024,0\xa0KB') - self.assertEqual(filesizeformat(1024 * 1024), '1,0\xa0MB') - self.assertEqual(filesizeformat(1024 * 1024 * 50), '50,0\xa0MB') - self.assertEqual(filesizeformat(1024 * 1024 * 1024 - 1), '1024,0\xa0MB') - self.assertEqual(filesizeformat(1024 * 1024 * 1024), '1,0\xa0GB') - self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024), '1,0\xa0TB') - self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024), '1,0\xa0PB') - self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024 * 2000), '2000,0\xa0PB') - self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0Bytes') - self.assertEqual(filesizeformat(""), '0\xa0Bytes') - self.assertEqual(filesizeformat("\N{GREEK SMALL LETTER ALPHA}"), '0\xa0Bytes') diff --git a/tests/template_tests/filter_tests/test_add.py b/tests/template_tests/filter_tests/test_add.py index 9faf81dfa5..802c1cfe19 100644 --- a/tests/template_tests/filter_tests/test_add.py +++ b/tests/template_tests/filter_tests/test_add.py @@ -1,5 +1,6 @@ from datetime import date, timedelta +from django.template.defaultfilters import add from django.test import SimpleTestCase from ..utils import render, setup @@ -44,3 +45,9 @@ class AddTests(SimpleTestCase): def test_add07(self): output = render('add07', {'d': date(2000, 1, 1), 't': timedelta(10)}) self.assertEqual(output, 'Jan. 11, 2000') + + +class FunctionTests(SimpleTestCase): + + def test_add(self): + self.assertEqual(add('1', '2'), 3) diff --git a/tests/template_tests/filter_tests/test_addslashes.py b/tests/template_tests/filter_tests/test_addslashes.py index 4d712b4bd4..7be84c0220 100644 --- a/tests/template_tests/filter_tests/test_addslashes.py +++ b/tests/template_tests/filter_tests/test_addslashes.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import addslashes from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -15,3 +16,18 @@ class AddslashesTests(SimpleTestCase): def test_addslashes02(self): output = render('addslashes02', {"a": "'", "b": mark_safe("'")}) self.assertEqual(output, r"<a>\' \'") + + +class FunctionTests(SimpleTestCase): + + def test_quotes(self): + self.assertEqual( + addslashes('"double quotes" and \'single quotes\''), + '\\"double quotes\\" and \\\'single quotes\\\'', + ) + + def test_backslashes(self): + self.assertEqual(addslashes(r'\ : backslashes, too'), '\\\\ : backslashes, too') + + def test_non_string_input(self): + self.assertEqual(addslashes(123), '123') diff --git a/tests/template_tests/filter_tests/test_capfirst.py b/tests/template_tests/filter_tests/test_capfirst.py index 07546ad6c7..d7a28130f9 100644 --- a/tests/template_tests/filter_tests/test_capfirst.py +++ b/tests/template_tests/filter_tests/test_capfirst.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import capfirst from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -15,3 +16,9 @@ class CapfirstTests(SimpleTestCase): def test_capfirst02(self): output = render('capfirst02', {'a': 'fred>', 'b': mark_safe('fred>')}) self.assertEqual(output, 'Fred> Fred>') + + +class FunctionTests(SimpleTestCase): + + def test_capfirst(self): + self.assertEqual(capfirst('hello world'), 'Hello world') diff --git a/tests/template_tests/filter_tests/test_center.py b/tests/template_tests/filter_tests/test_center.py index 6f10f99a85..0dbb1002b7 100644 --- a/tests/template_tests/filter_tests/test_center.py +++ b/tests/template_tests/filter_tests/test_center.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import center from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -16,3 +17,12 @@ class CenterTests(SimpleTestCase): def test_center02(self): output = render('center02', {"a": "a&b", "b": mark_safe("a&b")}) self.assertEqual(output, ". a&b . . a&b .") + + +class FunctionTests(SimpleTestCase): + + def test_center(self): + self.assertEqual(center('test', 6), ' test ') + + def test_non_string_input(self): + self.assertEqual(center(123, 5), ' 123 ') diff --git a/tests/template_tests/filter_tests/test_cut.py b/tests/template_tests/filter_tests/test_cut.py index 68568df30c..fde23266ba 100644 --- a/tests/template_tests/filter_tests/test_cut.py +++ b/tests/template_tests/filter_tests/test_cut.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import cut from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -37,3 +38,18 @@ class CutTests(SimpleTestCase): def test_cut06(self): output = render('cut06', {"a": "x&y", "b": mark_safe("x&y")}) self.assertEqual(output, "x&y x&y") + + +class FunctionTests(SimpleTestCase): + + def test_character(self): + self.assertEqual(cut('a string to be mangled', 'a'), ' string to be mngled') + + def test_characters(self): + self.assertEqual(cut('a string to be mangled', 'ng'), 'a stri to be maled') + + def test_non_matching_string(self): + self.assertEqual(cut('a string to be mangled', 'strings'), 'a string to be mangled') + + def test_non_string_input(self): + self.assertEqual(cut(123, '2'), '13') diff --git a/tests/template_tests/filter_tests/test_date.py b/tests/template_tests/filter_tests/test_date.py index cbec356908..e546dae430 100644 --- a/tests/template_tests/filter_tests/test_date.py +++ b/tests/template_tests/filter_tests/test_date.py @@ -1,5 +1,7 @@ from datetime import datetime, time +from django.template.defaultfilters import date +from django.test import SimpleTestCase from django.utils import timezone from .timezone_utils import TimezoneTestCase @@ -58,3 +60,12 @@ class DateTests(TimezoneTestCase): def test_date09(self): output = render('date09', {'t': time(0, 0)}) self.assertEqual(output, '00:00') + + +class FunctionTests(SimpleTestCase): + + def test_date(self): + self.assertEqual(date(datetime(2005, 12, 29), "d F Y"), '29 December 2005') + + def test_escape_characters(self): + self.assertEqual(date(datetime(2005, 12, 29), r'jS \o\f F'), '29th of December') diff --git a/tests/template_tests/filter_tests/test_default.py b/tests/template_tests/filter_tests/test_default.py index 790f60cd3b..766957ba35 100644 --- a/tests/template_tests/filter_tests/test_default.py +++ b/tests/template_tests/filter_tests/test_default.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import default from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -45,3 +46,15 @@ class DefaultIfNoneTests(SimpleTestCase): def test_default_if_none02(self): output = render('default_if_none02', {"a": None}) self.assertEqual(output, "x<") + + +class FunctionTests(SimpleTestCase): + + def test_value(self): + self.assertEqual(default('val', 'default'), 'val') + + def test_none(self): + self.assertEqual(default(None, 'default'), 'default') + + def test_empty_string(self): + self.assertEqual(default('', 'default'), 'default') diff --git a/tests/template_tests/filter_tests/test_default_if_none.py b/tests/template_tests/filter_tests/test_default_if_none.py new file mode 100644 index 0000000000..45bd666913 --- /dev/null +++ b/tests/template_tests/filter_tests/test_default_if_none.py @@ -0,0 +1,14 @@ +from django.template.defaultfilters import default_if_none +from django.test import SimpleTestCase + + +class FunctionTests(SimpleTestCase): + + def test_value(self): + self.assertEqual(default_if_none("val", 'default'), 'val') + + def test_none(self): + self.assertEqual(default_if_none(None, 'default'), 'default') + + def test_empty_string(self): + self.assertEqual(default_if_none('', 'default'), '') diff --git a/tests/template_tests/filter_tests/test_dictsort.py b/tests/template_tests/filter_tests/test_dictsort.py new file mode 100644 index 0000000000..1d937a2dae --- /dev/null +++ b/tests/template_tests/filter_tests/test_dictsort.py @@ -0,0 +1,44 @@ +from django.template.defaultfilters import dictsort +from django.test import SimpleTestCase + + +class FunctionTests(SimpleTestCase): + + def test_sort(self): + sorted_dicts = dictsort( + [{'age': 23, 'name': 'Barbara-Ann'}, + {'age': 63, 'name': 'Ra Ra Rasputin'}, + {'name': 'Jonny B Goode', 'age': 18}], + 'age', + ) + + self.assertEqual( + [sorted(dict.items()) for dict in sorted_dicts], + [[('age', 18), ('name', 'Jonny B Goode')], + [('age', 23), ('name', 'Barbara-Ann')], + [('age', 63), ('name', 'Ra Ra Rasputin')]], + ) + + def test_dictsort_complex_sorting_key(self): + """ + Since dictsort uses template.Variable under the hood, it can sort + on keys like 'foo.bar'. + """ + data = [ + {'foo': {'bar': 1, 'baz': 'c'}}, + {'foo': {'bar': 2, 'baz': 'b'}}, + {'foo': {'bar': 3, 'baz': 'a'}}, + ] + sorted_data = dictsort(data, 'foo.baz') + + self.assertEqual([d['foo']['bar'] for d in sorted_data], [3, 2, 1]) + + def test_invalid_values(self): + """ + If dictsort is passed something other than a list of dictionaries, + fail silently. + """ + self.assertEqual(dictsort([1, 2, 3], 'age'), '') + self.assertEqual(dictsort('Hello!', 'age'), '') + self.assertEqual(dictsort({'a': 1}, 'age'), '') + self.assertEqual(dictsort(1, 'age'), '') diff --git a/tests/template_tests/filter_tests/test_dictsortreversed.py b/tests/template_tests/filter_tests/test_dictsortreversed.py new file mode 100644 index 0000000000..92229495fe --- /dev/null +++ b/tests/template_tests/filter_tests/test_dictsortreversed.py @@ -0,0 +1,30 @@ +from django.template.defaultfilters import dictsortreversed +from django.test import SimpleTestCase + + +class FunctionTests(SimpleTestCase): + + def test_sort(self): + sorted_dicts = dictsortreversed( + [{'age': 23, 'name': 'Barbara-Ann'}, + {'age': 63, 'name': 'Ra Ra Rasputin'}, + {'name': 'Jonny B Goode', 'age': 18}], + 'age', + ) + + self.assertEqual( + [sorted(dict.items()) for dict in sorted_dicts], + [[('age', 63), ('name', 'Ra Ra Rasputin')], + [('age', 23), ('name', 'Barbara-Ann')], + [('age', 18), ('name', 'Jonny B Goode')]], + ) + + def test_invalid_values(self): + """ + If dictsortreversed is passed something other than a list of + dictionaries, fail silently. + """ + self.assertEqual(dictsortreversed([1, 2, 3], 'age'), '') + self.assertEqual(dictsortreversed('Hello!', 'age'), '') + self.assertEqual(dictsortreversed({'a': 1}, 'age'), '') + self.assertEqual(dictsortreversed(1, 'age'), '') diff --git a/tests/template_tests/filter_tests/test_divisibleby.py b/tests/template_tests/filter_tests/test_divisibleby.py new file mode 100644 index 0000000000..2b3fe9aa4c --- /dev/null +++ b/tests/template_tests/filter_tests/test_divisibleby.py @@ -0,0 +1,11 @@ +from django.template.defaultfilters import divisibleby +from django.test import SimpleTestCase + + +class FunctionTests(SimpleTestCase): + + def test_true(self): + self.assertEqual(divisibleby(4, 2), True) + + def test_false(self): + self.assertEqual(divisibleby(4, 3), False) diff --git a/tests/template_tests/filter_tests/test_escape.py b/tests/template_tests/filter_tests/test_escape.py index 81f0f4037a..094bf575ce 100644 --- a/tests/template_tests/filter_tests/test_escape.py +++ b/tests/template_tests/filter_tests/test_escape.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import escape from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -31,3 +32,9 @@ class EscapeTests(SimpleTestCase): def test_escape04(self): output = render('escape04', {"a": "x&y"}) self.assertEqual(output, "x&y") + + +class FunctionTests(SimpleTestCase): + + def test_non_string_input(self): + self.assertEqual(escape(123), '123') diff --git a/tests/template_tests/filter_tests/test_escapejs.py b/tests/template_tests/filter_tests/test_escapejs.py index 82019022ec..d124be1667 100644 --- a/tests/template_tests/filter_tests/test_escapejs.py +++ b/tests/template_tests/filter_tests/test_escapejs.py @@ -1,3 +1,6 @@ +from __future__ import unicode_literals + +from django.template.defaultfilters import escapejs_filter from django.test import SimpleTestCase from ..utils import render, setup @@ -18,3 +21,33 @@ class EscapejsTests(SimpleTestCase): self.assertEqual(output, 'testing\\u000D\\u000Ajavascript ' '\\u0027string\\u0022 \\u003Cb\\u003E' 'escaping\\u003C/b\\u003E') + + +class FunctionTests(SimpleTestCase): + + def test_quotes(self): + self.assertEqual( + escapejs_filter('"double quotes" and \'single quotes\''), + '\\u0022double quotes\\u0022 and \\u0027single quotes\\u0027', + ) + + def test_backslashes(self): + self.assertEqual(escapejs_filter(r'\ : backslashes, too'), '\\u005C : backslashes, too') + + def test_whitespace(self): + self.assertEqual( + escapejs_filter('and lots of whitespace: \r\n\t\v\f\b'), + 'and lots of whitespace: \\u000D\\u000A\\u0009\\u000B\\u000C\\u0008', + ) + + def test_script(self): + self.assertEqual( + escapejs_filter(r''), + '\\u003Cscript\\u003Eand this\\u003C/script\\u003E', + ) + + def test_paragraph_separator(self): + self.assertEqual( + escapejs_filter('paragraph separator:\u2029and line separator:\u2028'), + 'paragraph separator:\\u2029and line separator:\\u2028', + ) diff --git a/tests/template_tests/filter_tests/test_filesizeformat.py b/tests/template_tests/filter_tests/test_filesizeformat.py new file mode 100644 index 0000000000..c94da8c8d6 --- /dev/null +++ b/tests/template_tests/filter_tests/test_filesizeformat.py @@ -0,0 +1,41 @@ +from __future__ import unicode_literals + +from django.template.defaultfilters import filesizeformat +from django.test import SimpleTestCase +from django.utils import translation + + +class FunctionTests(SimpleTestCase): + + def test_formats(self): + self.assertEqual(filesizeformat(1023), '1023\xa0bytes') + self.assertEqual(filesizeformat(1024), '1.0\xa0KB') + self.assertEqual(filesizeformat(10 * 1024), '10.0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024 - 1), '1024.0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024), '1.0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 50), '50.0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 - 1), '1024.0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024), '1.0\xa0GB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024), '1.0\xa0TB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024), '1.0\xa0PB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024 * 2000), '2000.0\xa0PB') + self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0bytes') + self.assertEqual(filesizeformat(""), '0\xa0bytes') + self.assertEqual(filesizeformat("\N{GREEK SMALL LETTER ALPHA}"), '0\xa0bytes') + + def test_localized_formats(self): + with self.settings(USE_L10N=True), translation.override('de'): + self.assertEqual(filesizeformat(1023), '1023\xa0Bytes') + self.assertEqual(filesizeformat(1024), '1,0\xa0KB') + self.assertEqual(filesizeformat(10 * 1024), '10,0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024 - 1), '1024,0\xa0KB') + self.assertEqual(filesizeformat(1024 * 1024), '1,0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 50), '50,0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 - 1), '1024,0\xa0MB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024), '1,0\xa0GB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024), '1,0\xa0TB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024), '1,0\xa0PB') + self.assertEqual(filesizeformat(1024 * 1024 * 1024 * 1024 * 1024 * 2000), '2000,0\xa0PB') + self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0Bytes') + self.assertEqual(filesizeformat(""), '0\xa0Bytes') + self.assertEqual(filesizeformat("\N{GREEK SMALL LETTER ALPHA}"), '0\xa0Bytes') diff --git a/tests/template_tests/filter_tests/test_first.py b/tests/template_tests/filter_tests/test_first.py index 566a70c4ac..c7361dbd12 100644 --- a/tests/template_tests/filter_tests/test_first.py +++ b/tests/template_tests/filter_tests/test_first.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import first from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -15,3 +16,15 @@ class FirstTests(SimpleTestCase): def test_first02(self): output = render('first02', {"a": ["a&b", "x"], "b": [mark_safe("a&b"), "x"]}) self.assertEqual(output, "a&b a&b") + + +class FunctionTests(SimpleTestCase): + + def test_list(self): + self.assertEqual(first([0, 1, 2]), 0) + + def test_empty_string(self): + self.assertEqual(first(''), '') + + def test_string(self): + self.assertEqual(first('test'), 't') diff --git a/tests/template_tests/filter_tests/test_floatformat.py b/tests/template_tests/filter_tests/test_floatformat.py index a69278f958..466984b006 100644 --- a/tests/template_tests/filter_tests/test_floatformat.py +++ b/tests/template_tests/filter_tests/test_floatformat.py @@ -1,4 +1,12 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from decimal import Decimal, localcontext +from unittest import expectedFailure + +from django.template.defaultfilters import floatformat from django.test import SimpleTestCase +from django.utils import six from django.utils.safestring import mark_safe from ..utils import render, setup @@ -16,3 +24,86 @@ class FloatformatTests(SimpleTestCase): def test_floatformat02(self): output = render('floatformat02', {"a": "1.42", "b": mark_safe("1.42")}) self.assertEqual(output, "1.4 1.4") + + +class FunctionTests(SimpleTestCase): + + def test_inputs(self): + self.assertEqual(floatformat(7.7), '7.7') + self.assertEqual(floatformat(7.0), '7') + self.assertEqual(floatformat(0.7), '0.7') + self.assertEqual(floatformat(0.07), '0.1') + self.assertEqual(floatformat(0.007), '0.0') + self.assertEqual(floatformat(0.0), '0') + self.assertEqual(floatformat(7.7, 3), '7.700') + self.assertEqual(floatformat(6.000000, 3), '6.000') + self.assertEqual(floatformat(6.200000, 3), '6.200') + self.assertEqual(floatformat(6.200000, -3), '6.200') + self.assertEqual(floatformat(13.1031, -3), '13.103') + self.assertEqual(floatformat(11.1197, -2), '11.12') + self.assertEqual(floatformat(11.0000, -2), '11') + self.assertEqual(floatformat(11.000001, -2), '11.00') + self.assertEqual(floatformat(8.2798, 3), '8.280') + self.assertEqual(floatformat(5555.555, 2), '5555.56') + self.assertEqual(floatformat(001.3000, 2), '1.30') + self.assertEqual(floatformat(0.12345, 2), '0.12') + self.assertEqual(floatformat(Decimal('555.555'), 2), '555.56') + self.assertEqual(floatformat(Decimal('09.000')), '9') + self.assertEqual(floatformat('foo'), '') + self.assertEqual(floatformat(13.1031, 'bar'), '13.1031') + self.assertEqual(floatformat(18.125, 2), '18.13') + self.assertEqual(floatformat('foo', 'bar'), '') + self.assertEqual(floatformat('¿Cómo esta usted?'), '') + self.assertEqual(floatformat(None), '') + + def test_zero_values(self): + """ + Check that we're not converting to scientific notation. + """ + self.assertEqual(floatformat(0, 6), '0.000000') + self.assertEqual(floatformat(0, 7), '0.0000000') + self.assertEqual(floatformat(0, 10), '0.0000000000') + self.assertEqual(floatformat(0.000000000000000000015, 20), + '0.00000000000000000002') + + def test_infinity(self): + pos_inf = float(1e30000) + self.assertEqual(floatformat(pos_inf), six.text_type(pos_inf)) + + neg_inf = float(-1e30000) + self.assertEqual(floatformat(neg_inf), six.text_type(neg_inf)) + + nan = pos_inf / pos_inf + self.assertEqual(floatformat(nan), six.text_type(nan)) + + def test_float_dunder_method(self): + class FloatWrapper(object): + def __init__(self, value): + self.value = value + + def __float__(self): + return self.value + + self.assertEqual(floatformat(FloatWrapper(11.000001), -2), '11.00') + + def test_low_decimal_precision(self): + """ + #15789 + """ + with localcontext() as ctx: + ctx.prec = 2 + self.assertEqual(floatformat(1.2345, 2), '1.23') + self.assertEqual(floatformat(15.2042, -3), '15.204') + self.assertEqual(floatformat(1.2345, '2'), '1.23') + self.assertEqual(floatformat(15.2042, '-3'), '15.204') + self.assertEqual(floatformat(Decimal('1.2345'), 2), '1.23') + self.assertEqual(floatformat(Decimal('15.2042'), -3), '15.204') + + def test_many_zeroes(self): + self.assertEqual(floatformat(1.00000000000000015, 16), '1.0000000000000002') + + if six.PY2: + # The above test fails because of Python 2's float handling. Floats + # with many zeroes after the decimal point should be passed in as + # another type such as unicode or Decimal. + test_many_zeroes = expectedFailure(test_many_zeroes) diff --git a/tests/template_tests/filter_tests/test_force_escape.py b/tests/template_tests/filter_tests/test_force_escape.py index 1217e07793..b231d8e374 100644 --- a/tests/template_tests/filter_tests/test_force_escape.py +++ b/tests/template_tests/filter_tests/test_force_escape.py @@ -1,4 +1,9 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.template.defaultfilters import force_escape from django.test import SimpleTestCase +from django.utils.safestring import SafeData from ..utils import render, setup @@ -50,3 +55,17 @@ class ForceEscapeTests(SimpleTestCase): def test_force_escape08(self): output = render('force-escape08', {"a": "x&y"}) self.assertEqual(output, "x&y") + + +class FunctionTests(SimpleTestCase): + + def test_escape(self): + escaped = force_escape('x&
y
x&
y
line 1
') + + def test_newline(self): + self.assertEqual(linebreaks_filter('line 1\nline 2'), 'line 1
line 2
line 1
line 2
line 1
line 2
123
') diff --git a/tests/template_tests/filter_tests/test_linebreaksbr.py b/tests/template_tests/filter_tests/test_linebreaksbr.py index c65b0973fb..39905d7fb0 100644 --- a/tests/template_tests/filter_tests/test_linebreaksbr.py +++ b/tests/template_tests/filter_tests/test_linebreaksbr.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import linebreaksbr from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -20,3 +21,18 @@ class LinebreaksbrTests(SimpleTestCase): def test_linebreaksbr02(self): output = render('linebreaksbr02', {"a": "x&\ny", "b": mark_safe("x&\ny")}) self.assertEqual(output, "x&y x&
y") + + +class FunctionTests(SimpleTestCase): + + def test_newline(self): + self.assertEqual(linebreaksbr('line 1\nline 2'), 'line 1
line 2') + + def test_carriage(self): + self.assertEqual(linebreaksbr('line 1\rline 2'), 'line 1
line 2') + + def test_carriage_newline(self): + self.assertEqual(linebreaksbr('line 1\r\nline 2'), 'line 1
line 2') + + def test_non_string_input(self): + self.assertEqual(linebreaksbr(123), '123') diff --git a/tests/template_tests/filter_tests/test_linenumbers.py b/tests/template_tests/filter_tests/test_linenumbers.py index d74ce5dcfe..d7e93d9429 100644 --- a/tests/template_tests/filter_tests/test_linenumbers.py +++ b/tests/template_tests/filter_tests/test_linenumbers.py @@ -1,3 +1,4 @@ +from django.template.defaultfilters import linenumbers from django.test import SimpleTestCase from django.utils.safestring import mark_safe @@ -28,3 +29,18 @@ class LinenumbersTests(SimpleTestCase): ) self.assertEqual(output, '1. one\n2.
y
xy
') + + +class FunctionTests(SimpleTestCase): + + def test_removetags(self): + with warnings.catch_warnings(): + warnings.simplefilter('ignore', RemovedInDjango20Warning) + self.assertEqual( + removetags( + 'some html with disallowedone two - three
four five
one two - three
four five
one...
', + ) + + def test_truncate2(self): + self.assertEqual( + truncatechars_html('one two - three
four five
one two ...
', + ) + + def test_truncate3(self): + self.assertEqual( + truncatechars_html('one two - three
four five
one two - three
four five
one two - three
four five
one two - three
four five
one two ...
', + ) + + def test_truncate2(self): + self.assertEqual( + truncatewords_html('one two - three
four five
one two - three
four five
one two - three
four five
one two - three
four five
one two - three
four five
- \n\t\t
- \n\t\t
- item 1.1 \n\t
- \n\t\t
- item 1.1 \n\t\t
- item1.2' + ' \n\t
- \n\t\t
- item 1.1\n\t\t
- \n\t\t\t
- '
+ 'item 1.1.1\n\t\t\t
- \n\t\t\t\t
- item 1.1.1.1 \n\t\t\t' + '
\n\t\t
\n\t - '
+ 'item 1.1.1\n\t\t\t
- \n\t\t
- Kansas\n\t\t
- \n\t\t\t
- ' + 'Lawrence \n\t\t\t
- Topeka \n\t\t
'
+ '\n\t\t - Illinois \n\t
- \n\t\t
- item 1.1 \n\t
- \n\t\t
- item 1.1' + ' \n\t\t
- item 1.2 \n\t
- \n\t\t
- Kansas\n\t\t
- \n\t\t\t
- Lawrence ' + '\n\t\t\t
- Topeka \n\t\t
\n\t\t - Illinois \n\t