From 125d53ba521fc780c164123cd831586dd08fefda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jsch@demuc.de>
Date: Mon, 15 Dec 2014 09:50:10 +0100
Subject: [PATCH] Add test cases for invalid block sizes

---
 skimage/measure/tests/test_block.py | 31 ++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/skimage/measure/tests/test_block.py b/skimage/measure/tests/test_block.py
index a8bc62a9..d8d93a96 100644
--- a/skimage/measure/tests/test_block.py
+++ b/skimage/measure/tests/test_block.py
@@ -1,5 +1,5 @@
 import numpy as np
-from numpy.testing import assert_array_equal
+from numpy.testing import assert_equal, assert_raises
 from skimage.measure import block_reduce
 
 
@@ -8,13 +8,13 @@ def test_block_reduce_sum():
     out1 = block_reduce(image1, (2, 3))
     expected1 = np.array([[ 24,  42],
                           [ 96, 114]])
-    assert_array_equal(expected1, out1)
+    assert_equal(expected1, out1)
 
     image2 = np.arange(5 * 8).reshape(5, 8)
     out2 = block_reduce(image2, (3, 3))
     expected2 = np.array([[ 81, 108,  87],
                           [174, 192, 138]])
-    assert_array_equal(expected2, out2)
+    assert_equal(expected2, out2)
 
 
 def test_block_reduce_mean():
@@ -22,13 +22,13 @@ def test_block_reduce_mean():
     out1 = block_reduce(image1, (2, 3), func=np.mean)
     expected1 = np.array([[  4.,   7.],
                           [ 16.,  19.]])
-    assert_array_equal(expected1, out1)
+    assert_equal(expected1, out1)
 
     image2 = np.arange(5 * 8).reshape(5, 8)
     out2 = block_reduce(image2, (4, 5), func=np.mean)
     expected2 = np.array([[14. , 10.8],
                           [ 8.5,  5.7]])
-    assert_array_equal(expected2, out2)
+    assert_equal(expected2, out2)
 
 
 def test_block_reduce_median():
@@ -36,17 +36,17 @@ def test_block_reduce_median():
     out1 = block_reduce(image1, (2, 3), func=np.median)
     expected1 = np.array([[  4.,   7.],
                           [ 16.,  19.]])
-    assert_array_equal(expected1, out1)
+    assert_equal(expected1, out1)
 
     image2 = np.arange(5 * 8).reshape(5, 8)
     out2 = block_reduce(image2, (4, 5), func=np.median)
     expected2 = np.array([[ 14.,  17.],
                           [  0.,   0.]])
-    assert_array_equal(expected2, out2)
+    assert_equal(expected2, out2)
 
     image3 = np.array([[1, 5, 5, 5], [5, 5, 5, 1000]])
     out3 = block_reduce(image3, (2, 4), func=np.median)
-    assert_array_equal(5, out3)
+    assert_equal(5, out3)
 
 
 def test_block_reduce_min():
@@ -54,13 +54,13 @@ def test_block_reduce_min():
     out1 = block_reduce(image1, (2, 3), func=np.min)
     expected1 = np.array([[ 0, 3],
                           [12, 15]])
-    assert_array_equal(expected1, out1)
+    assert_equal(expected1, out1)
 
     image2 = np.arange(5 * 8).reshape(5, 8)
     out2 = block_reduce(image2, (4, 5), func=np.min)
     expected2 = np.array([[0, 0],
                           [0, 0]])
-    assert_array_equal(expected2, out2)
+    assert_equal(expected2, out2)
 
 
 def test_block_reduce_max():
@@ -68,13 +68,20 @@ def test_block_reduce_max():
     out1 = block_reduce(image1, (2, 3), func=np.max)
     expected1 = np.array([[ 8, 11],
                           [20, 23]])
-    assert_array_equal(expected1, out1)
+    assert_equal(expected1, out1)
 
     image2 = np.arange(5 * 8).reshape(5, 8)
     out2 = block_reduce(image2, (4, 5), func=np.max)
     expected2 = np.array([[28, 31],
                           [36, 39]])
-    assert_array_equal(expected2, out2)
+    assert_equal(expected2, out2)
+
+
+def test_invalid_block_size():
+    image = np.arange(4 * 6).reshape(4, 6)
+
+    assert_raises(ValueError, block_reduce, image, [1, 2, 3])
+    assert_raises(ValueError, block_reduce, image, [1, 0.5])
 
 
 if __name__ == "__main__":