From 8575a46f4201c32fe6e5a58e412e3c5dedf1e752 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Wed, 23 May 2012 00:55:28 -0700 Subject: [PATCH] Verify dtype --- skimage/util/tests/test_dtype.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/skimage/util/tests/test_dtype.py b/skimage/util/tests/test_dtype.py index e42030b0..9597c784 100644 --- a/skimage/util/tests/test_dtype.py +++ b/skimage/util/tests/test_dtype.py @@ -12,9 +12,10 @@ dtype_range = {np.uint8: (0, 255), np.float32: (-1.0, 1.0), np.float64: (-1.0, 1.0)} -def _verify_range(msg, x, vmin, vmax): +def _verify_range(msg, x, vmin, vmax, dtype): assert_equal(x[0], vmin) assert_equal(x[-1], vmax) + assert x.dtype == dtype def test_range(): for dtype in dtype_range: @@ -33,9 +34,9 @@ def test_range(): omin = 0 imin = 0 - yield _verify_range, \ - "From %s to %s" % (np.dtype(dtype), np.dtype(dt)), \ - y, omin, omax + yield (_verify_range, + "From %s to %s" % (np.dtype(dtype), np.dtype(dt)), + y, omin, omax, np.dtype(dt)) def test_range_extra_dtypes(): @@ -58,9 +59,9 @@ def test_range_extra_dtypes(): x = np.linspace(imin, imax, 10).astype(dtype_in) y = convert(x, dt) omin, omax = dtype_range_extra[dt] - yield _verify_range, \ - "From %s to %s" % (np.dtype(dtype_in), np.dtype(dt)), \ - y, omin, omax + yield (_verify_range, + "From %s to %s" % (np.dtype(dtype_in), np.dtype(dt)), + y, omin, omax, np.dtype(dt)) def test_unsupported_dtype():