Added new tests + fixed old ones

Author: imbasimba

astroquery/esasky/tests/test_esasky_remote.py

@@ -4,7 +4,8 @@
 import shutil
 import pytest
 from astroquery import log
-
+from astroquery.utils.tap.model.taptable import TapTableMeta
+from astroquery.utils.tap.model.tapcolumn import TapColumn
 from astroquery.utils.commons import TableList
 from astropy.io.fits.hdu.hdulist import HDUList
 
@@ -108,8 +109,8 @@ def test_esasky_get_spectra_obs_id(self):
         missions = ["ISO-IR", "Chandra", "IUE", "XMM-NEWTON", "HST-IR", "Herschel", "HST-UV", "HST-OPTICAL"]
 
         result = ESASkyClass.get_spectra(observation_ids=["02101201", "1005", "LWR13178", "0001730201", "ibh706cqq",
-                                                "1342253595", "z1ax0102t", "oeik2s020"],
-                               missions=missions, download_dir=download_directory)
+                                                          "1342253595", "z1ax0102t", "oeik2s020"],
+                                         missions=missions, download_dir=download_directory)
 
         for mission in missions:
             file_path = os.path.join(download_directory, mission)
@@ -126,11 +127,11 @@ def test_esasky_get_spectra_obs_id(self):
         shutil.rmtree(download_directory)
 
     def test_esasky_query_region_maps(self):
-        result = ESASkyClass.query_region_maps("M51", "5 arcmin")
+        result = ESASkyClass.query_region_maps(position="M51", radius="5 arcmin")
         assert isinstance(result, TableList)
 
     def test_esasky_query_object_maps(self):
-        result = ESASkyClass.query_object_maps("M51")
+        result = ESASkyClass.query_object_maps(position="M51")
         assert isinstance(result, TableList)
 
     @pytest.mark.bigdata
@@ -145,7 +146,7 @@ def test_esasky_get_images(self):
         missions = [mission for mission in missions if mission not in
                     ("HST-OPTICAL", "HST-IR", "HST-UV", "XMM-OM-UV", "INTEGRAL", "SUZAKU", "ALMA", "AKARI")]
 
-        ESASkyClass.get_images("M51", missions=missions, download_dir=download_directory)
+        ESASkyClass.get_images(position="M51", missions=missions, download_dir=download_directory)
 
         for mission in missions:
             file_path = os.path.join(download_directory, mission)
@@ -161,7 +162,7 @@ def test_esasky_get_images_small(self):
         # ISO is only ~ 163 kB
         missions = ['ISO-IR']
 
-        ESASkyClass.get_images("M6", radius="12arcmin", missions=missions, download_dir=download_directory)
+        ESASkyClass.get_images(position="M6", radius="12arcmin", missions=missions, download_dir=download_directory)
 
         for mission in missions:
             file_path = os.path.join(download_directory, mission)
@@ -175,19 +176,19 @@ def test_esasky_get_images_hst(self):
         if not os.path.exists(download_directory):
             os.makedirs(download_directory)
 
-        ESASkyClass.get_images("M11", radius="2.1 deg", missions="HST-UV", download_dir=download_directory)
+        ESASkyClass.get_images(position="M11", radius="2.1 deg", missions="HST-UV", download_dir=download_directory)
 
         file_path = os.path.join(download_directory, "HST-UV")
         assert os.path.exists(file_path)
 
         shutil.rmtree(download_directory)
 
     def test_esasky_query_region_catalogs(self):
-        result = ESASkyClass.query_region_catalogs("M51", "5 arcmin")
+        result = ESASkyClass.query_region_catalogs(position="M51", radius="5 arcmin")
         assert isinstance(result, TableList)
 
     def test_esasky_query_object_catalogs(self):
-        result = ESASkyClass.query_object_catalogs("M51")
+        result = ESASkyClass.query_object_catalogs(position="M51")
         assert isinstance(result, TableList)
 
     def test_esasky_get_maps(self):
