merge test

Author: arahlin

core/tests/timestream_2d.py

@@ -22,32 +22,31 @@
 buffer2d = numpy.asarray(tsm)
 
 numpy.testing.assert_array_equal(keys, list(tsm.keys()))
-assert(buffer1d.shape == buffer2d.shape)
 assert(buffer2d.shape == (4,600))
-assert((buffer1d == buffer2d).all())
+numpy.testing.assert_array_equal(buffer1d, buffer2d)
 
 # Try building the TSM directly
 tsm2 = core.G3TimestreamMap(tsm.keys(), buffer1d)
-assert((numpy.asarray(tsm2) == buffer1d).all())
-assert((numpy.asarray(tsm2) == buffer2d).all())
+numpy.testing.assert_array_equal(numpy.asarray(tsm2), buffer1d)
+numpy.testing.assert_array_equal(numpy.asarray(tsm2), buffer2d)
 
 # Try building semi-directly, using a list of numpy arrays
 tsm2 = core.G3TimestreamMap(tsm.keys(), [x for x in buffer1d])
-assert((numpy.asarray(tsm2) == buffer1d).all())
-assert((numpy.asarray(tsm2) == buffer2d).all())
+numpy.testing.assert_array_equal(numpy.asarray(tsm2), buffer1d)
+numpy.testing.assert_array_equal(numpy.asarray(tsm2), buffer2d)
 
 # Round-trip to and from numpy
 tsm2 = core.G3TimestreamMap(tsm.keys(), buffer2d)
-assert((numpy.asarray(tsm2) == buffer1d).all())
-assert((numpy.asarray(tsm2) == buffer2d).all())
+numpy.testing.assert_array_equal(numpy.asarray(tsm2), buffer1d)
+numpy.testing.assert_array_equal(numpy.asarray(tsm2), buffer2d)
 
 # Now try writing to it
 numpy.asarray(tsm2)[1,5] = 16
 assert(numpy.asarray(tsm2)[1,5] == 16)
 
 # And that writes propagate back to the underlying G3Timestream
 buffer2d[1] = numpy.random.normal(size=600)
-assert((numpy.asarray(tsm['B']) == buffer2d[keys.index('B')]).all())
+numpy.testing.assert_array_equal(numpy.asarray(tsm['B']), buffer2d[keys.index('B')])
 
 # Test initialization from numpy and data copying/sharing
 buffer1d[2,6] = -3.0