TST: add more test coverage

Author: bsipocz

astroquery/ipac/irsa/core.py

@@ -59,6 +59,7 @@ def query_tap(self, query, *, maxrec=None):
         """
         log.debug(f'TAP query: {query}')
         return self.tap.search(query, language='ADQL', maxrec=maxrec)
+
     def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
                      radius=10 * u.arcsec, width=None, polygon=None,
                      get_query_payload=False, selcols=None,
@@ -77,13 +78,13 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
             be resolved on the server (see `here
             <https://irsa.ipac.caltech.edu/search_help.html>`_ for more
             details). Required if spatial is ``'Cone'`` or ``'Box'``. Optional
-            if spatial is ``'Polygon'``.
+            if spatial is ``'Polygon'`` or ``'All-Sky'``.
         catalog : str
             The catalog to be used. To list the available catalogs, use
             :meth:`~astroquery.ipac.irsa.IrsaClass.print_catalogs`.
         spatial : str
             Type of spatial query: ``'Cone'``, ``'Box'``, ``'Polygon'``, and
-            ``'All-Sky'``. If missing then defaults to ``'Cone'``.
+            ``'All-Sky'``. Defaults to ``'Cone'``.
         radius : str or `~astropy.units.Quantity` object, [optional for spatial is ``'Cone'``]
             The string must be parsable by `~astropy.coordinates.Angle`. The
             appropriate `~astropy.units.Quantity` object from
@@ -119,19 +120,10 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
         else:
             columns = selcols
 
-        adql = f'SELECT {columns} from {catalog}'
-
-        coords_icrs = parse_coordinates(coordinates).icrs
-        ra, dec = coords_icrs.ra.deg, coords_icrs.dec.deg
+        adql = f'SELECT {columns} FROM {catalog}'
 
         if spatial == 'All-Sky':
             where = ''
-        elif spatial == 'Cone':
-            where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
-                     f"CIRCLE('ICRS',{ra},{dec},{radius.to(u.deg).value}))=1")
-        elif spatial == 'Box':
-            where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
-                     f"BOX('ICRS',{ra},{dec},{width.to(u.deg).value},{width.to(u.deg).value}))=1")
         elif spatial == 'Polygon':
             try:
                 coordinates_list = [parse_coordinates(coord).icrs for coord in polygon]
@@ -147,10 +139,18 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
             coordinates_str = [f'{coord.ra.deg},{coord.dec.deg}' for coord in coordinates_list]
             where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
                      f"POLYGON('ICRS',{','.join(coordinates_str)}))=1")
-
         else:
-            raise ValueError("Unrecognized spatial query type. Must be one of "
-                             "'Cone', 'Box', 'Polygon', or 'All-Sky'.")
+            coords_icrs = parse_coordinates(coordinates).icrs
+            ra, dec = coords_icrs.ra.deg, coords_icrs.dec.deg
+            if spatial == 'Cone':
+                where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
+                         f"CIRCLE('ICRS',{ra},{dec},{radius.to(u.deg).value}))=1")
+            elif spatial == 'Box':
+                where = (" WHERE CONTAINS(POINT('ICRS',ra,dec),"
+                         f"BOX('ICRS',{ra},{dec},{width.to(u.deg).value},{width.to(u.deg).value}))=1")
+            else:
+                raise ValueError("Unrecognized spatial query type. Must be one of "
+                                 "'Cone', 'Box', 'Polygon', or 'All-Sky'.")
 
         adql += where
 

astroquery/ipac/irsa/tests/test_irsa.py

@@ -1,63 +1,32 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-import os
-import re
-import numpy as np
-
 import pytest
 from astropy.coordinates import SkyCoord
 from astropy.table import Table
 import astropy.units as u
 
-from astroquery.utils.mocks import MockResponse
-from astroquery.ipac.irsa import Irsa, conf
-from astroquery.ipac import irsa
-
-DATA_FILES = {'Cone': 'Cone.xml',
-              'Box': 'Box.xml',
-              'Polygon': 'Polygon.xml'}
+from astroquery.ipac.irsa import Irsa
+from astroquery.exceptions import InvalidQueryError
 
 OBJ_LIST = ["m31", "00h42m44.330s +41d16m07.50s",
             SkyCoord(l=121.1743 * u.deg, b=-21.5733 * u.deg, frame="galactic")]
 
 
-def data_path(filename):
-    data_dir = os.path.join(os.path.dirname(__file__), 'data')
-    return os.path.join(data_dir, filename)
-
-
-@pytest.fixture
-def patch_get(request):
-    mp = request.getfixturevalue("monkeypatch")
-
-    mp.setattr(Irsa, '_request', get_mockreturn)
-    return mp
-
-
-def get_mockreturn(method, url, params=None, timeout=10, cache=False, **kwargs):
-    filename = data_path(DATA_FILES[params['spatial']])
-    with open(filename, 'rb') as infile:
-        content = infile.read()
-    return MockResponse(content, **kwargs)
-
-
-#def test_args_to_payload():
-#    out = Irsa._args_to_payload("fp_psc")
-#    assert out == dict(catalog='fp_psc', outfmt=3, outrows=conf.row_limit,
-#                       selcols='')
-
-
 @pytest.mark.parametrize(("coordinates"), OBJ_LIST)
-def test_query_region_cone(coordinates, patch_get):
-    result = Irsa.query_region(
-        coordinates, catalog='fp_psc', spatial='Cone', radius=2 * u.arcmin)
+def test_query_region_cone(coordinates):
+    query = Irsa.query_region(coordinates, catalog='fp_psc', spatial='Cone', radius=2 * u.arcmin,
+                              get_query_payload=True)
 
-    assert isinstance(result, Table)
+    # We don't fully float compare in this string, there are slight differences due to the name-coordinate
+    # resolution and conversions
+    assert "SELECT * FROM fp_psc WHERE CONTAINS(POINT('ICRS',ra,dec),CIRCLE('ICRS',10.68" in query
+    assert ",41.26" in query
+    assert ",0.0333" in query
 
 
 @pytest.mark.skip("Upstream TAP doesn't support Box geometry yet")
 @pytest.mark.parametrize("coordinates", OBJ_LIST)
-def test_query_region_box(coordinates, patch_get):
+def test_query_region_box(coordinates):
     result = Irsa.query_region(
         coordinates, catalog='fp_psc', spatial='Box', width=2 * u.arcmin)
 
@@ -72,10 +41,22 @@ def test_query_region_box(coordinates, patch_get):
 
 
 @pytest.mark.parametrize("polygon", [poly1, poly2])
-def test_query_region_polygon(polygon, patch_get):
-    result = Irsa.query_region("m31", catalog="fp_psc", spatial="Polygon", polygon=polygon)
+def test_query_region_polygon(polygon):
+    query1 = Irsa.query_region(catalog="fp_psc", spatial="Polygon", polygon=polygon,
+                               get_query_payload=True)
+    query2 = Irsa.query_region("m31", catalog="fp_psc", spatial="Polygon", polygon=polygon,
+                               get_query_payload=True)
+
+    assert query1 == query2
+    assert query1 == ("SELECT * FROM fp_psc "
+                      "WHERE CONTAINS(POINT('ICRS',ra,dec),POLYGON('ICRS',10.1,10.1,10.0,10.1,10.0,10.0))=1")
 
-    assert isinstance(result, Table)
+
+def test_query_allsky():
+    query1 = Irsa.query_region(catalog="fp_psc", spatial="All-Sky", get_query_payload=True)
+    query2 = Irsa.query_region("m31", catalog="fp_psc", spatial="All-Sky", get_query_payload=True)
+
+    assert query1 == query2 == "SELECT * FROM fp_psc"
 
 
 @pytest.mark.parametrize('spatial', ['cone', 'box', 'polygon', 'all-Sky', 'All-sky', 'invalid'])
@@ -84,6 +65,11 @@ def test_spatial_invalid(spatial):
         Irsa.query_region("m31", catalog='invalid_spatial', spatial=spatial)
 
 
+def test_no_catalog():
+    with pytest.raises(InvalidQueryError):
+        Irsa.query_region("m31", spatial='Cone')
+
+
 def test_deprecated_namespace_import_warning():
     with pytest.warns(DeprecationWarning):
         import astroquery.irsa  # noqa: F401

astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -1,11 +1,16 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-
 import pytest
 import astropy.units as u
 from astropy.table import Table
 from astropy.coordinates import SkyCoord
 
+try:
+    # This requires pyvo 1.4
+    from pyvo.dal.exceptions import DALOverflowWarning
+except ImportError:
+    pass
+
 from astroquery.ipac.irsa import Irsa
 
 
@@ -56,3 +61,11 @@ def test_list_catalogs(self):
         # Number of available catalogs may change over time, test only for significant drop.
         # (at the time of writing there are 933 tables in the list).
         assert len(catalogs) > 900
+
+    def test_tap(self):
+        query = "SELECT TOP 5 ra,dec FROM cosmos2015"
+        with pytest.warns(expected_warning=DALOverflowWarning,
+                          match="Partial result set. Potential causes MAXREC, async storage space, etc."):
+            result = Irsa.query_tap(query=query)
+        assert len(result) == 5
+        assert result.colnames == ['ra', 'dec']