From 61d945bdb5c9b2b3329e1b8468b5c7d0596dd9fc Mon Sep 17 00:00:00 2001 From: pierregm Date: Mon, 11 Oct 2010 22:24:26 +0200 Subject: Add more tests to test_eq_w_None (bug #1493) --- numpy/ma/tests/test_core.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'numpy/ma/tests') diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index f907a3447..5a8262e0d 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -101,8 +101,8 @@ class TestMaskedArray(TestCase): self.assertTrue(isMaskedArray(xm)) assert_equal(shape(xm), s) assert_equal(xm.shape, s) - assert_equal(xm.size , reduce(lambda x, y:x * y, s)) - assert_equal(count(xm) , len(m1) - reduce(lambda x, y:x + y, m1)) + assert_equal(xm.size, reduce(lambda x, y:x * y, s)) + assert_equal(count(xm), len(m1) - reduce(lambda x, y:x + y, m1)) assert_equal(xm, xf) assert_equal(filled(xm, 1.e20), xf) assert_equal(x, xm) @@ -1150,9 +1150,19 @@ class TestMaskedArrayArithmetic(TestCase): def test_eq_w_None(self): + # With no mask a = array([1, 2], mask=False) assert_equal(a == None, False) assert_equal(a != None, True) + # With a partial mask + a = array([1, 2], mask=[0, 1]) + assert_equal(a == None, False) + assert_equal(a != None, True) + # With total mask + a = array([1, 2], mask=True) + assert_equal(a == None, False) + assert_equal(a != None, True) + # As masked a = masked assert_equal(a == None, masked) -- cgit v1.2.1