From 895b025a3a875b49ab183c5f43dd7f5364d8faed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jsch@demuc.de>
Date: Thu, 3 Oct 2013 08:39:19 +0200
Subject: [PATCH] Split grey and binary erosion tests in two files

---
 skimage/morphology/tests/test_binary.py | 49 +++++++++++++++++++++++++
 skimage/morphology/tests/test_grey.py   | 37 +------------------
 2 files changed, 50 insertions(+), 36 deletions(-)
 create mode 100644 skimage/morphology/tests/test_binary.py

diff --git a/skimage/morphology/tests/test_binary.py b/skimage/morphology/tests/test_binary.py
new file mode 100644
index 00000000..2f47c917
--- /dev/null
+++ b/skimage/morphology/tests/test_binary.py
@@ -0,0 +1,49 @@
+import numpy as np
+from numpy import testing
+
+from skimage import data, color
+from skimage.util import img_as_bool
+from skimage.morphology import binary, grey, selem
+
+
+lena = color.rgb2gray(data.lena())
+bw_lena = lena > 100
+
+
+def test_non_square_image():
+    strel = selem.square(3)
+    binary_res = binary.binary_erosion(bw_lena[:100, :200], strel)
+    grey_res = img_as_bool(grey.erosion(bw_lena[:100, :200], strel))
+    testing.assert_array_equal(binary_res, grey_res)
+
+
+def test_binary_erosion():
+    strel = selem.square(3)
+    binary_res = binary.binary_erosion(bw_lena, strel)
+    grey_res = img_as_bool(grey.erosion(bw_lena, strel))
+    testing.assert_array_equal(binary_res, grey_res)
+
+
+def test_binary_dilation():
+    strel = selem.square(3)
+    binary_res = binary.binary_dilation(bw_lena, strel)
+    grey_res = img_as_bool(grey.dilation(bw_lena, strel))
+    testing.assert_array_equal(binary_res, grey_res)
+
+
+def test_binary_closing():
+    strel = selem.square(3)
+    binary_res = binary.binary_closing(bw_lena, strel)
+    grey_res = img_as_bool(grey.closing(bw_lena, strel))
+    testing.assert_array_equal(binary_res, grey_res)
+
+
+def test_binary_opening():
+    strel = selem.square(3)
+    binary_res = binary.binary_opening(bw_lena, strel)
+    grey_res = img_as_bool(grey.opening(bw_lena, strel))
+    testing.assert_array_equal(binary_res, grey_res)
+
+
+if __name__ == '__main__':
+    testing.run_module_suite()
diff --git a/skimage/morphology/tests/test_grey.py b/skimage/morphology/tests/test_grey.py
index 244ec566..e2a3928d 100644
--- a/skimage/morphology/tests/test_grey.py
+++ b/skimage/morphology/tests/test_grey.py
@@ -6,7 +6,7 @@ from numpy import testing
 import skimage
 from skimage import data_dir
 from skimage.util import img_as_bool
-from skimage.morphology import binary, grey, selem
+from skimage.morphology import grey, selem
 
 
 lena = np.load(os.path.join(data_dir, 'lena_GRAY_U8.npy'))
@@ -155,40 +155,5 @@ class TestDTypes():
         self._test_image(image)
 
 
-def test_non_square_image():
-    strel = selem.square(3)
-    binary_res = binary.binary_erosion(bw_lena[:100, :200], strel)
-    grey_res = img_as_bool(grey.erosion(bw_lena[:100, :200], strel))
-    testing.assert_array_equal(binary_res, grey_res)
-
-
-def test_binary_erosion():
-    strel = selem.square(3)
-    binary_res = binary.binary_erosion(bw_lena, strel)
-    grey_res = img_as_bool(grey.erosion(bw_lena, strel))
-    testing.assert_array_equal(binary_res, grey_res)
-
-
-def test_binary_dilation():
-    strel = selem.square(3)
-    binary_res = binary.binary_dilation(bw_lena, strel)
-    grey_res = img_as_bool(grey.dilation(bw_lena, strel))
-    testing.assert_array_equal(binary_res, grey_res)
-
-
-def test_binary_closing():
-    strel = selem.square(3)
-    binary_res = binary.binary_closing(bw_lena, strel)
-    grey_res = img_as_bool(grey.closing(bw_lena, strel))
-    testing.assert_array_equal(binary_res, grey_res)
-
-
-def test_binary_opening():
-    strel = selem.square(3)
-    binary_res = binary.binary_opening(bw_lena, strel)
-    grey_res = img_as_bool(grey.opening(bw_lena, strel))
-    testing.assert_array_equal(binary_res, grey_res)
-
-
 if __name__ == '__main__':
     testing.run_module_suite()