[Python-checkins] cpython (merge 3.3 -> default): Added base64 module tests for non-binary files.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/65487938643d
changeset:   83534:65487938643d
parent:      83532:f7f6c2ea4b14
parent:      83533:95ca9b5ff402
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Apr 28 15:56:32 2013 +0300
summary:
  Added base64 module tests for non-binary files.

files:
  Lib/test/test_base64.py |  12 ++++++++++--
  1 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -45,7 +45,7 @@
 
     def test_encode(self):
         eq = self.assertEqual
-        from io import BytesIO
+        from io import BytesIO, StringIO
         infp = BytesIO(b'abcdefghijklmnopqrstuvwxyz'
                        b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                        b'0123456789!@#0^&*();:<>,. []{}')
@@ -55,13 +55,21 @@
            b'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE'
            b'RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT'
            b'Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n')
+        # Non-binary files
+        self.assertRaises(TypeError, base64.encode, StringIO('abc'), BytesIO())
+        self.assertRaises(TypeError, base64.encode, BytesIO(b'abc'), StringIO())
+        self.assertRaises(TypeError, base64.encode, StringIO('abc'), StringIO())
 
     def test_decode(self):
-        from io import BytesIO
+        from io import BytesIO, StringIO
         infp = BytesIO(b'd3d3LnB5dGhvbi5vcmc=')
         outfp = BytesIO()
         base64.decode(infp, outfp)
         self.assertEqual(outfp.getvalue(), b'www.python.org')
+        # Non-binary files
+        self.assertRaises(TypeError, base64.encode, StringIO('YWJj\n'), BytesIO())
+        self.assertRaises(TypeError, base64.encode, BytesIO(b'YWJj\n'), StringIO())
+        self.assertRaises(TypeError, base64.encode, StringIO('YWJj\n'), StringIO())
 
 
 class BaseXYTestCase(unittest.TestCase):

-- 
Repository URL: http://hg.python.org/cpython