getitem tests

davidhassell · davidhassell · commit 5a28c946694a · 2023-07-21T09:07:35.000+01:00
diff --git a/cf/test/test_Data.py b/cf/test/test_Data.py
@@ -1495,6 +1495,12 @@ def test_Data__getitem__(self):
         indices = (cf.Data([1, 3]), cf.Data([0, 1, 2, 3, 4]) > 1)
         self.assertEqual(d[indices].shape, (2, 3))
 
+        # ... and with a masked array
+        d.where(d < 20, cf.masked, inplace=True)
+        e = d[cf.Data([0, 7]), 0]
+        f = cf.Data([-999, 35], mask=[True, False]).reshape(2, 1)
+        self.assertTrue(e.equals(f))
+
     def test_Data__setitem__(self):
         """Test the assignment of data elements on Data."""
         for hardmask in (False, True):
diff --git a/cf/test/test_Field.py b/cf/test/test_Field.py
@@ -652,6 +652,10 @@ def test_Field__getitem__(self):
         g = f[0].squeeze()
         g[5]
 
+        # Test list indices that have a `to_dask_array` method
+        y = f.dimension_coordinate("Y")
+        self.assertEqual(f[y > 3].shape, (6, 9))
+
         # Indices result in a subspaced shape that has a size 0 axis
         with self.assertRaises(IndexError):
             f[..., [False] * f.shape[-1]]
@@ -697,6 +701,11 @@ def test_Field__setitem__(self):
         with self.assertRaises(Exception):
             f[..., 0:2] = g
 
+        # Test list indices that have a `to_dask_array` method
+        y = f.dimension_coordinate("Y")
+        f[y > 3] = -314
+        self.assertEqual(f.where(cf.ne(-314), cf.masked).count(), 6 * 9)
+
     def test_Field__add__(self):
         f = self.f.copy()
 
