test MivotViewer.to_dict() output

astropy · Dec 2, 2024 · 28ee3ed · 28ee3ed
1 parent e9e273e
commit 28ee3ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/pyvo/mivot/tests/data/reference/test_mivot_writer.json b/pyvo/mivot/tests/data/reference/test_mivot_writer.json
@@ -1,5 +1,5 @@
 {
-  "dmtype": "EpochPosition",
+  "dmtype": "mango:EpochPosition",
   "longitude": {
     "value": 52.2340018,
     "unit": "deg"
@@ -8,12 +8,12 @@
     "value": 59.8937333,
     "unit": "deg"
   },
-  "EpochPosition_errors": {
-    "dmtype": "EpochPositionErrors",
-    "dmrole": "errors",
-    "EpochPositionErrors_position": {
-      "dmtype": "ErrorCorrMatrix",
-      "dmrole": "position",
+  "errors": {
+    "dmtype": "mango:EpochPositionErrors",
+    "dmrole": "mango:EpochPosition.errors",
+    "position": {
+      "dmtype": "mango:error.ErrorCorrMatrix",
+      "dmrole": "mango:EpochPositionErrors.position",
       "sigma1": {
         "value": 6.0,
         "unit": "arcsec"
@@ -24,19 +24,19 @@
       }
     }
   },
-  "EpochPosition_spaceSys": {
-    "dmtype": "SpaceSys",
+  "spaceSys": {
+    "dmtype": "coords:SpaceSys",
     "dmid": "_spacesys_icrs",
-    "dmrole": "spaceSys",
-    "PhysicalCoordSys_frame": {
-      "dmtype": "SpaceFrame",
-      "dmrole": "frame",
+    "dmrole": "mango:EpochPosition.spaceSys",
+    "frame": {
+      "dmtype": "coords:SpaceFrame",
+      "dmrole": "coords:PhysicalCoordSys.frame",
       "spaceRefFrame": {
         "value": "ICRS"
       },
-      "SpaceFrame_refPosition": {
-        "dmtype": "StdRefLocation",
-        "dmrole": "refPosition",
+      "refPosition": {
+        "dmtype": "coords:StdRefLocation",
+        "dmrole": "coords:SpaceFrame.refPosition",
         "position": {
           "value": "BARYCENTER"
         }

diff --git a/pyvo/mivot/tests/test_mivot_writer.py b/pyvo/mivot/tests/test_mivot_writer.py
@@ -190,7 +190,10 @@ def test_MivotInstanceAll():
 
     mv = MivotViewer(votable)
     print(mv.dm_instance)
-    assert mv.dm_instance.to_dict == DictUtils.read_dict_from_file(
+    assert mv.dm_instance.to_dict() == DictUtils.read_dict_from_file(
         os.path.join(data_path, "reference/test_mivot_writer.json")
     )
     votable.to_xml(data_path + "/essai.xml")
+
+if __name__ == "__main__":
+    test_MivotInstanceAll()