diff options
Diffstat (limited to 'yapftests/format_token_test.py')
| -rw-r--r-- | yapftests/format_token_test.py | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/yapftests/format_token_test.py b/yapftests/format_token_test.py index 7dfb82a..e324983 100644 --- a/yapftests/format_token_test.py +++ b/yapftests/format_token_test.py @@ -26,40 +26,40 @@ class TabbedContinuationAlignPaddingTest(unittest.TestCase): def testSpace(self): align_style = 'SPACE' - pad = format_token._TabbedContinuationAlignPadding(0, align_style, 2, 4) + pad = format_token._TabbedContinuationAlignPadding(0, align_style, 2) self.assertEqual(pad, '') - pad = format_token._TabbedContinuationAlignPadding(2, align_style, 2, 4) + pad = format_token._TabbedContinuationAlignPadding(2, align_style, 2) self.assertEqual(pad, ' ' * 2) - pad = format_token._TabbedContinuationAlignPadding(5, align_style, 2, 4) + pad = format_token._TabbedContinuationAlignPadding(5, align_style, 2) self.assertEqual(pad, ' ' * 5) def testFixed(self): align_style = 'FIXED' - pad = format_token._TabbedContinuationAlignPadding(0, align_style, 4, 8) + pad = format_token._TabbedContinuationAlignPadding(0, align_style, 4) self.assertEqual(pad, '') - pad = format_token._TabbedContinuationAlignPadding(2, align_style, 4, 8) - self.assertEqual(pad, '\t' * 2) + pad = format_token._TabbedContinuationAlignPadding(2, align_style, 4) + self.assertEqual(pad, '\t') - pad = format_token._TabbedContinuationAlignPadding(5, align_style, 4, 8) + pad = format_token._TabbedContinuationAlignPadding(5, align_style, 4) self.assertEqual(pad, '\t' * 2) def testVAlignRight(self): align_style = 'VALIGN-RIGHT' - pad = format_token._TabbedContinuationAlignPadding(0, align_style, 4, 8) + pad = format_token._TabbedContinuationAlignPadding(0, align_style, 4) self.assertEqual(pad, '') - pad = format_token._TabbedContinuationAlignPadding(2, align_style, 4, 8) + pad = format_token._TabbedContinuationAlignPadding(2, align_style, 4) self.assertEqual(pad, '\t') - pad = format_token._TabbedContinuationAlignPadding(4, align_style, 4, 8) + pad = format_token._TabbedContinuationAlignPadding(4, align_style, 4) self.assertEqual(pad, '\t') - pad = format_token._TabbedContinuationAlignPadding(5, align_style, 4, 8) + pad = format_token._TabbedContinuationAlignPadding(5, align_style, 4) self.assertEqual(pad, '\t' * 2) @@ -67,11 +67,15 @@ class FormatTokenTest(unittest.TestCase): def testSimple(self): tok = format_token.FormatToken(pytree.Leaf(token.STRING, "'hello world'")) - self.assertEqual("FormatToken(name=STRING, value='hello world')", str(tok)) + self.assertEqual( + "FormatToken(name=DOCSTRING, value='hello world', column=0, " + "lineno=0, splitpenalty=0)", str(tok)) self.assertTrue(tok.is_string) tok = format_token.FormatToken(pytree.Leaf(token.COMMENT, '# A comment')) - self.assertEqual('FormatToken(name=COMMENT, value=# A comment)', str(tok)) + self.assertEqual( + 'FormatToken(name=COMMENT, value=# A comment, column=0, ' + 'lineno=0, splitpenalty=0)', str(tok)) self.assertTrue(tok.is_comment) def testIsMultilineString(self): |