summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorMarten van Kerkwijk <mhvk@astro.utoronto.ca>2018-05-22 16:09:57 -0400
committerMarten van Kerkwijk <mhvk@astro.utoronto.ca>2018-05-22 16:13:04 -0400
commitc17c42924231571b0df833ef3df59194bb3dcb9d (patch)
tree72e93b66f4c7b9c6b0826ecf15f4064abfa9d193 /numpy/ma
parentb08ce1ad3705b1cfbdb89b3be50c1756c74982c3 (diff)
downloadnumpy-c17c42924231571b0df833ef3df59194bb3dcb9d.tar.gz
MAINT: move remaining MaskedArray matrix tests to matrixlib.
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/tests/test_extras.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/numpy/ma/tests/test_extras.py b/numpy/ma/tests/test_extras.py
index 2d5e30b2c..c29bec2bd 100644
--- a/numpy/ma/tests/test_extras.py
+++ b/numpy/ma/tests/test_extras.py
@@ -307,21 +307,6 @@ class TestConcatenator(object):
assert_array_equal(d[5:,:], b_2)
assert_array_equal(d.mask, np.r_[m_1, m_2])
- def test_matrix_builder(self):
- assert_raises(np.ma.MAError, lambda: mr_['1, 2; 3, 4'])
-
- def test_matrix(self):
- # Test consistency with unmasked version. If we ever deprecate
- # matrix, this test should either still pass, or both actual and
- # expected should fail to be build.
- actual = mr_['r', 1, 2, 3]
- expected = np.ma.array(np.r_['r', 1, 2, 3])
- assert_array_equal(actual, expected)
-
- # outer type is masked array, inner type is matrix
- assert_equal(type(actual), type(expected))
- assert_equal(type(actual.data), type(expected.data))
-
def test_masked_constant(self):
actual = mr_[np.ma.masked, 1]
assert_equal(actual.mask, [True, False])