Move general use cube fixtures together.

test/test_um2netcdf.py

@@ -86,6 +86,29 @@ def geo_potential_cube(lat_v_nd_coord, lon_u_nd_coord):
     return geo_potential
 
 
+@pytest.fixture
+def ua_plev_cube():
+    return DummyCube(30201, "ua_plev")
+
+
+@pytest.fixture
+def heaviside_uv_cube(lat_v_nd_coord, lon_u_nd_coord):
+    return DummyCube(30301, "heaviside_uv",
+                     coords=[lat_v_nd_coord, lon_u_nd_coord])
+
+
+@pytest.fixture
+def ta_plev_cube(lat_v_nd_coord, lon_u_nd_coord):
+    return DummyCube(30204, "ta_plev",
+                     coords=[lat_v_nd_coord, lon_u_nd_coord])
+
+
+@pytest.fixture
+def heaviside_t_cube(lat_standard_eg_coord, lon_standard_eg_coord):
+    return DummyCube(30304, "heaviside_t",
+                     coords=[lat_standard_eg_coord, lon_standard_eg_coord])
+
+
 @pytest.fixture
 def std_args():
     # TODO: make args namedtuple?
@@ -379,29 +402,6 @@ def coord(self, _name):
             raise CoordinateNotFoundError(msg)
 
 
-@pytest.fixture
-def ua_plev_cube():
-    return DummyCube(30201, "ua_plev")
-
-
-@pytest.fixture
-def heaviside_uv_cube(lat_v_nd_coord, lon_u_nd_coord):
-    return DummyCube(30301, "heaviside_uv",
-                     coords=[lat_v_nd_coord, lon_u_nd_coord])
-
-
-@pytest.fixture
-def ta_plev_cube(lat_v_nd_coord, lon_u_nd_coord):
-    return DummyCube(30204, "ta_plev",
-                     coords=[lat_v_nd_coord, lon_u_nd_coord])
-
-
-@pytest.fixture
-def heaviside_t_cube(lat_standard_eg_coord, lon_standard_eg_coord):
-    return DummyCube(30304, "heaviside_t",
-                     coords=[lat_standard_eg_coord, lon_standard_eg_coord])
-
-
 # cube filtering tests
 # NB: wrap results in tuples to capture generator output in sequences