From 3b392c99be71eb4febfc758633da2d42c3f9f2b3 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 10 Oct 2006 22:44:09 +0000
Subject: [PATCH] Adjust tests to account for numarray behavior differences

[SVN r35539]
---
 test/slice.cpp |  9 ++++++---
 test/slice.py  | 23 ++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/slice.cpp b/test/slice.cpp
index f25c9017..4d4d03f0 100644
--- a/test/slice.cpp
+++ b/test/slice.cpp
@@ -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),
diff --git a/test/slice.py b/test/slice.py
index ed60c620..c281845b 100644
--- a/test/slice.py
+++ b/test/slice.py
@@ -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