More tests

Author: Cadair

ndcube/asdf/converters/ndcube_converter.py

@@ -41,14 +41,10 @@ def to_yaml_tree(self, ndcube, tag, ctx):
             This ensures that users are aware of potentially important information
             that is not included in the serialized output.
         """
-        from astropy.wcs.wcsapi import BaseHighLevelWCS
-
         node = {}
         node["data"] = ndcube.data
-        if isinstance(ndcube.wcs, BaseHighLevelWCS):
-            node["wcs"] = ndcube.wcs.low_level_wcs
-        else:
-            node["wcs"] = ndcube.wcs
+        # NDData always has .wcs as a high level wcs
+        node["wcs"] = ndcube.wcs.low_level_wcs
         if not ndcube.extra_coords.is_empty:
             node["extra_coords"] = ndcube.extra_coords
         if ndcube.global_coords._all_coords:

ndcube/asdf/converters/tests/test_ndcollection_converter.py

@@ -35,11 +35,11 @@ def test_serialization_cube(create_ndcollection_cube, tmp_path):
         assert_collections_equal(af["ndcube_gwcs"], ndcollection)
 
 
-@pytest.fixture
-def create_ndcollection_sequence(ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_dropped_dim):
+@pytest.fixture(params=[{"meta": {"hello": "world"}}, {}])
+def create_ndcollection_sequence(ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_dropped_dim, request):
     sequence02 = NDCubeSequence([ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_dropped_dim])
     sequence20 = NDCubeSequence([ndcube_gwcs_3d_ln_lt_l_ec_dropped_dim, ndcube_gwcs_3d_ln_lt_l])
-    return NDCollection([("seq0", sequence02), ("seq1", sequence20)], aligned_axes="all")
+    return NDCollection([("seq0", sequence02), ("seq1", sequence20)], aligned_axes="all", **request.param)
 
 
 def test_serialization_sequence(create_ndcollection_sequence, tmp_path):

ndcube/asdf/converters/tests/test_ndcube_converter.py

@@ -1,3 +1,5 @@
+from contextlib import nullcontext
+
 import asdf_astropy
 import numpy as np
 import pytest
@@ -17,10 +19,16 @@ def test_serialization(all_ndcubes, tmp_path, all_ndcubes_names):
     if not isinstance(all_ndcubes.data, np.ndarray):
         pytest.skip("Can't save non-numpy array to ASDF.")
 
+    # A warning is thrown if psf is present
+    write_context = nullcontext()
+    if all_ndcubes.psf is not None:
+        write_context = pytest.warns(UserWarning, match="'psf' is present")
+
     file_path = tmp_path / "test.asdf"
     with asdf.AsdfFile() as af:
         af["ndcube"] = all_ndcubes
-        af.write_to(file_path)
+        with write_context:
+            af.write_to(file_path)
 
     with asdf.open(file_path) as af:
         assert_cubes_equal(af["ndcube"], all_ndcubes, rtol=1e-12)

ndcube/asdf/converters/tests/test_ndcubesequence_converter.py

@@ -1,12 +1,15 @@
+import pytest
+
 import asdf
 
 from ndcube.ndcube_sequence import NDCubeSequence
 from ndcube.tests.helpers import assert_cubesequences_equal
 
 
-def test_serialization(ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_q_t_gc, tmp_path):
+@pytest.mark.parametrize("meta", [None, {"hello": "world"}])
+def test_serialization(meta, ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_q_t_gc, tmp_path):
     file_path = tmp_path / "test.asdf"
-    ndcseq = NDCubeSequence([ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_q_t_gc], common_axis=1)
+    ndcseq = NDCubeSequence([ndcube_gwcs_3d_ln_lt_l, ndcube_gwcs_3d_ln_lt_l_ec_q_t_gc], common_axis=1, meta=meta)
     with asdf.AsdfFile() as af:
         af["ndcube_gwcs"] = ndcseq
         af.write_to(file_path)

ndcube/conftest.py

@@ -851,6 +851,13 @@ def ndcube_2d_ln_lt(wcs_2d_lt_ln):
     return NDCube(data_cube, wcs=wcs_2d_lt_ln)
 
 
+@pytest.fixture
+def ndcube_2d_ln_lt_psf(wcs_2d_lt_ln):
+    shape = (10, 12)
+    data_cube = data_nd(shape)
+    return NDCube(data_cube, wcs=wcs_2d_lt_ln, psf=np.zeros(shape))
+
+
 @pytest.fixture
 def ndcube_2d_ln_lt_uncert(wcs_2d_lt_ln):
     shape = (10, 12)
@@ -1086,6 +1093,7 @@ def ndcube_1d_l(wcs_1d_l):
     "ndcube_3d_coupled_time",
     "ndcube_3d_l_ln_lt_ectime",
     "ndcube_2d_ln_lt",
+    "ndcube_2d_ln_lt_psf",
     "ndcube_2d_ln_lt_uncert",
     "ndcube_2d_ln_lt_mask_uncert",
     "ndcube_2d_ln_lt_mask_uncert_unit_mask_false",