remove dubious check; reorder tests

Author: rcomer

lib/iris/coords.py

@@ -1949,7 +1949,7 @@ def collapsed(self, dims_to_collapse=None):
             # Collapse the coordinate by serializing the points and
             # bounds as strings.
             def serialize(x, axis):
-                if axis is None or len(axis) == x.ndim:
+                if axis is None:
                     return "|".join(str(i) for i in x.flatten())
 
                 # np.apply_along_axis does not work with str.join, so we
@@ -1958,7 +1958,9 @@ def serialize(x, axis):
                 # array we can loop through.
                 work_array = np.moveaxis(x, axis, range(-len(axis), 0))
                 out_shape = work_array.shape[: -len(axis)]
-                work_array = work_array.reshape(np.prod(out_shape), -1)
+                work_array = work_array.reshape(
+                    np.prod(out_shape, dtype=int), -1
+                )
 
                 joined = []
                 for arr_slice in work_array:

lib/iris/tests/unit/coords/test_Coord.py

@@ -470,6 +470,15 @@ def test_lazy_nd_points_and_bounds(self):
         self.assertArrayEqual(collapsed_coord.points, da.array([55]))
         self.assertArrayEqual(collapsed_coord.bounds, da.array([[-2, 112]]))
 
+    def test_string_masked(self):
+        points = ma.array(["foo", "bar", "bing"], mask=[0, 1, 0], dtype=str)
+        coord = AuxCoord(points)
+
+        collapsed_coord = coord.collapsed(0)
+
+        expected = "foo|--|bing"
+        self.assertEqual(collapsed_coord.points, expected)
+
     def test_string_nd_first(self):
         self.setupTestArrays((3, 4))
         coord = AuxCoord(self.pts_real.astype(str))
@@ -484,15 +493,6 @@ def test_string_nd_first(self):
 
         self.assertArrayEqual(collapsed_coord.points, expected)
 
-    def test_string_masked(self):
-        points = ma.array(["foo", "bar", "bing"], mask=[0, 1, 0], dtype=str)
-        coord = AuxCoord(points)
-
-        collapsed_coord = coord.collapsed(0)
-
-        expected = "foo|--|bing"
-        self.assertEqual(collapsed_coord.points, expected)
-
     def test_string_nd_second(self):
         self.setupTestArrays((3, 4))
         coord = AuxCoord(self.pts_real.astype(str))