From 488866cfe51397b6afd811de4c7c3d171fa26e41 Mon Sep 17 00:00:00 2001
From: Jeremy Metz <metz.jp@gmail.com>
Date: Wed, 24 Feb 2016 02:06:09 +0000
Subject: [PATCH] Added additional tests of exclude_border values

---
 skimage/feature/tests/test_peak.py | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/skimage/feature/tests/test_peak.py b/skimage/feature/tests/test_peak.py
index 6b94daf5..e0bc87e5 100644
--- a/skimage/feature/tests/test_peak.py
+++ b/skimage/feature/tests/test_peak.py
@@ -145,9 +145,34 @@ def test_ndarray_exclude_border():
     nd_image[2,2,2] = 1
     expected = np.zeros_like(nd_image, dtype=np.bool)
     expected[2,2,2] = True
+    expectedNoBorder = nd_image > 0
     result = peak.peak_local_max(nd_image, min_distance=2,
         exclude_border=2, indices=False)
-    assert (result == expected).all()
+    assert_equal(result, expected)
+    # Check that bools work as expected
+    assert_equal(
+        peak.peak_local_max(nd_image, min_distance=2,
+            exclude_border=2, indices=False)
+        peak.peak_local_max(nd_image, min_distance=2,
+            exclude_border=True, indices=False)
+        )
+    assert_equal(
+        peak.peak_local_max(nd_image, min_distance=2,
+            exclude_border=0, indices=False)
+        peak.peak_local_max(nd_image, min_distance=2,
+            exclude_border=False, indices=False)
+        )
+    # Check both versions with  no border
+    assert_equal(
+        peak.peak_local_max(nd_image, min_distance=2,
+            exclude_border=0, indices=False)
+        expectedNoBorder,
+        )
+    assert_equal(
+        peak.peak_local_max(nd_image,
+            exclude_border=False, indices=False)
+        expectedNoBorder,
+        )
 
 
 def test_empty():