@@ -197,8 +198,8 @@ def test_esasky_get_maps(self):
 
         file_path = os.path.join(download_directory, 'ISO-IR')
 
-        all_maps = ESASkyClass.query_object_maps("M51")
-        iso_maps = ESASkyClass.query_object_maps("M51", missions='ISO-IR')
+        all_maps = ESASkyClass.query_object_maps(position="M51")
+        iso_maps = ESASkyClass.query_object_maps(position="M51", missions='ISO-IR')
         # Remove a few maps, so the other list will have downloadable ones, too
         iso_maps['ISO-IR'].remove_rows([0, 1])
         ESASkyClass.get_maps(iso_maps, download_dir=download_directory)
@@ -211,11 +212,11 @@ def test_esasky_get_maps(self):
         shutil.rmtree(download_directory)
 
     def test_esasky_query_region_spectra(self):
-        result = ESASkyClass.query_region_spectra("M51", "5 arcmin")
+        result = ESASkyClass.query_region_spectra(position="M51", radius="5 arcmin")
         assert isinstance(result, TableList)
 
     def test_esasky_query_object_spectra(self):
-        result = ESASkyClass.query_object_spectra("M51")
+        result = ESASkyClass.query_object_spectra(position="M51")
         assert isinstance(result, TableList)
 
     @pytest.mark.bigdata
@@ -242,7 +243,7 @@ def test_esasky_get_spectra_small(self):
 
         missions = ['HST-IR']
 
-        ESASkyClass.get_spectra("M1", radius="9arcmin", missions=missions, download_dir=download_directory)
+        ESASkyClass.get_spectra(position="M1", radius="9arcmin", missions=missions, download_dir=download_directory)
 
         for mission in missions:
             file_path = os.path.join(download_directory, mission)
@@ -257,15 +258,34 @@ def test_esasky_get_spectra_from_table(self):
 
         file_path = os.path.join(download_directory, 'ISO-IR')
 
-        all_spectra = ESASkyClass.query_object_spectra("M51")
-        iso_spectra = ESASkyClass.query_object_spectra("M51", missions='ISO-IR')
+        all_spectra = ESASkyClass.query_object_spectra(position="M51")
+        iso_spectra = ESASkyClass.query_object_spectra(position="M51", missions='ISO-IR')
         # Remove a few maps, so the other list will have downloadable ones, too
         iso_spectra['ISO-IR'].remove_rows([0, 1])
-        ESASkyClass.get_spectra_from_table(iso_spectra, download_dir=download_directory)
+        ESASkyClass.get_spectra_from_table(query_table_list=iso_spectra, download_dir=download_directory)
         assert len(os.listdir(file_path)) == len(all_spectra['ISO-IR']) - 2
 
         iso_spectra2 = dict({'ISO-IR': all_spectra['ISO-IR'][:2]})
-        ESASkyClass.get_spectra_from_table(iso_spectra2, download_dir=download_directory)
+        ESASkyClass.get_spectra_from_table(query_table_list=iso_spectra2, download_dir=download_directory)
         assert len(os.listdir(file_path)) == len(all_spectra['ISO-IR'])
 
         shutil.rmtree(download_directory)
+
+    def test_query(self):
+        result = ESASkyClass.query(query="SELECT * from observations.mv_v_esasky_xmm_om_uv_fdw")
+        assert len(result) == 2000  # Default row limit is 2000
+    
+    def test_get_tables(self):
+        table_names = ESASkyClass.get_tables(only_names=True)
+        assert len(table_names) > 70
+        tables = ESASkyClass.get_tables(only_names=False)
+        assert isinstance(tables[0], TapTableMeta)
+        assert len(table_names) == len(tables)
+    
+    def test_get_columns(self):
+        column_names = ESASkyClass.get_columns(table_name='observations.mv_v_esasky_xmm_om_uv_fdw', only_names=True)
+        assert len(column_names) == 17
+    
+        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)