From 168410f42422af647f41c6f5422fd6ae18381621 Mon Sep 17 00:00:00 2001
From: Jeremy Metz <metz.jp@gmail.com>
Date: Sat, 14 May 2016 14:52:07 +0100
Subject: [PATCH] Added additional 3d analogs of clear_border tests

---
 .../segmentation/tests/test_clear_border.py   | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/skimage/segmentation/tests/test_clear_border.py b/skimage/segmentation/tests/test_clear_border.py
index c300d186..4ee297eb 100644
--- a/skimage/segmentation/tests/test_clear_border.py
+++ b/skimage/segmentation/tests/test_clear_border.py
@@ -74,6 +74,42 @@ def test_clear_border_non_binary():
     assert_(not np.all(image == result))
 
 
+def test_clear_border_non_binary_3d():
+    image3d = np.array(
+        [[[1, 2, 3, 1, 2],
+        [3, 3, 3, 4, 2],
+        [3, 4, 3, 4, 2],
+        [3, 3, 2, 1, 2]],
+        [[1, 2, 3, 1, 2],
+        [3, 3, 5, 4, 2],
+        [3, 4, 5, 4, 2],
+        [3, 3, 2, 1, 2]],
+        [[1, 2, 3, 1, 2],
+        [3, 3, 3, 4, 2],
+        [3, 4, 3, 4, 2],
+        [3, 3, 2, 1, 2]],
+        )
+
+    result = clear_border(image3d)
+    expected = np.array(
+        [[[0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0]],
+        [[0, 0, 0, 0, 0],
+        [0, 0, 5, 0, 0],
+        [0, 0, 5, 0, 0],
+        [0, 0, 0, 0, 0]],
+        [[0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0]],
+        )
+
+    assert_array_equal(result, expected)
+    assert_(not np.all(image3d == result))
+
+
 def test_clear_border_non_binary_inplace():
     image = np.array([[1, 2, 3, 1, 2],
                       [3, 3, 5, 4, 2],
@@ -89,5 +125,41 @@ def test_clear_border_non_binary_inplace():
     assert_array_equal(result, expected)
     assert_array_equal(image, result)
 
+
+def test_clear_border_non_binary_inplace_3d():
+    image3d = np.array(
+        [[[1, 2, 3, 1, 2],
+        [3, 3, 3, 4, 2],
+        [3, 4, 3, 4, 2],
+        [3, 3, 2, 1, 2]],
+        [[1, 2, 3, 1, 2],
+        [3, 3, 5, 4, 2],
+        [3, 4, 5, 4, 2],
+        [3, 3, 2, 1, 2]],
+        [[1, 2, 3, 1, 2],
+        [3, 3, 3, 4, 2],
+        [3, 4, 3, 4, 2],
+        [3, 3, 2, 1, 2]],
+        )
+
+    result = clear_border(image3d, in_place=True)
+    expected = np.array(
+        [[[0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0]],
+        [[0, 0, 0, 0, 0],
+        [0, 0, 5, 0, 0],
+        [0, 0, 5, 0, 0],
+        [0, 0, 0, 0, 0]],
+        [[0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0]],
+        )
+
+    assert_array_equal(result, expected)
+    assert_array_equal(image3d, result)
+
 if __name__ == "__main__":
     np.testing.run_module_suite()