Convert more tests, fix test_imagewin.py

Tests/test_image_getpalette.py

@@ -1,19 +0,0 @@
-from tester import *
-
-from PIL import Image
-
-def test_palette():
-    def palette(mode):
-        p = lena(mode).getpalette()
-        if p:
-            return p[:10]
-        return None
-    assert_equal(palette("1"), None)
-    assert_equal(palette("L"), None)
-    assert_equal(palette("I"), None)
-    assert_equal(palette("F"), None)
-    assert_equal(palette("P"), [0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
-    assert_equal(palette("RGB"), None)
-    assert_equal(palette("RGBA"), None)
-    assert_equal(palette("CMYK"), None)
-    assert_equal(palette("YCbCr"), None)

Tests/test_image_mode.py

@@ -1,27 +0,0 @@
-from tester import *
-
-from PIL import Image
-
-def test_sanity():
-
-    im = lena()
-    assert_no_exception(lambda: im.mode)
-
-def test_properties():
-    def check(mode, *result):
-        signature = (
-            Image.getmodebase(mode), Image.getmodetype(mode),
-            Image.getmodebands(mode), Image.getmodebandnames(mode),
-            )
-        assert_equal(signature, result)
-    check("1", "L", "L", 1, ("1",))
-    check("L", "L", "L", 1, ("L",))
-    check("P", "RGB", "L", 1, ("P",))
-    check("I", "L", "I", 1, ("I",))
-    check("F", "L", "F", 1, ("F",))
-    check("RGB", "RGB", "L", 3, ("R", "G", "B"))
-    check("RGBA", "RGB", "L", 4, ("R", "G", "B", "A"))
-    check("RGBX", "RGB", "L", 4, ("R", "G", "B", "X"))
-    check("RGBX", "RGB", "L", 4, ("R", "G", "B", "X"))
-    check("CMYK", "RGB", "L", 4, ("C", "M", "Y", "K"))
-    check("YCbCr", "RGB", "L", 3, ("Y", "Cb", "Cr"))

Tests/test_image_quantize.py

@@ -1,27 +0,0 @@
-from tester import *
-
-from PIL import Image
-
-def test_sanity():
-
-    im = lena()
-
-    im = im.quantize()
-    assert_image(im, "P", im.size)
-
-    im = lena()
-    im = im.quantize(palette=lena("P"))
-    assert_image(im, "P", im.size)
-
-def test_octree_quantize():
-    im = lena()
-
-    im = im.quantize(100, Image.FASTOCTREE)
-    assert_image(im, "P", im.size)
-
-    assert len(im.getcolors()) == 100
-
-def test_rgba_quantize():
-    im = lena('RGBA')
-    assert_no_exception(lambda: im.quantize())
-    assert_exception(Exception, lambda: im.quantize(method=0))

test/test_file_xbm.py

@@ -1,4 +1,4 @@
-from tester import *
+from helper import unittest, PillowTestCase
 
 from PIL import Image
 
@@ -25,10 +25,20 @@ static char basic_bits[] = {
 };
 """
 
-def test_pil151():
 
-    im = Image.open(BytesIO(PIL151))
+class TestFileXbm(PillowTestCase):
 
-    assert_no_exception(lambda: im.load())
-    assert_equal(im.mode, '1')
-    assert_equal(im.size, (32, 32))
+    def test_pil151(self):
+        from io import BytesIO
+
+        im = Image.open(BytesIO(PIL151))
+
+        im.load()
+        self.assertEqual(im.mode, '1')
+        self.assertEqual(im.size, (32, 32))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file

test/test_image_getpalette.py

@@ -0,0 +1,26 @@
+from helper import unittest, PillowTestCase, lena
+
+
+class TestImageGetPalette(PillowTestCase):
+
+    def test_palette(self):
+        def palette(mode):
+            p = lena(mode).getpalette()
+            if p:
+                return p[:10]
+            return None
+        self.assertEqual(palette("1"), None)
+        self.assertEqual(palette("L"), None)
+        self.assertEqual(palette("I"), None)
+        self.assertEqual(palette("F"), None)
+        self.assertEqual(palette("P"), [0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+        self.assertEqual(palette("RGB"), None)
+        self.assertEqual(palette("RGBA"), None)
+        self.assertEqual(palette("CMYK"), None)
+        self.assertEqual(palette("YCbCr"), None)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file

test/test_image_mode.py

@@ -0,0 +1,36 @@
+from helper import unittest, PillowTestCase, lena
+
+from PIL import Image
+
+
+class TestImage(PillowTestCase):
+
+    def test_sanity(self):
+
+        im = lena()
+        im.mode
+
+    def test_properties(self):
+        def check(mode, *result):
+            signature = (
+                Image.getmodebase(mode), Image.getmodetype(mode),
+                Image.getmodebands(mode), Image.getmodebandnames(mode),
+                )
+            self.assertEqual(signature, result)
+        check("1", "L", "L", 1, ("1",))
+        check("L", "L", "L", 1, ("L",))
+        check("P", "RGB", "L", 1, ("P",))
+        check("I", "L", "I", 1, ("I",))
+        check("F", "L", "F", 1, ("F",))
+        check("RGB", "RGB", "L", 3, ("R", "G", "B"))
+        check("RGBA", "RGB", "L", 4, ("R", "G", "B", "A"))
+        check("RGBX", "RGB", "L", 4, ("R", "G", "B", "X"))
+        check("RGBX", "RGB", "L", 4, ("R", "G", "B", "X"))
+        check("CMYK", "RGB", "L", 4, ("C", "M", "Y", "K"))
+        check("YCbCr", "RGB", "L", 3, ("Y", "Cb", "Cr"))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file

test/test_image_quantize.py

@@ -0,0 +1,35 @@
+from helper import unittest, PillowTestCase, lena
+
+from PIL import Image
+
+
+class TestImage(PillowTestCase):
+
+    def test_sanity(self):
+        im = lena()
+
+        im = im.quantize()
+        self.assert_image(im, "P", im.size)
+
+        im = lena()
+        im = im.quantize(palette=lena("P"))
+        self.assert_image(im, "P", im.size)
+
+    def test_octree_quantize(self):
+        im = lena()
+
+        im = im.quantize(100, Image.FASTOCTREE)
+        self.assert_image(im, "P", im.size)
+
+        assert len(im.getcolors()) == 100
+
+    def test_rgba_quantize(self):
+        im = lena('RGBA')
+        im.quantize()
+        self.assertRaises(Exception, lambda: im.quantize(method=0))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file

test/test_imagewin.py

@@ -8,7 +8,7 @@ class TestImage(PillowTestCase):
 
     def test_sanity(self):
         dir(Image)
-        dir(ImageShow)
+        dir(ImageWin)
         pass