Fixed change requests and added unit tests for cone_search_criteria

Author: javier-ballester

astroquery/esa/hubble/core.py

@@ -42,7 +42,6 @@ class ESAHubbleClass(BaseQuery):
                           3: "PRODUCT"}
     product_types = ["PRODUCT", "SCIENCE_PRODUCT", "POSTCARD"]
     copying_string = "Copying file to {0}..."
-    obs_id_none = "Please input an observation id"
 
     def __init__(self, tap_handler=None):
         super(ESAHubbleClass, self).__init__()
@@ -182,7 +181,7 @@ def get_observation_type(self, observation_id):
         String with the observation type
         """
         if observation_id is None:
-            raise ValueError(self.obs_id_none)
+            raise ValueError("Please input an observation id")
 
         query = f"select obs_type from ehst.observation where observation_id='{observation_id}'"
         job = self.query_hst_tap(query=query)
@@ -466,14 +465,11 @@ def cone_search_criteria(self, radius, target=None,
                             "parameter.")
         if target:
             coord = self._query_tap_target(target)
-            ra = coord.get('RA_DEGREES')
-            dec = coord.get('DEC_DEGREES')
-
-            # ra, dec = self._query_tap_target(target)
         else:
             coord = self._getCoordInput(coordinates)
-            ra = coord.ra.deg
-            dec = coord.dec.deg
+
+        ra = coord.ra.deg
+        dec = coord.dec.deg
 
         if type(radius) == int or type(radius) == float:
             radius_in_grades = Angle(radius, units.arcmin).deg
@@ -505,7 +501,6 @@ def _query_tap_target(self, target):
             ra = target_result['RA_DEGREES']
             dec = target_result['DEC_DEGREES']
             return SkyCoord(ra=ra, dec=dec, unit="deg")
-            # return ra, dec
         except KeyError as e:
             raise ValueError("This target cannot be resolved")
 

astroquery/esa/hubble/tests/test_esa_hubble.py

@@ -386,7 +386,7 @@ def test_cone_search_criteria(self):
                                "'%WFPC2%') AND (o.instrument_configuration " \
                                "LIKE '%F606W%'))"
         ehst.query_criteria = MagicMock(return_value=query_criteria_query)
-        target = {'RA_DEGREES': '10.6847083', 'DEC_DEGREES': '41.26875'}
+        target = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs')
         ehst._query_tap_target = MagicMock(return_value=target)
         ehst.cone_search_criteria(target=parameters1['target'],
                                   radius=parameters1['radius'],
@@ -602,3 +602,30 @@ def test_get_member_observations_invalid_id_valueerror(self, mock_observation_ty
             ehst = ESAHubbleClass(self.get_dummy_tap_handler())
             dummy_obs_id = "1234"
             ehst.get_member_observations(dummy_obs_id)
+
+    @patch.object(ESAHubbleClass, 'query_criteria')
+    @patch.object(ESAHubbleClass, '_query_tap_target')
+    @patch.object(ESAHubbleClass, 'query_hst_tap')
+    def test_cone_search_criteria_only_target(self, mock_query_hst_tap, mock__query_tap_target, mock_query_criteria):
+        mock_query_criteria.return_value = "Simple query"
+        mock__query_tap_target.return_value = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs')
+        mock_query_hst_tap.return_value = "table"
+        ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+        oids = ehst.cone_search_criteria(target="m11", radius=1)
+        assert oids == 'table'
+
+    @patch.object(ESAHubbleClass, 'query_criteria')
+    @patch.object(ESAHubbleClass, 'query_hst_tap')
+    def test_cone_search_criteria_only_coordinates(self, mock_query_hst_tap, mock_query_criteria):
+        mock_query_criteria.return_value = "Simple query"
+        mock_query_hst_tap.return_value = "table"
+        ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+        oids = ehst.cone_search_criteria(coordinates="00h42m44.51s +41d16m08.45s", radius=1)
+        assert oids == 'table'
+
+    @patch.object(ESAHubbleClass, 'query_criteria')
+    def test_cone_search_criteria_typeerror(self, mock_query_criteria):
+        mock_query_criteria.return_value = "Simple query"
+        with pytest.raises(TypeError):
+            ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+            ehst.cone_search_criteria(coordinates="00h42m44.51s +41d16m08.45s", target="m11", radius=1)