Commit 62fe244
committed
add skipped tests
add tests for examples of why the current naive approach isn't sufficient1 parent fe49677 commit 62fe244
3 files changed
Lines changed: 73 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -20,3 +20,28 @@ def BlankLineInFunction(self): | |||
| 20 | 20 | pass | |
| 21 | 21 | #EndTest | |
| 22 | 22 | ||
| 23 | + #StartTest-blank_line_in_try_catch | ||
| 24 | + try: | ||
| 25 | + 1 | ||
| 26 | + | ||
| 27 | + except: | ||
| 28 | + 2 | ||
| 29 | + #EndTest | ||
| 30 | + | ||
| 31 | + #StartTest-blank_line_in_try_catch_else | ||
| 32 | + try: | ||
| 33 | + 1 | ||
| 34 | + | ||
| 35 | + except: | ||
| 36 | + 2 | ||
| 37 | + | ||
| 38 | + else: | ||
| 39 | + 3 | ||
| 40 | + #EndTest | ||
| 41 | + | ||
| 42 | + #StartTest-blank_trailing_line | ||
| 43 | + def foo(): | ||
| 44 | + return 1 | ||
| 45 | + | ||
| 46 | + #EndTest | ||
| 47 | + | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -18,3 +18,28 @@ def BlankLineInFunction(self): | |||
| 18 | 18 | ||
| 19 | 19 | pass | |
| 20 | 20 | #EndTest | |
| 21 | + | ||
| 22 | + #StartTest-blank_line_in_try_catch | ||
| 23 | + try: | ||
| 24 | + 1 | ||
| 25 | + | ||
| 26 | + except: | ||
| 27 | + 2 | ||
| 28 | + #EndTest | ||
| 29 | + | ||
| 30 | + #StartTest-blank_line_in_try_catch_else | ||
| 31 | + try: | ||
| 32 | + 1 | ||
| 33 | + | ||
| 34 | + except: | ||
| 35 | + 2 | ||
| 36 | + | ||
| 37 | + else: | ||
| 38 | + 3 | ||
| 39 | + #EndTest | ||
| 40 | + | ||
| 41 | + #StartTest-blank_trailing_line | ||
| 42 | + def foo(): | ||
| 43 | + return 1 | ||
| 44 | + | ||
| 45 | + #EndTest | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,6 +5,12 @@ | |||
| 5 | 5 | import re | |
| 6 | 6 | import unittest | |
| 7 | 7 | ||
| 8 | + try: | ||
| 9 | + import unittest2 as unittest | ||
| 10 | + except ImportError: | ||
| 11 | + import unittest | ||
| 12 | + skip = unittest.skip | ||
| 13 | + | ||
| 8 | 14 | from bpython.curtsiesfrontend.interpreter import code_finished_will_parse | |
| 9 | 15 | from bpython.curtsiesfrontend.preprocess import indent_empty_lines | |
| 10 | 16 | ||
@@ -34,14 +40,17 @@ def assertCompiles(self, source): | |||
| 34 | 40 | ||
| 35 | 41 | def test_indent_empty_lines_nops(self): | |
| 36 | 42 | self.assertEqual(indent_empty('hello'), 'hello') | |
| 43 | + self.assertEqual(indent_empty('hello\ngoodbye'), 'hello\ngoodbye') | ||
| 44 | + self.assertEqual(indent_empty('a\n b\nc\n'), 'a\n b\nc\n') | ||
| 37 | 45 | ||
| 38 | 46 | def assertShowWhitespaceEqual(self, a, b): | |
| 47 | + print a | ||
| 39 | 48 | self.assertEqual( | |
| 40 | - indent_empty(a), b, | ||
| 49 | + a, b, | ||
| 41 | 50 | ''.join(difflib.context_diff(a.replace(' ', '~').splitlines(True), | |
| 42 | 51 | b.replace(' ', '~').splitlines(True), | |
| 43 | - fromfile='original', | ||
| 44 | - tofile='processed', | ||
| 52 | + fromfile='actual', | ||
| 53 | + tofile='expected', | ||
| 45 | 54 | n=5))) | |
| 46 | 55 | ||
| 47 | 56 | def assertDefinitionIndented(self, obj): | |
@@ -71,3 +80,14 @@ def test_empty_line_within_class(self): | |||
| 71 | 80 | ||
| 72 | 81 | def test_blank_lines_in_for_loop(self): | |
| 73 | 82 | self.assertIndented('blank_lines_in_for_loop') | |
| 83 | + | ||
| 84 | + @skip("More advanced technique required: need to try compiling and backtracking") | ||
| 85 | + def test_blank_line_in_try_catch(self): | ||
| 86 | + self.assertIndented('blank_line_in_try_catch') | ||
| 87 | + | ||
| 88 | + @skip("More advanced technique required: need to try compiling and backtracking") | ||
| 89 | + def test_blank_line_in_try_catch_else(self): | ||
| 90 | + self.assertIndented('blank_line_in_try_catch_else') | ||
| 91 | + | ||
| 92 | + def test_blank_trailing_line(self): | ||
| 93 | + self.assertIndented('blank_trailing_line') | ||
0 commit comments