Move tests to bpython.tests

sebastinas · sebastinas · commit b07e149d2920 · 2015-01-09T13:49:15.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -186,28 +186,3 @@ def flush(self):
     def isatty(self):
         return True
 
-def test_simple():
-    orig_stdout = sys.stdout
-    orig_stderr = sys.stderr
-    c = CodeRunner(request_refresh=lambda: orig_stdout.flush() or orig_stderr.flush())
-    stdout = FakeOutput(c, orig_stdout.write)
-    sys.stdout = stdout
-    c.load_code('1 + 1')
-    c.run_code()
-    c.run_code()
-    c.run_code()
-
-def test_exception():
-    orig_stdout = sys.stdout
-    orig_stderr = sys.stderr
-    c = CodeRunner(request_refresh=lambda: orig_stdout.flush() or orig_stderr.flush())
-    def ctrlc():
-        raise KeyboardInterrupt()
-    stdout = FakeOutput(c, lambda x: ctrlc())
-    sys.stdout = stdout
-    c.load_code('1 + 1')
-    c.run_code()
-
-if __name__ == '__main__':
-    test_simple()
-
diff --git a/bpython/test/test_curtsies_coderunner.py b/bpython/test/test_curtsies_coderunner.py
@@ -0,0 +1,38 @@
+import unittest
+import sys
+
+from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
+
+class TestCodeRunner(unittest.TestCase):
+
+    def setUp(self):
+        self.orig_stdout = sys.stdout
+        self.orig_stderr = sys.stderr
+
+    def tearDown(self):
+        sys.stdout = self.orig_stdout
+        sys.stderr = self.orig_stderr
+
+    def test_simple(self):
+        c = CodeRunner(request_refresh=lambda: self.orig_stdout.flush() or self.orig_stderr.flush())
+        stdout = FakeOutput(c, lambda *args, **kwargs: None)
+        stderr = FakeOutput(c, lambda *args, **kwargs: None)
+        sys.stdout = stdout
+        sys.stdout = stderr
+        c.load_code('1 + 1')
+        c.run_code()
+        c.run_code()
+        c.run_code()
+
+    def test_exception(self):
+        orig_stdout = sys.stdout
+        orig_stderr = sys.stderr
+        c = CodeRunner(request_refresh=lambda: self.orig_stdout.flush() or self.orig_stderr.flush())
+        def ctrlc():
+            raise KeyboardInterrupt()
+        stdout = FakeOutput(c, lambda x: ctrlc())
+        stderr = FakeOutput(c, lambda *args, **kwargs: None)
+        sys.stdout = stdout
+        sys.stderr = stderr
+        c.load_code('1 + 1')
+        c.run_code()
