From 0856dad9889d76768e8b2d452af88db9259cc5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <hannesschoenberger@gmail.com>
Date: Tue, 9 Oct 2012 11:19:27 +0200
Subject: [PATCH] Split 3d resize test function

---
 skimage/transform/_warps.py           |  3 +++
 skimage/transform/tests/test_warps.py | 26 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py
index bde13f3d..6689430b 100644
--- a/skimage/transform/_warps.py
+++ b/skimage/transform/_warps.py
@@ -348,3 +348,6 @@ def homography(image, H, output_shape=None, order=1,
     tform = ProjectiveTransform(H)
     return warp(image, inverse_map=tform.inverse, output_shape=output_shape,
                 order=order, mode=mode, cval=cval)
+
+    return warp(image, inverse_map=tform.inverse, output_shape=output_shape,
+                order=order, mode=mode, cval=cval)
diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py
index e40d2bf0..1993f932 100644
--- a/skimage/transform/tests/test_warps.py
+++ b/skimage/transform/tests/test_warps.py
@@ -85,16 +85,7 @@ def test_rotate():
     assert_array_almost_equal(x90, np.rot90(x))
 
 
-def test_resize2d():
-    x = np.zeros((5, 5), dtype=np.double)
-    x[1, 1] = 1
-    resized = resize(x, (10, 10), order=0)
-    ref = np.zeros((10, 10))
-    ref[2:4, 2:4] = 1
-    assert_array_almost_equal(resized, ref)
-
-
-def test_scale():
+def test_rescale():
     # same scale factor
     x = np.zeros((5, 5), dtype=np.double)
     x[1, 1] = 1
@@ -112,7 +103,16 @@ def test_scale():
     assert_array_almost_equal(scaled, ref)
 
 
-def test_resize3d():
+def test_resize2d():
+    x = np.zeros((5, 5), dtype=np.double)
+    x[1, 1] = 1
+    resized = resize(x, (10, 10), order=0)
+    ref = np.zeros((10, 10))
+    ref[2:4, 2:4] = 1
+    assert_array_almost_equal(resized, ref)
+
+
+def test_resize3d_keep():
     # keep 3rd dimension
     x = np.zeros((5, 5, 3), dtype=np.double)
     x[1, 1, :] = 1
@@ -123,6 +123,8 @@ def test_resize3d():
     resized = resize(x, (10, 10, 3), order=0)
     assert_array_almost_equal(resized, ref)
 
+
+def test_resize3d_resize():
     # resize 3rd dimension
     x = np.zeros((5, 5, 3), dtype=np.double)
     x[1, 1, :] = 1
@@ -131,6 +133,8 @@ def test_resize3d():
     ref[2:4, 2:4] = 1
     assert_array_almost_equal(resized, ref)
 
+
+def test_resize3d_bilinear():
     # bilinear 3rd dimension
     x = np.zeros((5, 5, 2), dtype=np.double)
     x[1, 1, 0] = 0