restoring test coverage

Author: weaverba137

astroquery/sdss/core.py

@@ -339,21 +339,21 @@ def query_region_async(self, coordinates, *, radius=None,
 
         if width is not None:
             if isinstance(width, Angle):
-                width = width.to_value(u.arcmin)
+                width = width.to_value(u.degree)
             else:
                 try:
-                    width = Angle(width).to_value(u.arcmin)
+                    width = Angle(width).to_value(u.degree)
                 except ValueError:
                     raise TypeError("width should be either Quantity or "
                                     "convertible to float.")
             if height is None:
                 height = width
             else:
                 if isinstance(height, Angle):
-                    height = height.to_value(u.arcmin)
+                    height = height.to_value(u.degree)
                 else:
                     try:
-                        height = Angle(height).to_value(u.arcmin)
+                        height = Angle(height).to_value(u.degree)
                     except ValueError:
                         raise TypeError("height should be either Quantity or "
                                         "convertible to float.")
@@ -378,16 +378,8 @@ def query_region_async(self, coordinates, *, radius=None,
             for n, target in enumerate(coordinates):
                 # Query for a rectangle
                 target = commons.parse_coordinates(target).transform_to('fk5')
+                rectangles.append(self._rectangle_sql(target.ra.degree, target.dec.degree, width, height=height))
 
-                ra = target.ra.degree
-                dec = target.dec.degree
-                dra = Angle(width).to('degree').value / 2.0
-                ddec = Angle(height).to('degree').value / 2.0
-                rectangles.append('((p.ra BETWEEN {0:g} AND {1:g}) '
-                                  'AND (p.dec BETWEEN {2:g} AND {3:g}))'.format(ra - dra,
-                                                                                ra + dra,
-                                                                                dec - ddec,
-                                                                                dec + ddec))
             rect = ' OR '.join(rectangles)
             if 'WHERE' in sql_query:
                 sql_query += f' AND ({rect})'

astroquery/sdss/tests/test_sdss.py

@@ -123,26 +123,26 @@ def data_path(filename):
 # interfaces are supported for DR11."
 def url_tester(data_release):
     if data_release < 10:
-        baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_sql.asp'
+        baseurl = f'https://skyserver.sdss.org/dr{data_release}/en/tools/search/x_sql.asp'
     if data_release == 10:
-        baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_sql.aspx'
+        baseurl = f'https://skyserver.sdss.org/dr{data_release}/en/tools/search/x_sql.aspx'
     if data_release == 11:
         return
     if data_release >= 12:
-        baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_results.aspx'
-    assert sdss.SDSS._last_url == baseurl.format(data_release)
+        baseurl = f'https://skyserver.sdss.org/dr{data_release}/en/tools/search/x_results.aspx'
+    assert sdss.SDSS._last_url == baseurl
 
 
 def url_tester_crossid(data_release):
     if data_release < 10:
-        baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.asp'
+        baseurl = f'https://skyserver.sdss.org/dr{data_release}/en/tools/crossid/x_crossid.asp'
     if data_release == 10:
-        baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.aspx'
+        baseurl = f'https://skyserver.sdss.org/dr{data_release}/en/tools/crossid/x_crossid.aspx'
     if data_release == 11:
         return
     if data_release >= 12:
-        baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/X_Results.aspx'
-    assert sdss.SDSS._last_url == baseurl.format(data_release)
+        baseurl = f'https://skyserver.sdss.org/dr{data_release}/en/tools/search/X_Results.aspx'
+    assert sdss.SDSS._last_url == baseurl
 
 
 def compare_xid_data(xid, data):
@@ -270,22 +270,31 @@ def test_sdss_photoobj(patch_request, dr):
         compare_xid_data(xid, data)
         url_tester(dr)
 
-
 @pytest.mark.parametrize("dr", dr_list)
-def test_list_coordinates(patch_request, dr):
-    xid = sdss.SDSS.query_region(coords_list, radius=Angle('2 arcsec'), data_release=dr)
-
-    with warnings.catch_warnings():
-        if sys.platform.startswith('win'):
-            warnings.filterwarnings("ignore", category=AstropyWarning,
-                                    message=r'OverflowError converting.*')
-        data = Table.read(data_path(DATA_FILES['images_id']),
-                          format='ascii.csv', comment='#')
-
-        data['objid'] = data['objid'].astype(np.int64)
-
-        compare_xid_data(xid, data)
-        url_tester_crossid(dr)
+@pytest.mark.parametrize("radius", [None, Angle('2 arcsec')])
+@pytest.mark.parametrize("width", [None, Angle('2 arcsec')])
+def test_list_coordinates(patch_request, dr, radius, width):
+    if (radius is None and width is None) or (radius is not None and width is not None):
+        with pytest.raises(ValueError) as e:
+            sdss.SDSS.query_region(coords, radius=radius, width=width)
+        assert str(e.value) == "Either radius or width must be selected!"
+    else:
+        xid = sdss.SDSS.query_region(coords_list, radius=radius, width=width, data_release=dr)
+
+        with warnings.catch_warnings():
+            if sys.platform.startswith('win'):
+                warnings.filterwarnings("ignore", category=AstropyWarning,
+                                        message=r'OverflowError converting.*')
+            data = Table.read(data_path(DATA_FILES['images_id']),
+                            format='ascii.csv', comment='#')
+
+            data['objid'] = data['objid'].astype(np.int64)
+
+            compare_xid_data(xid, data)
+            if width is None:
+                url_tester_crossid(dr)
+            else:
+                url_tester(dr)
 
 
 @pytest.mark.parametrize("dr", dr_list)
@@ -305,7 +314,7 @@ def test_column_coordinates(patch_request, dr):
         url_tester_crossid(dr)
 
 
-def test_query_timeout(patch_request_slow, coord=coords):
+def test_query_timeout(patch_request_slow):
     with pytest.raises(TimeoutError):
         sdss.SDSS.query_region(coords, radius=Angle('2 arcsec'), timeout=1)