* Mark all strings as unicode -- shouldn't matter for this dataset but

ansible is passing unicode arond internally so we should test the same
  data.
* Add a zero length test for _count_newlines and fix the zero newlines
  test to have no newlines.
This commit is contained in:
Toshio Kuratomi 2015-09-02 09:43:42 -07:00
parent 417bf1c805
commit 9ecfc30f9a

View file

@ -32,42 +32,41 @@ class TestBackslashEscape(unittest.TestCase):
test_data = ( test_data = (
# Test backslashes in a filter arg are double escaped # Test backslashes in a filter arg are double escaped
dict( dict(
template="{{ 'test2 %s' | format('\\1') }}", template=u"{{ 'test2 %s' | format('\\1') }}",
intermediate="{{ 'test2 %s' | format('\\\\1') }}", intermediate=u"{{ 'test2 %s' | format('\\\\1') }}",
expectation="test2 \\1", expectation=u"test2 \\1",
args=dict() args=dict()
), ),
# Test backslashes inside the jinja2 var itself are double # Test backslashes inside the jinja2 var itself are double
# escaped # escaped
dict( dict(
template="Test 2\\3: {{ '\\1 %s' | format('\\2') }}", template=u"Test 2\\3: {{ '\\1 %s' | format('\\2') }}",
intermediate="Test 2\\3: {{ '\\\\1 %s' | format('\\\\2') }}", intermediate=u"Test 2\\3: {{ '\\\\1 %s' | format('\\\\2') }}",
expectation="Test 2\\3: \\1 \\2", expectation=u"Test 2\\3: \\1 \\2",
args=dict() args=dict()
), ),
# Test backslashes outside of the jinja2 var are not double # Test backslashes outside of the jinja2 var are not double
# escaped # escaped
dict( dict(
template="Test 2\\3: {{ 'test2 %s' | format('\\1') }}; \\done", template=u"Test 2\\3: {{ 'test2 %s' | format('\\1') }}; \\done",
intermediate="Test 2\\3: {{ 'test2 %s' | format('\\\\1') }}; \\done", intermediate=u"Test 2\\3: {{ 'test2 %s' | format('\\\\1') }}; \\done",
expectation="Test 2\\3: test2 \\1; \\done", expectation=u"Test 2\\3: test2 \\1; \\done",
args=dict() args=dict()
), ),
# Test backslashes in a variable sent to a filter are handled # Test backslashes in a variable sent to a filter are handled
dict( dict(
template="{{ 'test2 %s' | format(var1) }}", template=u"{{ 'test2 %s' | format(var1) }}",
#intermediate="{{ 'test2 %s' | format('\\\\1') }}", intermediate=u"{{ 'test2 %s' | format(var1) }}",
intermediate="{{ 'test2 %s' | format(var1) }}", expectation=u"test2 \\1",
expectation="test2 \\1", args=dict(var1=u'\\1')
args=dict(var1='\\1')
), ),
# Test backslashes in a variable expanded by jinja2 are double # Test backslashes in a variable expanded by jinja2 are double
# escaped # escaped
dict( dict(
template="Test 2\\3: {{ var1 | format('\\2') }}", template=u"Test 2\\3: {{ var1 | format('\\2') }}",
intermediate="Test 2\\3: {{ var1 | format('\\\\2') }}", intermediate=u"Test 2\\3: {{ var1 | format('\\\\2') }}",
expectation="Test 2\\3: \\1 \\2", expectation=u"Test 2\\3: \\1 \\2",
args=dict(var1='\\1 %s') args=dict(var1=u'\\1 %s')
), ),
) )
def setUp(self): def setUp(self):
@ -93,20 +92,23 @@ class TestCountNewlines(unittest.TestCase):
def tearDown(self): def tearDown(self):
pass pass
def test_zero_length_string(self):
self.assertEquals(_count_newlines_from_end(u''), 0)
def test_short_string(self): def test_short_string(self):
self.assertEquals(_count_newlines_from_end('The quick\n'), 1) self.assertEquals(_count_newlines_from_end(u'The quick\n'), 1)
def test_one_newline(self): def test_one_newline(self):
self.assertEquals(_count_newlines_from_end('The quick brown fox jumped over the lazy dog' * 1000 + '\n'), 1) self.assertEquals(_count_newlines_from_end(u'The quick brown fox jumped over the lazy dog' * 1000 + u'\n'), 1)
def test_multiple_newlines(self): def test_multiple_newlines(self):
self.assertEquals(_count_newlines_from_end('The quick brown fox jumped over the lazy dog' * 1000 + '\n\n\n'), 3) self.assertEquals(_count_newlines_from_end(u'The quick brown fox jumped over the lazy dog' * 1000 + u'\n\n\n'), 3)
def test_zero_newlines(self): def test_zero_newlines(self):
self.assertEquals(_count_newlines_from_end('The quick brown fox jumped over the lazy dog' * 1000 + '\n\n\n'), 3) self.assertEquals(_count_newlines_from_end(u'The quick brown fox jumped over the lazy dog' * 1000), 0)
def test_all_newlines(self): def test_all_newlines(self):
self.assertEquals(_count_newlines_from_end('\n' * 10), 10) self.assertEquals(_count_newlines_from_end(u'\n' * 10), 10)
def test_mostly_newlines(self): def test_mostly_newlines(self):
self.assertEquals(_count_newlines_from_end('The quick brown fox jumped over the lazy dog' + '\n' * 1000), 1000) self.assertEquals(_count_newlines_from_end(u'The quick brown fox jumped over the lazy dog' + u'\n' * 1000), 1000)