Convert old tests to use unittest

Tests/test_000_sanity.py

@@ -1,24 +1,32 @@
-from __future__ import print_function
-from tester import *
+from helper import unittest, PillowTestCase, tearDownModule
 
 import PIL
 import PIL.Image
 
-# Make sure we have the binary extension
-im = PIL.Image.core.new("L", (100, 100))
 
-assert PIL.Image.VERSION[:3] == '1.1'
+class TestSanity(PillowTestCase):
 
-# Create an image and do stuff with it.
-im = PIL.Image.new("1", (100, 100))
-assert (im.mode, im.size) == ('1', (100, 100))
-assert len(im.tobytes()) == 1300
+    def test_sanity(self):
 
-# Create images in all remaining major modes.
-im = PIL.Image.new("L", (100, 100))
-im = PIL.Image.new("P", (100, 100))
-im = PIL.Image.new("RGB", (100, 100))
-im = PIL.Image.new("I", (100, 100))
-im = PIL.Image.new("F", (100, 100))
+        # Make sure we have the binary extension
+        im = PIL.Image.core.new("L", (100, 100))
 
-print("ok")
+        self.assertEqual(PIL.Image.VERSION[:3], '1.1')
+
+        # Create an image and do stuff with it.
+        im = PIL.Image.new("1", (100, 100))
+        self.assertEqual((im.mode, im.size), ('1', (100, 100)))
+        self.assertEqual(len(im.tobytes()), 1300)
+
+        # Create images in all remaining major modes.
+        im = PIL.Image.new("L", (100, 100))
+        im = PIL.Image.new("P", (100, 100))
+        im = PIL.Image.new("RGB", (100, 100))
+        im = PIL.Image.new("I", (100, 100))
+        im = PIL.Image.new("F", (100, 100))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file

Tests/test_bmp_reference.py

@@ -1,86 +1,94 @@
-from tester import *
+from helper import unittest, PillowTestCase, tearDownModule
 
 from PIL import Image
 import os
 
 base = os.path.join('Tests', 'images', 'bmp')
 
 
-def get_files(d, ext='.bmp'):
-    return [os.path.join(base,d,f) for f
-            in os.listdir(os.path.join(base, d)) if ext in f]
+class TestBmpReference(PillowTestCase):
 
-def test_bad():
-    """ These shouldn't crash/dos, but they shouldn't return anything either """
-    for f in get_files('b'):
-        try:
-            im = Image.open(f)
-            im.load()
-        except Exception as msg:
-            pass
-            # print ("Bad Image %s: %s" %(f,msg))
+    def get_files(self, d, ext='.bmp'):
+        return [os.path.join(base, d, f) for f
+                in os.listdir(os.path.join(base, d)) if ext in f]
 
-def test_questionable():
-    """ These shouldn't crash/dos, but its not well defined that these are in spec """
-    for f in get_files('q'):
-        try:
-            im = Image.open(f)
-            im.load()
-        except Exception as msg:
-            pass
-            # print ("Bad Image %s: %s" %(f,msg))
+    def test_bad(self):
+        """ These shouldn't crash/dos, but they shouldn't return anything
+        either """
+        for f in self.get_files('b'):
+            try:
+                im = Image.open(f)
+                im.load()
+            except Exception:  # as msg:
+                pass
+                # print ("Bad Image %s: %s" %(f,msg))
 
+    def test_questionable(self):
+        """ These shouldn't crash/dos, but its not well defined that these
+        are in spec """
+        for f in self.get_files('q'):
+            try:
+                im = Image.open(f)
+                im.load()
+            except Exception:  # as msg:
+                pass
+                # print ("Bad Image %s: %s" %(f,msg))
 
-def test_good():
-    """ These should all work. There's a set of target files in the
-    html directory that we can compare against. """
+    def test_good(self):
+        """ These should all work. There's a set of target files in the
+        html directory that we can compare against. """
 
