BadRow->BlankResponse, and parametrize null result tests

Author: keflavich

astroquery/exceptions.py

@@ -114,7 +114,7 @@ class EmptyResponseError(ValueError):
     pass
 
 
-class BadRowWarning(AstropyWarning):
+class BlankResponseWarning(AstropyWarning):
     """
     Astroquery warning to be raised if one or more rows in a table are bad, but
     not all rows are.

astroquery/simbad/core.py

@@ -19,7 +19,7 @@
 
 from astroquery.query import BaseQuery
 from astroquery.utils import commons, async_to_sync
-from astroquery.exceptions import TableParseError, LargeQueryWarning, BadRowWarning
+from astroquery.exceptions import TableParseError, LargeQueryWarning, BlankResponseWarning
 from . import conf
 
 
@@ -136,7 +136,7 @@ def __warn(self):
                           "an error (recorded in the `errors` attribute "
                           "of the result table): %s" %
                           (error.line, error.msg),
-                          BadRowWarning
+                          BlankResponseWarning
                           )
 
     def __get_section(self, section_name):

astroquery/simbad/tests/test_simbad_remote.py

@@ -10,7 +10,7 @@
 from astroquery.simbad import Simbad
 # Maybe we need to expose SimbadVOTableResult to be in the public API?
 from astroquery.simbad.core import SimbadVOTableResult
-from astroquery.exceptions import BadRowWarning
+from astroquery.exceptions import BlankResponseWarning
 
 
 # M42 coordinates
@@ -149,7 +149,7 @@ def test_query_multi_object(self, temp_dir):
         assert len(result) == 2
         assert len(result.errors) == 0
 
-        with pytest.warns(BadRowWarning):
+        with pytest.warns(BlankResponseWarning):
             result = simbad.query_objects(['M32', 'M81', 'gHer'])
         # 'gHer' is not a valid Simbad identifier - it should be 'g Her' to
         # get the star
@@ -183,31 +183,23 @@ def test_query_object_ids(self, temp_dir):
     def test_null_response(self, temp_dir, function):
         simbad = Simbad()
         simbad.cache_location = temp_dir
-        with pytest.warns(BadRowWarning):
+        with pytest.warns(BlankResponseWarning):
             assert (simbad.__getattribute__(function)('idonotexist')
                     is None)
 
     # Special case of null test: list of nonexistent parameters
     def test_query_objects_null(self, temp_dir):
         simbad = Simbad()
         simbad.cache_location = temp_dir
-        with pytest.warns(BadRowWarning):
+        with pytest.warns(BlankResponseWarning):
             assert simbad.query_objects(['idonotexist', 'idonotexisteither']) is None
 
-    # Special case of null test: zero-sized region
-    def test_query_region_null(self, temp_dir):
+    # Special case of null test: zero-size and very small region
+    @pytest.mark.parametrize('radius', ["0d", 1.0*u.marcsec])
+    def test_query_region_null(self, temp_dir, radius):
         simbad = Simbad()
         simbad.cache_location = temp_dir
-        with pytest.warns(BadRowWarning):
-            result = simbad.query_region(SkyCoord("00h01m0.0s 00h00m0.0s"), radius="0d",
-                                         equinox=2000.0, epoch='J2000')
-        assert result is None
-
-    # Special case of null test: very small region
-    def test_query_small_region_null(self, temp_dir):
-        simbad = Simbad()
-        simbad.cache_location = temp_dir
-        with pytest.warns(BadRowWarning):
+        with pytest.warns(BlankResponseWarning):
             result = simbad.query_region(SkyCoord("00h01m0.0s 00h00m0.0s"), radius=1.0 * u.marcsec,
                                          equinox=2000.0, epoch='J2000')
         assert result is None