Added tests for ESASky SSO feature

Author: imbasimba

astroquery/esasky/core.py

@@ -493,15 +493,15 @@ def query_sso_maps(self, sso_name, *, sso_type="ALL", missions=__ALL_STRING,
                            'Allowed values are {}.\n'.format(', '.join(map(str, self.SSO_TYPES)))
             if sso_type != 'ALL':
                 type_text = ' and type {}'.format(sso_type)
-            log.info('Found {num_sso} SSO\'s with name: {sso_name}{type_text}.\n'
-                     'Try narrowing your search by typing a more specific sso_name.\n{specify_type}'
-                     'The following SSO\'s were found:\n{found_ssos}'
-                     .format(num_sso=len(sso),
-                             sso_name=sso_name,
-                             type_text=type_text,
-                             specify_type=specify_type,
-                             found_ssos='\n'.join(map(str, sso)))
-                     )
+            raise ValueError('Found {num_sso} SSO\'s with name: {sso_name}{type_text}.\n'
+                             'Try narrowing your search by typing a more specific sso_name.\n{specify_type}'
+                             'The following SSO\'s were found:\n{found_ssos}'
+                             .format(num_sso=len(sso),
+                                     sso_name=sso_name,
+                                     type_text=type_text,
+                                     specify_type=specify_type,
+                                     found_ssos='\n'.join(map(str, sso)))
+                            )
             return None
 
         sanitized_missions = self._sanitize_input_sso_mission(missions)
@@ -513,7 +513,7 @@ def query_sso_maps(self, sso_name, *, sso_type="ALL", missions=__ALL_STRING,
         query_result = {}
 
         sso_type = self._get_sso_db_type(sso['sso_type'])
-        sso_db_identifier = self._get_db_sso_identifier(self._get_db_sso_identifier(sso['sso_type']))
+        sso_db_identifier = self._get_db_sso_identifier(sso['sso_type'])
         for name in sanitized_missions:
             data_table = self._find_mission_tap_table_name(sso_json, name)
             mission_json = self._find_mission_parameters_in_json(data_table, sso_json)
@@ -528,7 +528,7 @@ def query_sso_maps(self, sso_name, *, sso_type="ALL", missions=__ALL_STRING,
             if len(table) > 0:
                 query_result[name.upper()] = table
 
-        return query_result
+        return commons.TableList(query_result)
 
     def get_images_sso(self, *, sso_name=None, sso_type="ALL", table_list=None, missions=__ALL_STRING,
                        download_dir=_MAPS_DOWNLOAD_DIR, cache=True):
@@ -595,7 +595,7 @@ def get_images_sso(self, *, sso_name=None, sso_type="ALL", table_list=None, miss
         if sso_name is None and table_list is None:
             raise ValueError("An input is required for either sso_name or table.")
 
-        sanitized_missions = self._sanitize_input_sso_mission(missions)
+        sanitized_missions = [m.lower() for m in self._sanitize_input_sso_mission(missions)]
         sso_name = self._sanitize_input_sso_name(sso_name)
         sso_type = self._sanitize_input_sso_type(sso_type)
         if table_list is None:
@@ -1415,7 +1415,7 @@ def _sanitize_input_sso_mission(self, missions):
             else:
                 return [missions]
         raise ValueError("Mission must be either a string or a list of "
-                         "missions")
+                         "missions. Valid entries are found in list_sso()")
     def _get_sso_db_type(self, sso_type):
         sso_type = sso_type.lower()
         if sso_type == "asteroid" or sso_type == "dwarf_planet":

astroquery/esasky/tests/test_esasky_remote.py

@@ -289,3 +289,72 @@ def test_get_columns(self):
         columns = ESASkyClass.get_columns(table_name='observations.mv_v_esasky_xmm_om_uv_fdw', only_names=False)
         assert isinstance(columns[0], TapColumn)
         assert len(column_names) == len(columns)
+
+    def test_esasky_query_sso_maps(self):
+        result = ESASkyClass.query_sso_maps(sso_name="ceres")
+        assert isinstance(result, TableList)
+        assert "HST" in result.keys()
+        assert "XMM" in result.keys()
+        assert "HERSCHEL" in result.keys()
+        assert len(result["HST"]) >= 176
+
+        result = ESASkyClass.query_sso_maps(sso_name="ceres", missions="HST", row_limit=1)
+        assert isinstance(result, TableList)
+        assert "HST" in result.keys()
+        assert "XMM" not in result.keys()
+        assert "HERSCHEL" not in result.keys()
+        assert len(result["HST"]) == 1
+
+        result = ESASkyClass.query_sso_maps(sso_name="io", sso_type="SATELLITE", missions=["HST", "XMM"])
+        assert isinstance(result, TableList)
+        assert "HST" in result.keys()
+        assert "XMM" in result.keys()
+        assert "HERSCHEL" not in result.keys()
+
+    def test_esasky_query_sso_maps_ambiguous_name(self):
+        try:
+            ESASkyClass.query_sso_maps(sso_name="io")
+        except ValueError as err:
+            assert 'Try narrowing your search' in str(err)
+            return
+        assert False
+
+    def test_esasky_find_sso(self):
+        sso = ESASkyClass.find_sso(sso_name="Io")
+        assert len(sso) >= 2
+        assert "Io" in sso[0]['aliases'] or "Io" in sso[0]['sso_name']
+
+        sso = ESASkyClass.find_sso(sso_name="Io", sso_type="asteroid")
+        assert len(sso) >= 1
+        assert "Io" in sso[0]['aliases'] or "Io" in sso[0]['sso_name']
+        assert "ASTEROID" in sso[0]['sso_type']
+
+        assert ESASkyClass.find_sso(sso_name="Not an SSO") is None
+
+    def test_esasky_list_sso(self):
+        assert len(ESASkyClass.list_sso()) >= 3
+
+    def test_esasky_get_images_sso(self):
+        download_directory = "ESASkyRemoteTest"
+        if not os.path.exists(download_directory):
+            os.makedirs(download_directory)
+
+        table_list = ESASkyClass.query_sso_maps(sso_name="ceres")
+        assert "HERSCHEL" in table_list.keys()
+        fits_files = ESASkyClass.get_images_sso(table_list=table_list, missions="XMM",
+                                                download_dir=download_directory)
+        assert "HERSCHEL" not in fits_files
+        assert "XMM" in fits_files
+        assert isinstance(fits_files["XMM"][0], HDUList)
+
+        fits_files = ESASkyClass.get_images_sso(sso_name="ceres", missions="XMM",
+                                                download_dir=download_directory)
+        assert "HERSCHEL" not in fits_files
+        assert "XMM" in fits_files
+        assert isinstance(fits_files["XMM"][0], HDUList)
+
+        file_path = os.path.join(download_directory, "XMM")
+        assert os.path.exists(file_path)
+
+        fits_files = None
+        shutil.rmtree(download_directory)