Coverage and HAP methods removed

Author: jespinosaar

astroquery/esa/hubble/core.py

@@ -609,88 +609,6 @@ def __check_list_strings(self, list):
             raise ValueError("One of the lists is empty or there are "
                              "elements that are not strings")
 
-    def get_hap_proposals(self, async_job=True, output_file=None,
-                          output_format="votable",
-                          verbose=False):
-        """Launches a synchronous or asynchronous job to extract ALL HAP
-        proposals
-
-        Parameters
-        ----------
-        async_job : bool, optional, default 'False'
-            executes the query (job) in asynchronous/synchronous mode (default
-            synchronous)
-        output_file : str, optional, default None
-            file name where the results are saved if dumpToFile is True.
-            If this parameter is not provided, the jobid is used instead
-        output_format : str, optional, default 'votable'
-            results format
-        verbose : bool, optional, default 'False'
-            flag to display information about the process
-
-        Returns
-        -------
-        A table object
-        """
-        query = "select distinct p.* from ehst.proposal as p LEFT JOIN "\
-                "ehst.observation as o on o.proposal_id = p.proposal_id "\
-                "where (p.proposal_type LIKE '%HAP%' AND o.observation_id "\
-                "like '%hst%' AND o.collection LIKE '%HST%') ORDER BY "\
-                "p.proposal_id DESC"
-        if verbose:
-            print(query)
-        job = self.query_hst_tap(query=query, async_job=async_job,
-                                 output_file=output_file,
-                                 output_format=output_format,
-                                 verbose=verbose)
-        try:
-            table = job.get_results()
-        except Exception:
-            raise ValueError('There are not HAP proposals in this DB')
-        return table
-
-    def get_hap_publications(self, async_job=False, output_file=None,
-                             output_format="votable",
-                             verbose=False):
-        """Launches a synchronous or asynchronous job to extract ALL HAP
-        publications
-
-        Parameters
-        ----------
-        async_job : bool, optional, default 'False'
-            executes the query (job) in asynchronous/synchronous mode (default
-            synchronous)
-        output_file : str, optional, default None
-            file name where the results are saved if dumpToFile is True.
-            If this parameter is not provided, the jobid is used instead
-        output_format : str, optional, default 'votable'
-            results format
-        verbose : bool, optional, default 'False'
-            flag to display information about the process
-
-        Returns
-        -------
-        A table object
-        """
-        query = "select distinct pb.* from ehst.publication as pb LEFT JOIN "\
-                "ehst.publication_proposal as pp on pp.bib_code = "\
-                "pb.bib_code LEFT JOIN ehst.proposal as p on pp.proposal_id="\
-                "p.proposal_id LEFT JOIN ehst.observation as o on "\
-                "o.proposal_id = p.proposal_id WHERE (p.proposal_type "\
-                "LIKE '%HAP%' AND o.observation_id like '%hst%' AND "\
-                "o.collection LIKE '%HST%') ORDER BY pb.bib_code DESC"
-        if verbose:
-            print(query)
-        job = self.query_hst_tap(query=query, async_job=async_job,
-                                 output_file=output_file,
-                                 output_format=output_format,
-                                 verbose=verbose)
-        try:
-            table = job.get_results()
-        except Exception:
-            raise ValueError('There are not HAP publications in this DB')
-        return table
-
     def get_tables(self, only_names=True, verbose=False):
         """Get the available table in EHST TAP service
 

astroquery/esa/hubble/tests/data/cone_search_m31_5.vot

@@ -48,6 +48,25 @@ def ehst_request(request):
     return mp
 
 
+def get_cone_mockreturn(method, request, url, params, *args, **kwargs):
+    file = data_path('cone_search_m31_5.vot')
+    if 'OBSERVATION_ID' in params:
+        file = params['OBSERVATION_ID'] + ".vot"
+    response = data_path(file)
+    shutil.copy(response + '.test', response)
+    return response
+
+
+@pytest.fixture(autouse=True)
+def ehst_cone_search(request):
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
+    mp.setattr(ESAHubbleClass, 'cone_search', get_cone_mockreturn)
+    return mp
+
+
 class TestESAHubble():
 
     def get_dummy_tap_handler(self):
@@ -101,7 +120,6 @@ def test_query_target(self):
         ehst.query_target(name=parameters['name'],
                           verbose=parameters['verbose'])
 
-    @pytest.mark.remote_data
     def test_cone_search(self):
         coords = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs')
 
@@ -113,7 +131,7 @@ def test_cone_search(self):
 
         parameters = {'coordinates': coords,
                       'radius': 0.0,
-                      'file_name': 'file_cone',
+                      'filename': 'file_cone',
                       'output_format': 'votable',
                       'cache': True}
 
@@ -126,39 +144,35 @@ def test_cone_search(self):
             ehst._request = MagicMock(return_value=response)
             ehst.cone_search(parameters['coordinates'],
                              parameters['radius'],
-                             parameters['file_name'],
+                             parameters['filename'],
                              parameters['output_format'],
                              parameters['cache'])
 
-    @pytest.mark.remote_data
     def test_cone_search_coords(self):
         coords = "00h42m44.51s +41d16m08.45s"
 
         parameterst = {'query': "select top 10 * from hsc_v2.hubble_sc2",
                        'output_file': "test2.vot",
                        'output_format': "votable",
-                       'verbose': False}
+                       'verbose': True}
         dummyTapHandler = DummyHubbleTapHandler("launch_job", parameterst)
 
         parameters = {'coordinates': coords,
                       'radius': 0.0,
-                      'file_name': 'file_cone',
+                      'filename': 'file_cone',
+                      'async_job': False,
                       'output_format': 'votable',
                       'cache': True}
 
         ehst = ESAHubbleClass(dummyTapHandler)
         ehst.cone_search(parameters['coordinates'],
                          parameters['radius'],
-                         parameters['file_name'],
+                         parameters['filename'],
                          parameters['output_format'],
+                         parameters['async_job'],
                          parameters['cache'])
-        parameters[coordinates] = 1234
         with pytest.raises(ValueError) as err:
-            ehst.cone_search(parameters['coordinates'],
-                             parameters['radius'],
-                             parameters['file_name'],
-                             parameters['output_format'],
-                             parameters['cache'])
+            ehst._getCoordInput(1234, 'coordinate')
         assert "coordinate must be either a string or "\
                "astropy.coordinates" in err.value.args[0]
 
@@ -192,6 +206,10 @@ def test_get_tables(self):
         ehst = ESAHubbleClass(self.get_dummy_tap_handler())
         ehst.get_tables(True, True)
 
+    def test_get_artifact(self):
+        ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+        ehst.get_artifact("w0ji0v01t_c2f.fits.gz")
+
     def test_get_columns(self):
         parameters = {'query': "select top 10 * from hsc_v2.hubble_sc2",
                       'output_file': "test2.vot",
@@ -367,6 +385,37 @@ def test_cone_search_criteria(self):
                                   verbose=parameters1['verbose'])
         dummy_tap_handler = DummyHubbleTapHandler("launch_job", parameters3)
         dummy_tap_handler.check_call("launch_job", parameters3)
+        c = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs')
+        ehst.cone_search_criteria(coordinates=c,
+                                  radius=parameters1['radius'],
+                                  data_product_type=parameters1
+                                  ['data_product_type'],
+                                  obs_collection=parameters1['obs_collection'],
+                                  instrument_name=parameters1
+                                  ['instrument_name'],
+                                  filters=parameters1['filters'],
+                                  async_job=parameters1['async_job'],
+                                  filename=parameters1['filename'],
+                                  output_format=parameters1['output_format'],
+                                  verbose=parameters1['verbose'])
+        with pytest.raises(TypeError) as err:
+            ehst.cone_search_criteria(target=parameters1['target'],
+                                      coordinates=123,
+                                      radius=parameters1['radius'],
+                                      data_product_type=parameters1
+                                      ['data_product_type'],
+                                      obs_collection=parameters1
+                                      ['obs_collection'],
+                                      instrument_name=parameters1
+                                      ['instrument_name'],
+                                      filters=parameters1['filters'],
+                                      async_job=parameters1['async_job'],
+                                      filename=parameters1['filename'],
+                                      output_format=parameters1
+                                      ['output_format'],
+                                      verbose=parameters1['verbose'])
+        assert "Please use only target or coordinates as"\
+            "parameter." in err.value.args[0]
 
     def test_query_criteria_no_params(self):
         ehst = ESAHubbleClass(self.get_dummy_tap_handler())