diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/f2py/tests/test_array_from_pyobj.py | 195 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_assumed_shape.py | 7 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_callback.py | 22 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_kind.py | 8 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_mixed.py | 6 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_character.py | 22 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_complex.py | 46 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_integer.py | 34 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_logical.py | 76 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_real.py | 40 |
10 files changed, 229 insertions, 227 deletions
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py index 3b11a5b14..488fd4db5 100644 --- a/numpy/f2py/tests/test_array_from_pyobj.py +++ b/numpy/f2py/tests/test_array_from_pyobj.py @@ -47,7 +47,7 @@ def flags2names(flags): 'UPDATEIFCOPY','BEHAVED','BEHAVED_RO', 'CARRAY','FARRAY' ]: - if abs(flags) & getattr(wrap,flagname): + if abs(flags) & getattr(wrap,flagname, 0): info.append(flagname) return info @@ -177,19 +177,21 @@ class Array: # arr.dtypechar may be different from typ.dtypechar self.arr = wrap.call(typ.type_num,dims,intent.flags,obj) + assert_(isinstance(self.arr, ndarray),`type(self.arr)`) + self.arr_attr = wrap.array_attrs(self.arr) if len(dims)>1: if self.intent.is_intent('c'): - assert intent.flags & wrap.F2PY_INTENT_C - assert not self.arr.flags['FORTRAN'],`self.arr.flags,obj.flags` - assert self.arr.flags['CONTIGUOUS'] - assert not self.arr_attr[6] & wrap.FORTRAN + assert_(intent.flags & wrap.F2PY_INTENT_C) + assert_(not self.arr.flags['FORTRAN'],`self.arr.flags,getattr(obj,'flags',None)`) + assert_(self.arr.flags['CONTIGUOUS']) + assert_(not self.arr_attr[6] & wrap.FORTRAN) else: - assert not intent.flags & wrap.F2PY_INTENT_C - assert self.arr.flags['FORTRAN'] - assert not self.arr.flags['CONTIGUOUS'] - assert self.arr_attr[6] & wrap.FORTRAN + assert_(not intent.flags & wrap.F2PY_INTENT_C) + assert_(self.arr.flags['FORTRAN']) + assert_(not self.arr.flags['CONTIGUOUS']) + assert_(self.arr_attr[6] & wrap.FORTRAN) if obj is None: self.pyarr = None @@ -197,50 +199,50 @@ class Array: return if intent.is_intent('cache'): - assert isinstance(obj,ndarray),`type(obj)` + assert_(isinstance(obj,ndarray),`type(obj)`) self.pyarr = array(obj).reshape(*dims).copy() else: self.pyarr = array(array(obj, dtype = typ.dtypechar).reshape(*dims), order=self.intent.is_intent('c') and 'C' or 'F') - assert self.pyarr.dtype == typ, \ - `self.pyarr.dtype,typ` - assert self.pyarr.flags['OWNDATA'], (obj, intent) + assert_(self.pyarr.dtype == typ, \ + `self.pyarr.dtype,typ`) + assert_(self.pyarr.flags['OWNDATA'], (obj, intent)) self.pyarr_attr = wrap.array_attrs(self.pyarr) if len(dims)>1: if self.intent.is_intent('c'): - assert not self.pyarr.flags['FORTRAN'] - assert self.pyarr.flags['CONTIGUOUS'] - assert not self.pyarr_attr[6] & wrap.FORTRAN + assert_(not self.pyarr.flags['FORTRAN']) + assert_(self.pyarr.flags['CONTIGUOUS']) + assert_(not self.pyarr_attr[6] & wrap.FORTRAN) else: - assert self.pyarr.flags['FORTRAN'] - assert not self.pyarr.flags['CONTIGUOUS'] - assert self.pyarr_attr[6] & wrap.FORTRAN + assert_(self.pyarr.flags['FORTRAN']) + assert_(not self.pyarr.flags['CONTIGUOUS']) + assert_(self.pyarr_attr[6] & wrap.FORTRAN) - assert self.arr_attr[1]==self.pyarr_attr[1] # nd - assert self.arr_attr[2]==self.pyarr_attr[2] # dimensions + assert_(self.arr_attr[1]==self.pyarr_attr[1]) # nd + assert_(self.arr_attr[2]==self.pyarr_attr[2]) # dimensions if self.arr_attr[1]<=1: - assert self.arr_attr[3]==self.pyarr_attr[3],\ - `self.arr_attr[3],self.pyarr_attr[3],self.arr.tostring(),self.pyarr.tostring()` # strides - assert self.arr_attr[5][-2:]==self.pyarr_attr[5][-2:],\ - `self.arr_attr[5],self.pyarr_attr[5]` # descr - assert self.arr_attr[6]==self.pyarr_attr[6],\ - `self.arr_attr[6],self.pyarr_attr[6],flags2names(0*self.arr_attr[6]-self.pyarr_attr[6]),flags2names(self.arr_attr[6]),intent` # flags + assert_(self.arr_attr[3]==self.pyarr_attr[3],\ + `self.arr_attr[3],self.pyarr_attr[3],self.arr.tostring(),self.pyarr.tostring()`) # strides + assert_(self.arr_attr[5][-2:]==self.pyarr_attr[5][-2:],\ + `self.arr_attr[5],self.pyarr_attr[5]`) # descr + assert_(self.arr_attr[6]==self.pyarr_attr[6],\ + `self.arr_attr[6],self.pyarr_attr[6],flags2names(0*self.arr_attr[6]-self.pyarr_attr[6]),flags2names(self.arr_attr[6]),intent`) # flags if intent.is_intent('cache'): - assert self.arr_attr[5][3]>=self.type.elsize,\ - `self.arr_attr[5][3],self.type.elsize` + assert_(self.arr_attr[5][3]>=self.type.elsize,\ + `self.arr_attr[5][3],self.type.elsize`) else: - assert self.arr_attr[5][3]==self.type.elsize,\ - `self.arr_attr[5][3],self.type.elsize` - assert self.arr_equal(self.pyarr,self.arr) + assert_(self.arr_attr[5][3]==self.type.elsize,\ + `self.arr_attr[5][3],self.type.elsize`) + assert_(self.arr_equal(self.pyarr,self.arr)) if isinstance(self.obj,ndarray): if typ.elsize==Type(obj.dtype).elsize: if not intent.is_intent('copy') and self.arr_attr[1]<=1: - assert self.has_shared_memory() + assert_(self.has_shared_memory()) def arr_equal(self,arr1,arr2): if arr1.shape != arr2.shape: @@ -266,32 +268,32 @@ class Array: class test_intent(unittest.TestCase): def test_in_out(self): assert_equal(str(intent.in_.out),'intent(in,out)') - assert intent.in_.c.is_intent('c') - assert not intent.in_.c.is_intent_exact('c') - assert intent.in_.c.is_intent_exact('c','in') - assert intent.in_.c.is_intent_exact('in','c') - assert not intent.in_.is_intent('c') + assert_(intent.in_.c.is_intent('c')) + assert_(not intent.in_.c.is_intent_exact('c')) + assert_(intent.in_.c.is_intent_exact('c','in')) + assert_(intent.in_.c.is_intent_exact('in','c')) + assert_(not intent.in_.is_intent('c')) class _test_shared_memory: num2seq = [1,2] num23seq = [[1,2,3],[4,5,6]] def test_in_from_2seq(self): a = self.array([2],intent.in_,self.num2seq) - assert not a.has_shared_memory() + assert_(not a.has_shared_memory()) def test_in_from_2casttype(self): for t in self.type.cast_types(): obj = array(self.num2seq,dtype=t.dtype) a = self.array([len(self.num2seq)],intent.in_,obj) if t.elsize==self.type.elsize: - assert a.has_shared_memory(),`self.type.dtype,t.dtype` + assert_(a.has_shared_memory(),`self.type.dtype,t.dtype`) else: - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_inout_2seq(self): obj = array(self.num2seq,dtype=self.type.dtype) a = self.array([len(self.num2seq)],intent.inout,obj) - assert a.has_shared_memory() + assert_(a.has_shared_memory()) try: a = self.array([2],intent.in_.inout,self.num2seq) @@ -305,7 +307,7 @@ class _test_shared_memory: obj = array(self.num23seq,dtype=self.type.dtype,order='F') shape = (len(self.num23seq),len(self.num23seq[0])) a = self.array(shape,intent.in_.inout,obj) - assert a.has_shared_memory() + assert_(a.has_shared_memory()) obj = array(self.num23seq,dtype=self.type.dtype,order='C') shape = (len(self.num23seq),len(self.num23seq[0])) @@ -321,25 +323,25 @@ class _test_shared_memory: obj = array(self.num23seq,dtype=self.type.dtype) shape = (len(self.num23seq),len(self.num23seq[0])) a = self.array(shape,intent.in_.c.inout,obj) - assert a.has_shared_memory() + assert_(a.has_shared_memory()) def test_in_copy_from_2casttype(self): for t in self.type.cast_types(): obj = array(self.num2seq,dtype=t.dtype) a = self.array([len(self.num2seq)],intent.in_.copy,obj) - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_c_in_from_23seq(self): a = self.array([len(self.num23seq),len(self.num23seq[0])], intent.in_,self.num23seq) - assert not a.has_shared_memory() + assert_(not a.has_shared_memory()) def test_in_from_23casttype(self): for t in self.type.cast_types(): obj = array(self.num23seq,dtype=t.dtype) a = self.array([len(self.num23seq),len(self.num23seq[0])], intent.in_,obj) - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_f_in_from_23casttype(self): for t in self.type.cast_types(): @@ -347,9 +349,9 @@ class _test_shared_memory: a = self.array([len(self.num23seq),len(self.num23seq[0])], intent.in_,obj) if t.elsize==self.type.elsize: - assert a.has_shared_memory(),`t.dtype` + assert_(a.has_shared_memory(),`t.dtype`) else: - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_c_in_from_23casttype(self): for t in self.type.cast_types(): @@ -357,23 +359,23 @@ class _test_shared_memory: a = self.array([len(self.num23seq),len(self.num23seq[0])], intent.in_.c,obj) if t.elsize==self.type.elsize: - assert a.has_shared_memory(),`t.dtype` + assert_(a.has_shared_memory(),`t.dtype`) else: - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_f_copy_in_from_23casttype(self): for t in self.type.cast_types(): obj = array(self.num23seq,dtype=t.dtype,order='F') a = self.array([len(self.num23seq),len(self.num23seq[0])], intent.in_.copy,obj) - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_c_copy_in_from_23casttype(self): for t in self.type.cast_types(): obj = array(self.num23seq,dtype=t.dtype) a = self.array([len(self.num23seq),len(self.num23seq[0])], intent.in_.c.copy,obj) - assert not a.has_shared_memory(),`t.dtype` + assert_(not a.has_shared_memory(),`t.dtype`) def test_in_cache_from_2casttype(self): for t in self.type.all_types(): @@ -382,17 +384,17 @@ class _test_shared_memory: obj = array(self.num2seq,dtype=t.dtype) shape = (len(self.num2seq),) a = self.array(shape,intent.in_.c.cache,obj) - assert a.has_shared_memory(),`t.dtype` + assert_(a.has_shared_memory(),`t.dtype`) a = self.array(shape,intent.in_.cache,obj) - assert a.has_shared_memory(),`t.dtype` + assert_(a.has_shared_memory(),`t.dtype`) obj = array(self.num2seq,dtype=t.dtype,order='F') a = self.array(shape,intent.in_.c.cache,obj) - assert a.has_shared_memory(),`t.dtype` + assert_(a.has_shared_memory(),`t.dtype`) a = self.array(shape,intent.in_.cache,obj) - assert a.has_shared_memory(),`t.dtype` + assert_(a.has_shared_memory(),`t.dtype`) try: a = self.array(shape,intent.in_.cache,obj[::-1]) @@ -418,11 +420,11 @@ class _test_shared_memory: def test_cache_hidden(self): shape = (2,) a = self.array(shape,intent.cache.hide,None) - assert a.arr.shape==shape + assert_(a.arr.shape==shape) shape = (2,3) a = self.array(shape,intent.cache.hide,None) - assert a.arr.shape==shape + assert_(a.arr.shape==shape) shape = (-1,3) try: @@ -436,20 +438,20 @@ class _test_shared_memory: def test_hidden(self): shape = (2,) a = self.array(shape,intent.hide,None) - assert a.arr.shape==shape - assert a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)) + assert_(a.arr.shape==shape) + assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype))) shape = (2,3) a = self.array(shape,intent.hide,None) - assert a.arr.shape==shape - assert a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)) - assert a.arr.flags['FORTRAN'] and not a.arr.flags['CONTIGUOUS'] + assert_(a.arr.shape==shape) + assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype))) + assert_(a.arr.flags['FORTRAN'] and not a.arr.flags['CONTIGUOUS']) shape = (2,3) a = self.array(shape,intent.c.hide,None) - assert a.arr.shape==shape - assert a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)) - assert not a.arr.flags['FORTRAN'] and a.arr.flags['CONTIGUOUS'] + assert_(a.arr.shape==shape) + assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype))) + assert_(not a.arr.flags['FORTRAN'] and a.arr.flags['CONTIGUOUS']) shape = (-1,3) try: @@ -463,68 +465,68 @@ class _test_shared_memory: def test_optional_none(self): shape = (2,) a = self.array(shape,intent.optional,None) - assert a.arr.shape==shape - assert a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)) + assert_(a.arr.shape==shape) + assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype))) shape = (2,3) a = self.array(shape,intent.optional,None) - assert a.arr.shape==shape - assert a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)) - assert a.arr.flags['FORTRAN'] and not a.arr.flags['CONTIGUOUS'] + assert_(a.arr.shape==shape) + assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype))) + assert_(a.arr.flags['FORTRAN'] and not a.arr.flags['CONTIGUOUS']) shape = (2,3) a = self.array(shape,intent.c.optional,None) - assert a.arr.shape==shape - assert a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)) - assert not a.arr.flags['FORTRAN'] and a.arr.flags['CONTIGUOUS'] + assert_(a.arr.shape==shape) + assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype))) + assert_(not a.arr.flags['FORTRAN'] and a.arr.flags['CONTIGUOUS']) def test_optional_from_2seq(self): obj = self.num2seq shape = (len(obj),) a = self.array(shape,intent.optional,obj) - assert a.arr.shape==shape - assert not a.has_shared_memory() + assert_(a.arr.shape==shape) + assert_(not a.has_shared_memory()) def test_optional_from_23seq(self): obj = self.num23seq shape = (len(obj),len(obj[0])) a = self.array(shape,intent.optional,obj) - assert a.arr.shape==shape - assert not a.has_shared_memory() + assert_(a.arr.shape==shape) + assert_(not a.has_shared_memory()) a = self.array(shape,intent.optional.c,obj) - assert a.arr.shape==shape - assert not a.has_shared_memory() + assert_(a.arr.shape==shape) + assert_(not a.has_shared_memory()) def test_inplace(self): obj = array(self.num23seq,dtype=self.type.dtype) - assert not obj.flags['FORTRAN'] and obj.flags['CONTIGUOUS'] + assert_(not obj.flags['FORTRAN'] and obj.flags['CONTIGUOUS']) shape = obj.shape a = self.array(shape,intent.inplace,obj) - assert obj[1][2]==a.arr[1][2],`obj,a.arr` + assert_(obj[1][2]==a.arr[1][2],`obj,a.arr`) a.arr[1][2]=54 - assert obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),`obj,a.arr` - assert a.arr is obj - assert obj.flags['FORTRAN'] # obj attributes are changed inplace! - assert not obj.flags['CONTIGUOUS'] + assert_(obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),`obj,a.arr`) + assert_(a.arr is obj) + assert_(obj.flags['FORTRAN']) # obj attributes are changed inplace! + assert_(not obj.flags['CONTIGUOUS']) def test_inplace_from_casttype(self): for t in self.type.cast_types(): if t is self.type: continue obj = array(self.num23seq,dtype=t.dtype) - assert obj.dtype.type==t.dtype - assert obj.dtype.type is not self.type.dtype - assert not obj.flags['FORTRAN'] and obj.flags['CONTIGUOUS'] + assert_(obj.dtype.type==t.dtype) + assert_(obj.dtype.type is not self.type.dtype) + assert_(not obj.flags['FORTRAN'] and obj.flags['CONTIGUOUS']) shape = obj.shape a = self.array(shape,intent.inplace,obj) - assert obj[1][2]==a.arr[1][2],`obj,a.arr` + assert_(obj[1][2]==a.arr[1][2],`obj,a.arr`) a.arr[1][2]=54 - assert obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),`obj,a.arr` - assert a.arr is obj - assert obj.flags['FORTRAN'] # obj attributes are changed inplace! - assert not obj.flags['CONTIGUOUS'] - assert obj.dtype.type is self.type.dtype # obj type is changed inplace! + assert_(obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),`obj,a.arr`) + assert_(a.arr is obj) + assert_(obj.flags['FORTRAN']) # obj attributes are changed inplace! + assert_(not obj.flags['CONTIGUOUS']) + assert_(obj.dtype.type is self.type.dtype) # obj type is changed inplace! for t in Type._type_names: @@ -538,5 +540,6 @@ class test_%s_gen(unittest.TestCase, ''' % (t,t,t) if __name__ == "__main__": + setup() import nose nose.runmodule() diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py index 3e5502cb0..da362b760 100644 --- a/numpy/f2py/tests/test_assumed_shape.py +++ b/numpy/f2py/tests/test_assumed_shape.py @@ -17,14 +17,13 @@ class TestAssumedShapeSumExample(util.F2PyTest): @dec.slow def test_all(self): - print self.module.__doc__ r = self.module.fsum([1,2]) - assert r==3,`r` + assert_(r==3,`r`) r = self.module.sum([1,2]) - assert r==3,`r` + assert_(r==3,`r`) r = self.module.sum_with_use([1,2]) - assert r==3,`r` + assert_(r==3,`r`) if __name__ == "__main__": import nose diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py index b42e70776..7f0107fd5 100644 --- a/numpy/f2py/tests/test_callback.py +++ b/numpy/f2py/tests/test_callback.py @@ -41,24 +41,24 @@ cf2py intent(out) a def check_function(self, name): t = getattr(self.module, name) r = t(lambda : 4) - assert r==4,`r` + assert_( r==4,`r`) r = t(lambda a:5,fun_extra_args=(6,)) - assert r==5,`r` + assert_( r==5,`r`) r = t(lambda a:a,fun_extra_args=(6,)) - assert r==6,`r` + assert_( r==6,`r`) r = t(lambda a:5+a,fun_extra_args=(7,)) - assert r==12,`r` + assert_( r==12,`r`) r = t(lambda a:math.degrees(a),fun_extra_args=(math.pi,)) - assert r==180,`r` + assert_( r==180,`r`) r = t(math.degrees,fun_extra_args=(math.pi,)) - assert r==180,`r` + assert_( r==180,`r`) r = t(self.module.func, fun_extra_args=(6,)) - assert r==17,`r` + assert_( r==17,`r`) r = t(self.module.func0) - assert r==11,`r` + assert_( r==11,`r`) r = t(self.module.func0._cpointer) - assert r==11,`r` + assert_( r==11,`r`) class A: def __call__(self): return 7 @@ -66,9 +66,9 @@ cf2py intent(out) a return 9 a = A() r = t(a) - assert r==7,`r` + assert_( r==7,`r`) r = t(a.mth) - assert r==9,`r` + assert_( r==9,`r`) if __name__ == "__main__": import nose diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py index 1396ac3a1..a6d485a88 100644 --- a/numpy/f2py/tests/test_kind.py +++ b/numpy/f2py/tests/test_kind.py @@ -18,16 +18,16 @@ class TestKind(util.F2PyTest): @dec.slow def test_all(self): - print self.module.__doc__ - selectedrealkind = self.module.selectedrealkind selectedintkind = self.module.selectedintkind for i in range(40): - assert selected_int_kind(i)==selectedintkind(i),`i, selected_int_kind(i), selectedintkind(i)` + assert_(selectedintkind(i) in [selected_int_kind(i),-1],\ + 'selectedintkind(%s): expected %r but got %r' % (i, selected_int_kind(i), selectedintkind(i))) for i in range(20): - assert selected_real_kind(i)==selectedrealkind(i),`i, selected_real_kind(i), selectedrealkind(i)` + assert_(selectedrealkind(i) in [selected_real_kind(i),-1],\ + 'selectedrealkind(%s): expected %r but got %r' % (i, selected_real_kind(i), selectedrealkind(i))) if __name__ == "__main__": import nose diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py index e7a64c080..a8a14ca4b 100644 --- a/numpy/f2py/tests/test_mixed.py +++ b/numpy/f2py/tests/test_mixed.py @@ -16,9 +16,9 @@ class TestMixed(util.F2PyTest): @dec.slow def test_all(self): - assert self.module.bar11() == 11 - assert self.module.foo_fixed.bar12() == 12 - assert self.module.foo_free.bar13() == 13 + assert_( self.module.bar11() == 11) + assert_( self.module.foo_fixed.bar12() == 12) + assert_( self.module.foo_free.bar13() == 13) if __name__ == "__main__": import nose diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py index a8ab4aaac..67c542688 100644 --- a/numpy/f2py/tests/test_return_character.py +++ b/numpy/f2py/tests/test_return_character.py @@ -7,19 +7,19 @@ class TestReturnCharacter(util.F2PyTest): def check_function(self, t): tname = t.__doc__.split()[0] if tname in ['t0','t1','s0','s1']: - assert t(23)==asbytes('2') - r = t('ab');assert r==asbytes('a'),`r` - r = t(array('ab'));assert r==asbytes('a'),`r` - r = t(array(77,'u1'));assert r==asbytes('M'),`r` - #assert_raises(ValueError, t, array([77,87])) - #assert_raises(ValueError, t, array(77)) + assert_( t(23)==asbytes('2')) + r = t('ab');assert_( r==asbytes('a'),`r`) + r = t(array('ab'));assert_( r==asbytes('a'),`r`) + r = t(array(77,'u1'));assert_( r==asbytes('M'),`r`) + #assert_(_raises(ValueError, t, array([77,87]))) + #assert_(_raises(ValueError, t, array(77))) elif tname in ['ts','ss']: - assert t(23)==asbytes('23 '),`t(23)` - assert t('123456789abcdef')==asbytes('123456789a') + assert_( t(23)==asbytes('23 '),`t(23)`) + assert_( t('123456789abcdef')==asbytes('123456789a')) elif tname in ['t5','s5']: - assert t(23)==asbytes('23 '),`t(23)` - assert t('ab')==asbytes('ab '),`t('ab')` - assert t('123456789abcdef')==asbytes('12345') + assert_( t(23)==asbytes('23 '),`t(23)`) + assert_( t('ab')==asbytes('ab '),`t('ab')`) + assert_( t('123456789abcdef')==asbytes('12345')) else: raise NotImplementedError diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py index cff10fcde..f8c6d226a 100644 --- a/numpy/f2py/tests/test_return_complex.py +++ b/numpy/f2py/tests/test_return_complex.py @@ -9,28 +9,28 @@ class TestReturnComplex(util.F2PyTest): err = 1e-5 else: err = 0.0 - assert abs(t(234j)-234.0j)<=err - assert abs(t(234.6)-234.6)<=err - assert abs(t(234l)-234.0)<=err - assert abs(t(234.6+3j)-(234.6+3j))<=err - #assert abs(t('234')-234.)<=err - #assert abs(t('234.6')-234.6)<=err - assert abs(t(-234)+234.)<=err - assert abs(t([234])-234.)<=err - assert abs(t((234,))-234.)<=err - assert abs(t(array(234))-234.)<=err - assert abs(t(array(23+4j,'F'))-(23+4j))<=err - assert abs(t(array([234]))-234.)<=err - assert abs(t(array([[234]]))-234.)<=err - assert abs(t(array([234],'b'))+22.)<=err - assert abs(t(array([234],'h'))-234.)<=err - assert abs(t(array([234],'i'))-234.)<=err - assert abs(t(array([234],'l'))-234.)<=err - assert abs(t(array([234],'q'))-234.)<=err - assert abs(t(array([234],'f'))-234.)<=err - assert abs(t(array([234],'d'))-234.)<=err - assert abs(t(array([234+3j],'F'))-(234+3j))<=err - assert abs(t(array([234],'D'))-234.)<=err + assert_( abs(t(234j)-234.0j)<=err) + assert_( abs(t(234.6)-234.6)<=err) + assert_( abs(t(234l)-234.0)<=err) + assert_( abs(t(234.6+3j)-(234.6+3j))<=err) + #assert_( abs(t('234')-234.)<=err) + #assert_( abs(t('234.6')-234.6)<=err) + assert_( abs(t(-234)+234.)<=err) + assert_( abs(t([234])-234.)<=err) + assert_( abs(t((234,))-234.)<=err) + assert_( abs(t(array(234))-234.)<=err) + assert_( abs(t(array(23+4j,'F'))-(23+4j))<=err) + assert_( abs(t(array([234]))-234.)<=err) + assert_( abs(t(array([[234]]))-234.)<=err) + assert_( abs(t(array([234],'b'))+22.)<=err) + assert_( abs(t(array([234],'h'))-234.)<=err) + assert_( abs(t(array([234],'i'))-234.)<=err) + assert_( abs(t(array([234],'l'))-234.)<=err) + assert_( abs(t(array([234],'q'))-234.)<=err) + assert_( abs(t(array([234],'f'))-234.)<=err) + assert_( abs(t(array([234],'d'))-234.)<=err) + assert_( abs(t(array([234+3j],'F'))-(234+3j))<=err) + assert_( abs(t(array([234],'D'))-234.)<=err) #assert_raises(TypeError, t, array([234], 'a1')) assert_raises(TypeError, t, 'abc') @@ -43,7 +43,7 @@ class TestReturnComplex(util.F2PyTest): try: r = t(10l**400) - assert `r` in ['(inf+0j)','(Infinity+0j)'],`r` + assert_( `r` in ['(inf+0j)','(Infinity+0j)'],`r`) except OverflowError: pass diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py index 9285cf47f..e1b3a37aa 100644 --- a/numpy/f2py/tests/test_return_integer.py +++ b/numpy/f2py/tests/test_return_integer.py @@ -4,23 +4,23 @@ import util class TestReturnInteger(util.F2PyTest): def check_function(self, t): - assert t(123)==123,`t(123)` - assert t(123.6)==123 - assert t(123l)==123 - assert t('123')==123 - assert t(-123)==-123 - assert t([123])==123 - assert t((123,))==123 - assert t(array(123))==123 - assert t(array([123]))==123 - assert t(array([[123]]))==123 - assert t(array([123],'b'))==123 - assert t(array([123],'h'))==123 - assert t(array([123],'i'))==123 - assert t(array([123],'l'))==123 - assert t(array([123],'B'))==123 - assert t(array([123],'f'))==123 - assert t(array([123],'d'))==123 + assert_( t(123)==123,`t(123)`) + assert_( t(123.6)==123) + assert_( t(123l)==123) + assert_( t('123')==123) + assert_( t(-123)==-123) + assert_( t([123])==123) + assert_( t((123,))==123) + assert_( t(array(123))==123) + assert_( t(array([123]))==123) + assert_( t(array([[123]]))==123) + assert_( t(array([123],'b'))==123) + assert_( t(array([123],'h'))==123) + assert_( t(array([123],'i'))==123) + assert_( t(array([123],'l'))==123) + assert_( t(array([123],'B'))==123) + assert_( t(array([123],'f'))==123) + assert_( t(array([123],'d'))==123) #assert_raises(ValueError, t, array([123],'S3')) assert_raises(ValueError, t, 'abc') diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py index ab24517f2..059b843dc 100644 --- a/numpy/f2py/tests/test_return_logical.py +++ b/numpy/f2py/tests/test_return_logical.py @@ -4,44 +4,44 @@ import util class TestReturnLogical(util.F2PyTest): def check_function(self, t): - assert t(True)==1,`t(True)` - assert t(False)==0,`t(False)` - assert t(0)==0 - assert t(None)==0 - assert t(0.0)==0 - assert t(0j)==0 - assert t(1j)==1 - assert t(234)==1 - assert t(234.6)==1 - assert t(234l)==1 - assert t(234.6+3j)==1 - assert t('234')==1 - assert t('aaa')==1 - assert t('')==0 - assert t([])==0 - assert t(())==0 - assert t({})==0 - assert t(t)==1 - assert t(-234)==1 - assert t(10l**100)==1 - assert t([234])==1 - assert t((234,))==1 - assert t(array(234))==1 - assert t(array([234]))==1 - assert t(array([[234]]))==1 - assert t(array([234],'b'))==1 - assert t(array([234],'h'))==1 - assert t(array([234],'i'))==1 - assert t(array([234],'l'))==1 - assert t(array([234],'f'))==1 - assert t(array([234],'d'))==1 - assert t(array([234+3j],'F'))==1 - assert t(array([234],'D'))==1 - assert t(array(0))==0 - assert t(array([0]))==0 - assert t(array([[0]]))==0 - assert t(array([0j]))==0 - assert t(array([1]))==1 + assert_( t(True)==1,`t(True)`) + assert_( t(False)==0,`t(False)`) + assert_( t(0)==0) + assert_( t(None)==0) + assert_( t(0.0)==0) + assert_( t(0j)==0) + assert_( t(1j)==1) + assert_( t(234)==1) + assert_( t(234.6)==1) + assert_( t(234l)==1) + assert_( t(234.6+3j)==1) + assert_( t('234')==1) + assert_( t('aaa')==1) + assert_( t('')==0) + assert_( t([])==0) + assert_( t(())==0) + assert_( t({})==0) + assert_( t(t)==1) + assert_( t(-234)==1) + assert_( t(10l**100)==1) + assert_( t([234])==1) + assert_( t((234,))==1) + assert_( t(array(234))==1) + assert_( t(array([234]))==1) + assert_( t(array([[234]]))==1) + assert_( t(array([234],'b'))==1) + assert_( t(array([234],'h'))==1) + assert_( t(array([234],'i'))==1) + assert_( t(array([234],'l'))==1) + assert_( t(array([234],'f'))==1) + assert_( t(array([234],'d'))==1) + assert_( t(array([234+3j],'F'))==1) + assert_( t(array([234],'D'))==1) + assert_( t(array(0))==0) + assert_( t(array([0]))==0) + assert_( t(array([[0]]))==0) + assert_( t(array([0j]))==0) + assert_( t(array([1]))==1) assert_raises(ValueError, t, array([0,0])) diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py index eae098add..5dc12708e 100644 --- a/numpy/f2py/tests/test_return_real.py +++ b/numpy/f2py/tests/test_return_real.py @@ -9,26 +9,26 @@ class TestReturnReal(util.F2PyTest): err = 1e-5 else: err = 0.0 - assert abs(t(234)-234.0)<=err - assert abs(t(234.6)-234.6)<=err - assert abs(t(234l)-234.0)<=err - assert abs(t('234')-234)<=err - assert abs(t('234.6')-234.6)<=err - assert abs(t(-234)+234)<=err - assert abs(t([234])-234)<=err - assert abs(t((234,))-234.)<=err - assert abs(t(array(234))-234.)<=err - assert abs(t(array([234]))-234.)<=err - assert abs(t(array([[234]]))-234.)<=err - assert abs(t(array([234],'b'))+22)<=err - assert abs(t(array([234],'h'))-234.)<=err - assert abs(t(array([234],'i'))-234.)<=err - assert abs(t(array([234],'l'))-234.)<=err - assert abs(t(array([234],'B'))-234.)<=err - assert abs(t(array([234],'f'))-234.)<=err - assert abs(t(array([234],'d'))-234.)<=err + assert_( abs(t(234)-234.0)<=err) + assert_( abs(t(234.6)-234.6)<=err) + assert_( abs(t(234l)-234.0)<=err) + assert_( abs(t('234')-234)<=err) + assert_( abs(t('234.6')-234.6)<=err) + assert_( abs(t(-234)+234)<=err) + assert_( abs(t([234])-234)<=err) + assert_( abs(t((234,))-234.)<=err) + assert_( abs(t(array(234))-234.)<=err) + assert_( abs(t(array([234]))-234.)<=err) + assert_( abs(t(array([[234]]))-234.)<=err) + assert_( abs(t(array([234],'b'))+22)<=err) + assert_( abs(t(array([234],'h'))-234.)<=err) + assert_( abs(t(array([234],'i'))-234.)<=err) + assert_( abs(t(array([234],'l'))-234.)<=err) + assert_( abs(t(array([234],'B'))-234.)<=err) + assert_( abs(t(array([234],'f'))-234.)<=err) + assert_( abs(t(array([234],'d'))-234.)<=err) if t.__doc__.split()[0] in ['t0','t4','s0','s4']: - assert t(1e200)==t(1e300) # inf + assert_( t(1e200)==t(1e300)) # inf #assert_raises(ValueError, t, array([234], 'S1')) assert_raises(ValueError, t, 'abc') @@ -41,7 +41,7 @@ class TestReturnReal(util.F2PyTest): try: r = t(10l**400) - assert `r` in ['inf','Infinity'],`r` + assert_( `r` in ['inf','Infinity'],`r`) except OverflowError: pass |