add skipped tests

thomasballinger · thomasballinger · commit 62fe2441df7f · 2015-01-18T13:59:34.000-05:00
add tests for examples of why the current naive approach isn't sufficient
diff --git a/bpython/test/fodder/original.py b/bpython/test/fodder/original.py
@@ -20,3 +20,28 @@ def BlankLineInFunction(self):
     pass
 #EndTest
 
+#StartTest-blank_line_in_try_catch
+try:
+    1
+
+except:
+    2
+#EndTest
+
+#StartTest-blank_line_in_try_catch_else
+try:
+    1
+
+except:
+    2
+
+else:
+    3
+#EndTest
+
+#StartTest-blank_trailing_line
+def foo():
+    return 1
+
+#EndTest
+
diff --git a/bpython/test/fodder/processed.py b/bpython/test/fodder/processed.py
@@ -18,3 +18,28 @@ def BlankLineInFunction(self):
     
     pass
 #EndTest
+
+#StartTest-blank_line_in_try_catch
+try:
+    1
+    
+except:
+    2
+#EndTest
+
+#StartTest-blank_line_in_try_catch_else
+try:
+    1
+    
+except:
+    2
+    
+else:
+    3
+#EndTest
+
+#StartTest-blank_trailing_line
+def foo():
+    return 1
+
+#EndTest
diff --git a/bpython/test/test_preprocess.py b/bpython/test/test_preprocess.py
@@ -5,6 +5,12 @@
 import re
 import unittest
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+skip = unittest.skip
+
 from bpython.curtsiesfrontend.interpreter import code_finished_will_parse
 from bpython.curtsiesfrontend.preprocess import indent_empty_lines
 
@@ -34,14 +40,17 @@ def assertCompiles(self, source):
 
     def test_indent_empty_lines_nops(self):
         self.assertEqual(indent_empty('hello'), 'hello')
+        self.assertEqual(indent_empty('hello\ngoodbye'), 'hello\ngoodbye')
+        self.assertEqual(indent_empty('a\n    b\nc\n'), 'a\n    b\nc\n')
 
     def assertShowWhitespaceEqual(self, a, b):
+        print a
         self.assertEqual(
-            indent_empty(a), b,
+            a, b,
             ''.join(difflib.context_diff(a.replace(' ', '~').splitlines(True),
                                          b.replace(' ', '~').splitlines(True),
-                                         fromfile='original',
-                                         tofile='processed',
+                                         fromfile='actual',
+                                         tofile='expected',
                                          n=5)))
 
     def assertDefinitionIndented(self, obj):
@@ -71,3 +80,14 @@ def test_empty_line_within_class(self):
 
     def test_blank_lines_in_for_loop(self):
         self.assertIndented('blank_lines_in_for_loop')
+
+    @skip("More advanced technique required: need to try compiling and backtracking")
+    def test_blank_line_in_try_catch(self):
+        self.assertIndented('blank_line_in_try_catch')
+
+    @skip("More advanced technique required: need to try compiling and backtracking")
+    def test_blank_line_in_try_catch_else(self):
+        self.assertIndented('blank_line_in_try_catch_else')
+
+    def test_blank_trailing_line(self):
+        self.assertIndented('blank_trailing_line')
