[Scipy-svn] r6788 - trunk/scipy/fftpack/tests
scipy-svn at scipy.org
scipy-svn at scipy.org
Sun Sep 12 17:16:34 EDT 2010
Author: warren.weckesser
Date: 2010-09-12 16:16:34 -0500 (Sun, 12 Sep 2010)
New Revision: 6788
Modified:
trunk/scipy/fftpack/tests/test_basic.py
Log:
TST: fftpack: Don't use 'import *'. Don't use plain 'assert'. Simplify a test by using 'assert_raises'.
Modified: trunk/scipy/fftpack/tests/test_basic.py
===================================================================
--- trunk/scipy/fftpack/tests/test_basic.py 2010-09-12 21:14:36 UTC (rev 6787)
+++ trunk/scipy/fftpack/tests/test_basic.py 2010-09-12 21:16:34 UTC (rev 6788)
@@ -11,7 +11,8 @@
python tests/test_basic.py
"""
-from numpy.testing import *
+from numpy.testing import assert_, assert_equal, assert_array_almost_equal, \
+ assert_array_almost_equal_nulp, assert_raises, run_module_suite, TestCase
from scipy.fftpack import ifft,fft,fftn,ifftn,rfft,irfft, fft2
from scipy.fftpack import _fftpack as fftpack
@@ -492,16 +493,11 @@
assert_array_almost_equal(y, numpy.fft.fftn(x, axes=(-3, -2), s=(8, 8)))
def test_shape_argument_more(self):
- # Test that fftn raise a value error exception when s.shape is longer
- # than x.shape
+ """Test that fftn raises ValueError when s.shape is longer than x.shape"""
x = zeros((4, 4, 2))
- try:
- fx = fftn(x, shape = (8, 8, 2, 1))
- raise AssertionError("s.shape longer than x.shape succeded, "\
- "but should not have.")
- except ValueError:
- pass
+ assert_raises(ValueError, fftn, x, shape=(8, 8, 2, 1))
+
class _TestIfftn(TestCase):
dtype = None
cdtype = None
@@ -512,7 +508,7 @@
def test_definition(self):
x = np.array([[1,2,3],[4,5,6],[7,8,9]], dtype=self.dtype)
y = ifftn(x)
- assert y.dtype == self.cdtype
+ assert_(y.dtype == self.cdtype)
assert_array_almost_equal_nulp(y,direct_idftn(x),self.maxnlp)
x = random((20,26))
assert_array_almost_equal_nulp(ifftn(x),direct_idftn(x),self.maxnlp)
More information about the Scipy-svn
mailing list