diff options
Diffstat (limited to 'numpy/lib/tests/test_index_tricks.py')
| -rw-r--r-- | numpy/lib/tests/test_index_tricks.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py index a0105656b..51d8e59db 100644 --- a/numpy/lib/tests/test_index_tricks.py +++ b/numpy/lib/tests/test_index_tricks.py @@ -3,8 +3,8 @@ set_package_path() from numpy import array, ones, r_, mgrid restore_path() -class TestGrid(NumpyTestCase): - def check_basic(self): +class TestGrid(TestCase): + def test_basic(self): a = mgrid[-1:1:10j] b = mgrid[-1:1:0.1] assert(a.shape == (10,)) @@ -16,7 +16,7 @@ class TestGrid(NumpyTestCase): assert_almost_equal(b[-1],b[0]+19*0.1,11) assert_almost_equal(a[1]-a[0],2.0/9.0,11) - def check_nd(self): + def test_nd(self): c = mgrid[-1:1:10j,-2:2:10j] d = mgrid[-1:1:0.1,-2:2:0.2] assert(c.shape == (2,10,10)) @@ -28,22 +28,22 @@ class TestGrid(NumpyTestCase): assert_array_almost_equal(d[0,1,:]-d[0,0,:], 0.1*ones(20,'d'),11) assert_array_almost_equal(d[1,:,1]-d[1,:,0], 0.2*ones(20,'d'),11) -class TestConcatenator(NumpyTestCase): - def check_1d(self): +class TestConcatenator(TestCase): + def test_1d(self): assert_array_equal(r_[1,2,3,4,5,6],array([1,2,3,4,5,6])) b = ones(5) c = r_[b,0,0,b] assert_array_equal(c,[1,1,1,1,1,0,0,1,1,1,1,1]) - def check_mixed_type(self): + def test_mixed_type(self): g = r_[10.1, 1:10] assert(g.dtype == 'f8') - def check_more_mixed_type(self): + def test_more_mixed_type(self): g = r_[-10.1, array([1]), array([2,3,4]), 10.0] assert(g.dtype == 'f8') - def check_2d(self): + def test_2d(self): b = rand(5,5) c = rand(5,5) d = r_['1',b,c] # append columns @@ -55,5 +55,6 @@ class TestConcatenator(NumpyTestCase): assert_array_equal(d[:5,:],b) assert_array_equal(d[5:,:],c) + if __name__ == "__main__": - NumpyTest().run() + nose.run(argv=['', __file__]) |