ENH: Minor clean ups of data loader.

scikits/image/data/tests/test_data.py

@@ -1,22 +1,23 @@
-import unittest
-
 import scikits.image.data as data
+from numpy.testing import assert_equal, assert_array_equal
+import numpy as np
 
-class TestData(unittest.TestCase):
-    def test_lena(self):
-        """ Test that "Lena" image can be loaded. """
-        data.lena()
+def test_lena():
+    """ Test that "Lena" image can be loaded. """
+    lena = data.lena()
+    assert_equal(lena.shape, (512, 512, 3))
 
-    def test_camera(self):
-        """ Test that "camera" image can be loaded. """
-        data.camera()
+def test_camera():
+    """ Test that "camera" image can be loaded. """
+    cameraman = data.camera()
+    assert_equal(cameraman.ndim, 2)
 
-    def test_checkerboard(self):
-        """ Test that checkerboard image can be loaded. """
-        data.checkerboard()
-
-    def test_checkerboard_gray(self):
-        """ Test that checkerboard grayscale image can be loaded. """
-        data.checkerboard_gray()
+def test_checkerboard():
+    """ Test that checkerboard image can be loaded. """
+    checkerboard = data.checkerboard()
+    assert_equal(checkerboard.dtype, np.uint8)
 
+if __name__ == "__main__":
+    from numpy.testing import run_module_suite
+    run_module_suite()