[Scipy-svn] r3333 - trunk/scipy/sandbox/timeseries/tests

scipy-svn@scip... scipy-svn@scip...
Wed Sep 19 22:02:21 CDT 2007


Author: mattknox_ca
Date: 2007-09-19 22:02:17 -0500 (Wed, 19 Sep 2007)
New Revision: 3333

Modified:
   trunk/scipy/sandbox/timeseries/tests/test_trecords.py
Log:
updated some tests to use new functions in maskedarray testutils

Modified: trunk/scipy/sandbox/timeseries/tests/test_trecords.py
===================================================================
--- trunk/scipy/sandbox/timeseries/tests/test_trecords.py	2007-09-19 21:11:44 UTC (rev 3332)
+++ trunk/scipy/sandbox/timeseries/tests/test_trecords.py	2007-09-20 03:02:17 UTC (rev 3333)
@@ -18,7 +18,7 @@
 from numpy.testing.utils import build_err_msg
 
 import maskedarray.testutils
-from maskedarray.testutils import assert_equal, assert_array_equal
+from maskedarray.testutils import assert_equal, assert_array_equal, assert_equal_records
 
 import maskedarray.core as MA
 import maskedarray.mrecords as MR
@@ -65,12 +65,12 @@
         assert_equal(mts._data[0], mrec._data[0])
         # We can't use assert_equal here, as it tries to convert the tuple into a singleton
 #        assert(mts[0]._data.view(numpyndarray) == mrec[0])
-        assert_equal(numpy.asarray(mts._data[0]), mrec[0])
+        assert_equal_records(mts._data[0], mrec[0])
         assert_equal(mts._dates[0], dates[0])  
         assert_equal(mts[0]._dates, dates[0])
         #
         assert(isinstance(mts['2007-01'], TimeSeriesRecords))
-        assert(mts['2007-01']._data == mrec[0])
+        assert_equal_records(mts['2007-01']._data, mrec[0])
         assert_equal(mts['2007-01']._dates, dates[0])       
         #
         assert(isinstance(mts.f0, TimeSeries))



More information about the Scipy-svn mailing list