Update continuation segment tests

This commit is contained in:
ZyX 2014-08-12 08:16:26 +04:00
parent 89afac44bb
commit 7882583dcb
1 changed files with 17 additions and 13 deletions

View File

@ -62,13 +62,17 @@ class TestShell(TestCase):
def test_continuation(self): def test_continuation(self):
pl = Pl() pl = Pl()
self.assertEqual(shell.continuation(pl=pl, segment_info={}), None) self.assertEqual(shell.continuation(pl=pl, segment_info={}), [{
'contents': '',
'width': 'auto',
'highlight_group': ['continuation:current', 'continuation'],
}])
segment_info = {'parser_state': 'if cmdsubst'} segment_info = {'parser_state': 'if cmdsubst'}
self.assertEqual(shell.continuation(pl=pl, segment_info=segment_info), [ self.assertEqual(shell.continuation(pl=pl, segment_info=segment_info), [
{ {
'contents': 'if', 'contents': 'if',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'l', 'align': 'l',
}, },
@ -77,7 +81,7 @@ class TestShell(TestCase):
{ {
'contents': 'if', 'contents': 'if',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'r', 'align': 'r',
}, },
@ -86,12 +90,12 @@ class TestShell(TestCase):
{ {
'contents': 'if', 'contents': 'if',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation', 'highlight_group': ['continuation'],
}, },
{ {
'contents': 'cmdsubst', 'contents': 'cmdsubst',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'l', 'align': 'l',
}, },
@ -100,21 +104,21 @@ class TestShell(TestCase):
{ {
'contents': 'if', 'contents': 'if',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation', 'highlight_group': ['continuation'],
'width': 'auto', 'width': 'auto',
'align': 'r', 'align': 'r',
}, },
{ {
'contents': 'cmdsubst', 'contents': 'cmdsubst',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
}, },
]) ])
self.assertEqual(shell.continuation(pl=pl, segment_info=segment_info, omit_cmdsubst=True, right_align=True), [ self.assertEqual(shell.continuation(pl=pl, segment_info=segment_info, omit_cmdsubst=True, right_align=True), [
{ {
'contents': 'if', 'contents': 'if',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'r', 'align': 'r',
}, },
@ -123,7 +127,7 @@ class TestShell(TestCase):
{ {
'contents': 'IF', 'contents': 'IF',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'r', 'align': 'r',
}, },
@ -131,7 +135,7 @@ class TestShell(TestCase):
self.assertEqual(shell.continuation(pl=pl, segment_info=segment_info, omit_cmdsubst=True, right_align=True, renames={'if': None}), [ self.assertEqual(shell.continuation(pl=pl, segment_info=segment_info, omit_cmdsubst=True, right_align=True, renames={'if': None}), [
{ {
'contents': '', 'contents': '',
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'r', 'align': 'r',
}, },
@ -141,17 +145,17 @@ class TestShell(TestCase):
{ {
'contents': 'then', 'contents': 'then',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation', 'highlight_group': ['continuation'],
}, },
{ {
'contents': 'then', 'contents': 'then',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation', 'highlight_group': ['continuation'],
}, },
{ {
'contents': 'then', 'contents': 'then',
'draw_inner_divider': True, 'draw_inner_divider': True,
'highlight_group': 'continuation:current', 'highlight_group': ['continuation:current', 'continuation'],
'width': 'auto', 'width': 'auto',
'align': 'l', 'align': 'l',
}, },