aboutsummaryrefslogtreecommitdiff
path: root/yapftests/line_joiner_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'yapftests/line_joiner_test.py')
-rw-r--r--yapftests/line_joiner_test.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/yapftests/line_joiner_test.py b/yapftests/line_joiner_test.py
index 6501bc8..2eaf164 100644
--- a/yapftests/line_joiner_test.py
+++ b/yapftests/line_joiner_test.py
@@ -29,14 +29,14 @@ class LineJoinerTest(yapf_test_helper.YAPFTest):
style.SetGlobalStyle(style.CreatePEP8Style())
def _CheckLineJoining(self, code, join_lines):
- """Check that the given UnwrappedLines are joined as expected.
+ """Check that the given LogicalLines are joined as expected.
Arguments:
code: The code to check to see if we can join it.
join_lines: True if we expect the lines to be joined.
"""
- uwlines = yapf_test_helper.ParseAndUnwrap(code)
- self.assertCodeEqual(line_joiner.CanMergeMultipleLines(uwlines), join_lines)
+ llines = yapf_test_helper.ParseAndUnwrap(code)
+ self.assertCodeEqual(line_joiner.CanMergeMultipleLines(llines), join_lines)
def testSimpleSingleLineStatement(self):
code = textwrap.dedent(u"""\
@@ -74,7 +74,7 @@ class LineJoinerTest(yapf_test_helper.YAPFTest):
def testOverColumnLimit(self):
code = textwrap.dedent(u"""\
if instance(bbbbbbbbbbbbbbbbbbbbbbbbb, int): cccccccccccccccccccccccccc = ddddddddddddddddddddd
- """)
+ """) # noqa
self._CheckLineJoining(code, join_lines=False)