-    # Target files, if they're not just replacing the extension
-    file_map = { 'pal1wb.bmp': 'pal1.png',
-                 'pal4rle.bmp': 'pal4.png', 
-                 'pal8-0.bmp': 'pal8.png',
-                 'pal8rle.bmp': 'pal8.png',
-                 'pal8topdown.bmp': 'pal8.png',
-                 'pal8nonsquare.bmp': 'pal8nonsquare-v.png',
-                 'pal8os2.bmp': 'pal8.png',
-                 'pal8os2sp.bmp': 'pal8.png',
-                 'pal8os2v2.bmp': 'pal8.png',
-                 'pal8os2v2-16.bmp': 'pal8.png',
-                 'pal8v4.bmp': 'pal8.png',
-                 'pal8v5.bmp': 'pal8.png',
-                 'rgb16-565pal.bmp': 'rgb16-565.png',
-                 'rgb24pal.bmp': 'rgb24.png',
-                 'rgb32.bmp': 'rgb24.png',
-                 'rgb32bf.bmp': 'rgb24.png'
-                 }     
-
-    def get_compare(f):
-        (head, name) = os.path.split(f)
-        if name in file_map:
-            return os.path.join(base, 'html', file_map[name])
-        (name,ext) = os.path.splitext(name)
-        return os.path.join(base, 'html', "%s.png"%name)
-
-    for f in get_files('g'):
-        try:
-            im = Image.open(f)
-            im.load()
-            compare = Image.open(get_compare(f))
-            compare.load()
-            if im.mode == 'P':
-                # assert image similar doesn't really work
-                # with paletized image, since the palette might
-                # be differently ordered for an equivalent image.
-                im = im.convert('RGBA')
-                compare = im.convert('RGBA')
-            assert_image_similar(im, compare,5)
-
-
-        except Exception as msg:
-            # there are three here that are unsupported:
-            unsupported = (os.path.join(base, 'g', 'rgb32bf.bmp'),
-                           os.path.join(base, 'g', 'pal8rle.bmp'),
-                           os.path.join(base, 'g', 'pal4rle.bmp'))
-            if f not in unsupported:
-                assert_true(False, "Unsupported Image %s: %s" %(f,msg))
+        # Target files, if they're not just replacing the extension
+        file_map = {'pal1wb.bmp': 'pal1.png',
+                    'pal4rle.bmp': 'pal4.png',
+                    'pal8-0.bmp': 'pal8.png',
+                    'pal8rle.bmp': 'pal8.png',
+                    'pal8topdown.bmp': 'pal8.png',
+                    'pal8nonsquare.bmp': 'pal8nonsquare-v.png',
+                    'pal8os2.bmp': 'pal8.png',
+                    'pal8os2sp.bmp': 'pal8.png',
+                    'pal8os2v2.bmp': 'pal8.png',
+                    'pal8os2v2-16.bmp': 'pal8.png',
+                    'pal8v4.bmp': 'pal8.png',
+                    'pal8v5.bmp': 'pal8.png',
+                    'rgb16-565pal.bmp': 'rgb16-565.png',
+                    'rgb24pal.bmp': 'rgb24.png',
+                    'rgb32.bmp': 'rgb24.png',
+                    'rgb32bf.bmp': 'rgb24.png'
+                    }
 
+        def get_compare(f):
+            (head, name) = os.path.split(f)
+            if name in file_map:
+                return os.path.join(base, 'html', file_map[name])
+            (name, ext) = os.path.splitext(name)
+            return os.path.join(base, 'html', "%s.png" % name)
+
+        for f in self.get_files('g'):
+            try:
+                im = Image.open(f)
+                im.load()
+                compare = Image.open(get_compare(f))
+                compare.load()
+                if im.mode == 'P':
+                    # assert image similar doesn't really work
+                    # with paletized image, since the palette might
+                    # be differently ordered for an equivalent image.
+                    im = im.convert('RGBA')
+                    compare = im.convert('RGBA')
+                self.assert_image_similar(im, compare, 5)
+
+            except Exception as msg:
+                # there are three here that are unsupported:
+                unsupported = (os.path.join(base, 'g', 'rgb32bf.bmp'),
+                               os.path.join(base, 'g', 'pal8rle.bmp'),
+                               os.path.join(base, 'g', 'pal4rle.bmp'))
+                if f not in unsupported:
+                    self.assertTrue(
+                        False, "Unsupported Image %s: %s" % (f, msg))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file