From 4160a67a42829d4c8322a108f4bf6d5ec77b7954 Mon Sep 17 00:00:00 2001 From: Kevin Murray Date: Mon, 30 Jun 2014 19:35:35 +1000 Subject: [PATCH] [skimage.io.tests] add truncated jpg imread tests --- skimage/io/tests/test_imread.py | 5 +++++ skimage/io/tests/test_pil.py | 4 ++++ skimage/io/tests/test_simpleitk.py | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/skimage/io/tests/test_imread.py b/skimage/io/tests/test_imread.py index afb9eac9..206b800d 100644 --- a/skimage/io/tests/test_imread.py +++ b/skimage/io/tests/test_imread.py @@ -37,6 +37,11 @@ def test_imread_palette(): img = imread(os.path.join(data_dir, 'palette_color.png')) assert img.ndim == 3 +@skipif(not imread_available) +def test_imread_truncated_jpg(): + assert_raises((RuntimeError, ValueError), + sio.imread, + os.path.join(si.data_dir, 'truncated.jpg')) @skipif(not imread_available) def test_bilevel(): diff --git a/skimage/io/tests/test_pil.py b/skimage/io/tests/test_pil.py index 243d2fd1..89147fd6 100644 --- a/skimage/io/tests/test_pil.py +++ b/skimage/io/tests/test_pil.py @@ -95,6 +95,10 @@ def test_repr_png(): assert np.all(original_img == round_trip) +@skipif(not PIL_available) +def test_imread_truncated_jpg(): + assert_raises((IOError, ValueError), imread, + os.path.join(data_dir, 'truncated.jpg')) # Big endian images not correctly loaded for PIL < 1.1.7 # Renable test when PIL 1.1.7 is more common. diff --git a/skimage/io/tests/test_simpleitk.py b/skimage/io/tests/test_simpleitk.py index bf3d3614..89f7416f 100644 --- a/skimage/io/tests/test_simpleitk.py +++ b/skimage/io/tests/test_simpleitk.py @@ -51,6 +51,12 @@ def test_bilevel(): np.testing.assert_array_equal(img, expected) +@skipif(not sitk_available) +def test_imread_truncated_jpg(): + assert_raises((RuntimeError, ValueError), + sio.imread, + os.path.join(si.data_dir, 'truncated.jpg')) + @skipif(not sitk_available) def test_imread_uint16(): expected = np.load(os.path.join(data_dir, 'chessboard_GRAY_U8.npy'))