summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-09-16 07:15:42 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-09-16 07:15:42 +0000
commit2eae9616c5d8b67b644b52be26a1abbbf658e347 (patch)
tree4903bc18adfca39901d508ebc65b172ed6d94ab4 /numpy
parent364f7b87708a0f31b4bf09a510e0f325615b6b3f (diff)
downloadnumpy-2eae9616c5d8b67b644b52be26a1abbbf658e347.tar.gz
Move masked array test out of numpy.core.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/tests/test_numeric.py4
-rw-r--r--numpy/ma/tests/test_core.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py
index e1dab3bfa..e62a2d0af 100644
--- a/numpy/core/tests/test_numeric.py
+++ b/numpy/core/tests/test_numeric.py
@@ -954,9 +954,5 @@ class TestArgwhere:
def test_list(self):
assert_equal(np.argwhere([4, 0, 2, 1, 3]), [[0], [2], [3], [4]])
- def test_masked_array(self):
- a = np.ma.array([0, 1, 2, 3], mask=[0, 0, 1, 0])
- assert_equal(np.argwhere(a), [[1], [3]])
-
if __name__ == "__main__":
run_module_suite()
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index 286090ad8..61f315753 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -3199,6 +3199,10 @@ class TestMaskedView(TestCase):
self.failUnless(isinstance(test, np.matrix))
self.failUnless(not isinstance(test, MaskedArray))
+def test_masked_array():
+ a = np.ma.array([0, 1, 2, 3], mask=[0, 0, 1, 0])
+ assert_equal(np.argwhere(a), [[1], [3]])
+
###############################################################################
#------------------------------------------------------------------------------
if __name__ == "__main__":