adding a few more tests for error conditions. also making code style fixes.

Author: Clara Brasseur

astroquery/mast/cutouts.py

@@ -133,8 +133,8 @@ def get_sectors(self, coordinates=None, radius=0*u.deg, objectname=None, moving_
             or TIC ID (objectname="TIC 141914082").
             One and only one of coordinates, objectname, moving_target must be supplied.
         moving_target : str, optional
-            The name or ID (as understood by the 
-            `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) 
+            The name or ID (as understood by the
+            `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__)
             of a moving target such as an asteroid or comet.
             One and only one of coordinates, objectname, and moving_target must be supplied.
         mt_type : str, optional
@@ -150,7 +150,7 @@ def get_sectors(self, coordinates=None, radius=0*u.deg, objectname=None, moving_
 
         if moving_target:
 
-            # Check only ony object designator has been passed in 
+            # Check only ony object designator has been passed in
             if objectname or coordinates:
                 raise InvalidQueryError("Only one of objectname, coordinates, and moving_target may be specified.")
 
@@ -163,7 +163,7 @@ def get_sectors(self, coordinates=None, radius=0*u.deg, objectname=None, moving_
             response = self._service_api_connection.service_request_async("mt_sector", params)
 
         else:
-            
+
             # Get Skycoord object for coordinates/object
             coordinates = parse_input_location(coordinates, objectname)
 
@@ -176,8 +176,8 @@ def get_sectors(self, coordinates=None, radius=0*u.deg, objectname=None, moving_
 
             response = self._service_api_connection.service_request_async("sector", params)
 
-        # Raise any errors 
-        response.raise_for_status()  
+        # Raise any errors
+        response.raise_for_status()
 
         sector_json = response.json()['results']
         sector_dict = {'sectorName': [],
@@ -232,8 +232,8 @@ def download_cutouts(self, coordinates=None, size=5, sector=None, path=".", infl
             or TIC ID (objectname="TIC 141914082").
             One and only one of coordinates, objectname, and moving_target must be supplied.
         moving_target : str, optional
-            The name or ID (as understood by the 
-            `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) 
+            The name or ID (as understood by the
+            `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__)
             of a moving target such as an asteroid or comet.
             One and only one of coordinates, objectname, and moving_target must be supplied.
         mt_type : str, optional
@@ -247,23 +247,23 @@ def download_cutouts(self, coordinates=None, size=5, sector=None, path=".", infl
         """
 
         if moving_target:
-            # Check only ony object designator has been passed in 
+            # Check only ony object designator has been passed in
             if objectname or coordinates:
                 raise InvalidQueryError("Only one of objectname, coordinates, and moving_target may be specified.")
-            
+
             astrocut_request = f"moving_target/astrocut?obj_id={moving_target}"
             if mt_type:
                 astrocut_request += f"&obj_type={mt_type}"
         else:
             # Get Skycoord object for coordinates/object
             coordinates = parse_input_location(coordinates, objectname)
-            
+
             astrocut_request = f"astrocut?ra={coordinates.ra.deg}&dec={coordinates.dec.deg}"
 
         # Adding the arguments that are common between moving/still astrocut requests
         size_dict = _parse_cutout_size(size)
         astrocut_request += f"&y={size_dict['y']}&x={size_dict['x']}&units={size_dict['units']}"
-        
+
         if sector:
             astrocut_request += "&sector={}".format(sector)
 
@@ -325,8 +325,8 @@ def get_cutouts(self, coordinates=None, size=5, sector=None,
             or TIC ID (objectname="TIC 141914082").
             One and only one of coordinates, objectname, and moving_target must be supplied.
         moving_target : str, optional
-            The name or ID (as understood by the 
-            `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) 
+            The name or ID (as understood by the
+            `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__)
             of a moving target such as an asteroid or comet.
             One and only one of coordinates, objectname, and moving_target must be supplied.
         mt_type : str, optional
@@ -345,10 +345,10 @@ def get_cutouts(self, coordinates=None, size=5, sector=None,
         # Add sector if present
         if sector:
             param_dict["sector"] = sector
-        
+
         if moving_target:
 
-            # Check only on object designator has been passed in 
+            # Check only on object designator has been passed in
             if objectname or coordinates:
                 raise InvalidQueryError("Only one of objectname, coordinates, and moving_target may be specified.")
 
@@ -361,13 +361,13 @@ def get_cutouts(self, coordinates=None, size=5, sector=None,
             response = self._service_api_connection.service_request_async("mt_astrocut", param_dict)
 
         else:
-        
+
             # Get Skycoord object for coordinates/object
             coordinates = parse_input_location(coordinates, objectname)
- 
+
             param_dict["ra"] = coordinates.ra.deg
             param_dict["dec"] = coordinates.dec.deg
-            
+
             response = self._service_api_connection.service_request_async("astrocut", param_dict)
 
         response.raise_for_status()  # Raise any errors

astroquery/mast/observations.py

@@ -572,7 +572,7 @@ def download_file(self, uri, local_path=None, base_url=None, cache=True, cloud_o
                         self._download_file(data_url, local_path,
                                             cache=cache, head_safe=True, continuation=False)
             else:
-                
+
                 self._download_file(data_url, local_path,
                                     cache=cache, head_safe=True, continuation=False)
 

astroquery/mast/tests/test_mast.py

@@ -13,7 +13,7 @@
 import astropy.units as u
 
 from ...utils.testing_tools import MockResponse
-from ...exceptions import (InvalidQueryError, InputWarning)
+from ...exceptions import InvalidQueryError, InputWarning
 
 from ... import mast
 
@@ -598,6 +598,17 @@ def test_tesscut_get_sector(patch_post):
     assert sector_table['camera'][0] == 1
     assert sector_table['ccd'][0] == 3
 
+    # Testing catch for multiple designators'
+    error_str = "Only one of objectname, coordinates, and moving_target may be specified."
+
+    with pytest.raises(InvalidQueryError) as invalid_query:
+        mast.Tesscut.get_sectors(moving_target="Ceres", coordinates=coord)
+    assert error_str in str(invalid_query.value)
+
+    with pytest.raises(InvalidQueryError) as invalid_query:
+        mast.Tesscut.get_sectors(moving_target="Ceres", objectname="M103")
+    assert error_str in str(invalid_query.value)
+
 
 def test_tesscut_download_cutouts(patch_post, tmpdir):
 
@@ -632,6 +643,17 @@ def test_tesscut_download_cutouts(patch_post, tmpdir):
     assert manifest["Local Path"][0][-4:] == "fits"
     assert os.path.isfile(manifest[0]['Local Path'])
 
+    # Testing catch for multiple designators'
+    error_str = "Only one of objectname, coordinates, and moving_target may be specified."
+
+    with pytest.raises(InvalidQueryError) as invalid_query:
+        mast.Tesscut.download_cutouts(moving_target="Eleonora", coordinates=coord, size=5, path=str(tmpdir))
+    assert error_str in str(invalid_query.value)
+
+    with pytest.raises(InvalidQueryError) as invalid_query:
+        mast.Tesscut.download_cutouts(moving_target="Eleonora", objectname="M103", size=5, path=str(tmpdir))
+    assert error_str in str(invalid_query.value)
+
 
 def test_tesscut_get_cutouts(patch_post, tmpdir):
 
@@ -653,6 +675,17 @@ def test_tesscut_get_cutouts(patch_post, tmpdir):
     assert len(cutout_hdus_list) == 1
     assert isinstance(cutout_hdus_list[0], fits.HDUList)
 
+    # Testing catch for multiple designators'
+    error_str = "Only one of objectname, coordinates, and moving_target may be specified."
+
+    with pytest.raises(InvalidQueryError) as invalid_query:
+        mast.Tesscut.get_cutouts(moving_target="Eleonora", coordinates=coord, size=5)
+    assert error_str in str(invalid_query.value)
+
+    with pytest.raises(InvalidQueryError) as invalid_query:
+        mast.Tesscut.get_cutouts(moving_target="Eleonora", objectname="M103", size=5)
+    assert error_str in str(invalid_query.value)
+
 
 ######################
 # ZcutClass tests #

astroquery/mast/tests/test_mast_remote.py

@@ -197,8 +197,8 @@ def test_observations_query_criteria_count(self):
 
     # product functions
     def test_observations_get_product_list_async(self):
- 
-        test_obs = mast.Observations.query_criteria(filters=["NUV","FUV"],objectname="M101")
+
+        test_obs = mast.Observations.query_criteria(filters=["NUV", "FUV"], objectname="M101")
 
         responses = mast.Observations.get_product_list_async(test_obs[0]["obsid"])
         assert isinstance(responses, list)
@@ -247,12 +247,8 @@ def test_observations_get_product_list(self):
         result = mast.Observations.get_product_list(observations[obsLocs])
         obs_collection = np.unique(list(result['obs_collection']))
         assert isinstance(result, Table)
-<<<<<<< HEAD
         assert len(obs_collection) == 1
         assert obs_collection[0] == 'IUE'
-=======
-        assert len(result) > 10
->>>>>>> adding moving tesscut tests
 
     def test_observations_filter_products(self):
         observations = mast.Observations.query_object("M8", radius=".04 deg")
@@ -714,7 +710,6 @@ def test_tesscut_get_sectors(self):
         assert sector_table['camera'][0] == 1
         assert sector_table['ccd'][0] == 1
 
-
     def test_tesscut_download_cutouts(self, tmpdir):
 
         coord = SkyCoord(349.62609, -47.12424, unit="deg")
@@ -760,7 +755,6 @@ def test_tesscut_download_cutouts(self, tmpdir):
         assert manifest["Local Path"][0][-4:] == "fits"
         for row in manifest:
             assert os.path.isfile(row['Local Path'])
-        
 
     def test_tesscut_get_cutouts(self, tmpdir):
 
@@ -793,7 +787,6 @@ def test_tesscut_get_cutouts(self, tmpdir):
         assert len(cutout_hdus_list) == 1
         assert isinstance(cutout_hdus_list[0], fits.HDUList)
 
-        
     ###################
     # ZcutClass tests #
     ###################