Bug fixes for tests due to spacetelescope/rad#250 and spacetelescope/…

…rad#258 (spacetelescope#174)
mairanteodoro · May 11, 2023 · 50d2e3d · 50d2e3d
1 parent 6de54e6
commit 50d2e3d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/src/roman_datamodels/maker_utils.py b/src/roman_datamodels/maker_utils.py
@@ -374,6 +374,9 @@ def mk_guidestar():
     guide["gs_mag"] = NONUM
     guide["gs_umag"] = NONUM
     guide["gw_fgs_mode"] = "WSM-ACQ-2"
+    guide["gw_science_file_source"] = NOSTR
+    guide["gs_id"] = NOSTR
+    guide["gs_catalog_version"] = NOSTR
     guide["data_start"] = NONUM
     guide["data_end"] = NONUM
     guide["gs_ctd_x"] = NONUM

diff --git a/src/roman_datamodels/testing/factories.py b/src/roman_datamodels/testing/factories.py
@@ -653,6 +653,9 @@ def create_guidestar(**kwargs):
         "gs_ura": random_utils.generate_positive_float(),
         "gw_id": random_utils.generate_string("ID ", 20),
         "gw_fgs_mode": "WSM-ACQ-2",
+        "gw_science_file_source": random_utils.generate_string("r", 20) + ".asdf",
+        "gs_id": random_utils.generate_string("GS ", 20),
+        "gs_catalog_version": random_utils.generate_string("GSC", 20),
         "gw_window_xsize": 16,
         "gw_window_xstart": random_utils.generate_positive_int(4000),
         "gw_window_ysize": 16,

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -748,19 +748,13 @@ def test_datamodel_schema_info():
     assert info["roman"]["meta"]["aperture"] == {
         "name": {
             "archive_catalog": (
-                {
-                    "datatype": "nvarchar(40)",
-                    "destination": ["ScienceCommon.aperture_name"],
-                },
+                {"datatype": "nvarchar(40)", "destination": ["ScienceCommon.aperture_name", "GuideWindow.aperture_name"]},
                 dm.meta.aperture.name,
             ),
         },
         "position_angle": {
             "archive_catalog": (
-                {
-                    "datatype": "float",
-                    "destination": ["ScienceCommon.position_angle"],
-                },
+                {"datatype": "float", "destination": ["ScienceCommon.position_angle", "GuideWindow.position_angle"]},
                 30.0,
             )
         },

diff --git a/tests/test_stnode.py b/tests/test_stnode.py
@@ -71,10 +71,23 @@ def test_schema_info():
     info = af.schema_info("archive_catalog")
     assert info == {
         "wfimode": {
-            "detector": {"archive_catalog": ({"datatype": "nvarchar(10)", "destination": ["ScienceCommon.detector"]}, "WFI18")},
-            "name": {"archive_catalog": ({"datatype": "nvarchar(5)", "destination": ["ScienceCommon.instrument_name"]}, "WFI")},
+            "detector": {
+                "archive_catalog": (
+                    {"datatype": "nvarchar(10)", "destination": ["ScienceCommon.detector", "GuideWindow.detector"]},
+                    "WFI18",
+                )
+            },
+            "name": {
+                "archive_catalog": (
+                    {"datatype": "nvarchar(5)", "destination": ["ScienceCommon.instrument_name", "GuideWindow.instrument_name"]},
+                    "WFI",
+                )
+            },
             "optical_element": {
-                "archive_catalog": ({"datatype": "nvarchar(20)", "destination": ["ScienceCommon.optical_element"]}, "GRISM")
+                "archive_catalog": (
+                    {"datatype": "nvarchar(20)", "destination": ["ScienceCommon.optical_element", "GuideWindow.optical_element"]},
+                    "GRISM",
+                )
             },
         }
     }