boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-23 05:42:30 +00:00
Code Issues Projects Releases Wiki Activity

Adjust tests to account for numarray behavior differences

Browse Source 
[SVN r35539]
This commit is contained in:
Dave Abrahams
2006-10-10 22:44:09 +00:00
parent 24ba93607b
commit 3b392c99be
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/slice.cpp
View File

@@ -48,14 +48,17 @@ bool check_string_rich_slice()
// contents) but Numeric complains that treating an array as a boolean
// value doesn't make any sense.
#define ASSERT_EQUAL( e1, e2 ) \
if ((e1) != (e2)) \
return object("assertion failed: " #e1 " == " #e2 "\nLHS:\n") /*+ str(e1) + "\nRHS:\n" + str(e2)*/; \
if (!all((e1) == (e2))) \
return object("assertion failed: " #e1 " == " #e2 "\nLHS:\n") + str(e1) + "\nRHS:\n" + str(e2); \
else
// These tests work with Python 2.2, but you must have Numeric installed.
object check_numeric_array_rich_slice()
object check_numeric_array_rich_slice(
char const* module_name, char const* array_type_name, object all)
{
using numeric::array;
array::set_module_and_type(module_name, array_type_name);
array original = array( make_tuple( make_tuple( 11, 12, 13, 14),
make_tuple( 21, 22, 23, 24),
make_tuple( 31, 32, 33, 34),

23
test/slice.py
View File

@@ -12,23 +12,20 @@
... print "test passed"
...
test passed
>>> have_numeric = 0
>>> try:
... from Numeric import array
... have_numeric = 1
... except:
... pass
...
>>> try:
... from numarray import array
... have_numeric = 1
... except:
... pass
...
>>> if have_numeric:
... check_numeric_array_rich_slice()
... else:
... print 1
... else:
... check_numeric_array_rich_slice('Numeric', 'ArrayType', lambda x:x)
...
1
>>> try:
... from numarray import array, all
... except:
... print 1
... else:
... check_numeric_array_rich_slice('numarray', 'NDArray', all)
...
1
>>> import sys