Codecov fixes and refactoring of dummy_handlers

Author: jespinosaar

astroquery/esa/hubble/tests/test_esa_hubble.py

@@ -106,6 +106,18 @@ def test_download_product_by_product_type(self):
                               product_type=parameters['product_type'],
                               filename=parameters['filename'],
                               verbose=parameters['verbose'])
+        parameters['product_type'] = "PRODUCT"
+        ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+        ehst.download_product(observation_id=parameters['observation_id'],
+                              product_type=parameters['product_type'],
+                              filename=parameters['filename'],
+                              verbose=parameters['verbose'])
+        parameters['product_type'] = "POSTCARD"
+        ehst = ESAHubbleClass(self.get_dummy_tap_handler())
+        ehst.download_product(observation_id=parameters['observation_id'],
+                              product_type=parameters['product_type'],
+                              filename=parameters['filename'],
+                              verbose=parameters['verbose'])
 
     def test_get_postcard(self):
         ehst = ESAHubbleClass(self.get_dummy_tap_handler())
@@ -123,20 +135,12 @@ def test_query_target(self):
     def test_cone_search(self):
         coords = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s",
                                       frame='icrs')
-
-        parameterst = {'query': "select top 10 * from hsc_v2.hubble_sc2",
-                       'output_file': "test2.vot",
-                       'output_format': "votable",
-                       'verbose': False}
-        dummyTapHandler = DummyHubbleTapHandler("launch_job", parameterst)
-
+        ehst = ESAHubbleClass(self.get_dummy_tap_handler())
         parameters = {'coordinates': coords,
                       'radius': 0.0,
                       'filename': 'file_cone',
                       'output_format': 'votable',
                       'cache': True}
-
-        ehst = ESAHubbleClass(dummyTapHandler)
         target_file = data_path('cone_search.vot')
         with open(target_file, mode='rb') as file:
             target_obj = file.read()
@@ -148,6 +152,7 @@ def test_cone_search(self):
                              parameters['filename'],
                              parameters['output_format'],
                              parameters['cache'])
+            dummyTapHandler = DummyHubbleTapHandler("cone_search", parameters)
 
     def test_cone_search_coords(self):
         coords = "00h42m44.51s +41d16m08.45s"
@@ -163,15 +168,17 @@ def test_cone_search_coords(self):
                       'filename': 'file_cone',
                       'async_job': False,
                       'output_format': 'votable',
-                      'cache': True}
+                      'cache': True,
+                      'verbose': True}
 
         ehst = ESAHubbleClass(dummyTapHandler)
         ehst.cone_search(parameters['coordinates'],
                          parameters['radius'],
                          parameters['filename'],
                          parameters['output_format'],
                          parameters['async_job'],
-                         parameters['cache'])
+                         parameters['cache'],
+                         parameters['verbose'])
         with pytest.raises(ValueError) as err:
             ehst._getCoordInput(1234)
         assert "Coordinates must be either a string or "\

astroquery/esa/hubble/tests/test_esa_hubble_remote.py

@@ -62,17 +62,6 @@ class TestEsaHubbleRemoteData:
 
     temp_folder = create_temp_folder()
 
-    def test_query_hst_tap(self):
-        result = esa_hubble.query_hst_tap(self.obs_query)
-        # assert len(result) <= 2000
-        assert "observation_id" in result.keys()
-        temp_file = self.temp_folder.name + "/temp.vot"
-        result = esa_hubble.query_hst_tap(query=self.obs_query,
-                                          output_file=temp_file,
-                                          output_format="votable")
-        assert os.path.exists(temp_file)
-        remove_last_job()
-
     def test_query_hst_tap_async(self):
         result = esa_hubble.query_hst_tap(self.top_obs_query, async_job=True)
         assert len(result) > 10
@@ -95,18 +84,6 @@ def test_get_artifact(self):
         esa_hubble.get_artifact(artifact_id, temp_file)
         assert os.path.exists(temp_file)
 
-    def test_get_postcard(self):
-        result = esa_hubble.query_hst_tap(self.top_artifact_query +
-                                          " where a.archive_class = "
-                                          "'preview'")
-        assert "observation_id" in result.keys()
-        observation_id = random.choice(result["observation_id"])
-        temp_file = self.temp_folder.name + "/" + observation_id + ".jpg"
-        esa_hubble.get_postcard(observation_id, "RAW", 256, temp_file)
-        assert os.path.exists(temp_file)
-        img = Image.open(temp_file)
-        assert img.format == "JPEG"
-
     def test_query_target(self):
         temp_file = self.temp_folder.name + "/" + "m31_query.xml"
         table = esa_hubble.query_target("m31", temp_file)