Codecov fixes and refactoring of dummy_handlers

Author: jespinosaar

astroquery/esa/hubble/core.py

@@ -254,10 +254,8 @@ def cone_search(self, coordinates, radius=0.0, filename=None,
         """
         coord = self._getCoordInput(coordinates)
         radius_in_grades = Angle(radius, units.arcmin).deg
-
         ra = coord.ra.deg
         dec = coord.dec.deg
-
         query = "select o.observation_id, "\
                 "o.start_time, o.end_time, o.start_time_mjd, "\
                 "o.end_time_mjd, o.exposure_duration, o.release_date, "\
@@ -371,10 +369,10 @@ def cone_search_criteria(self, target=None, coordinates=None,
         else:
             crit_query = crit_query + " WHERE ("
 
-        if(target and coordinates):
+        if target and coordinates:
             raise TypeError("Please use only target or coordinates as"
                             "parameter.")
-        if(target):
+        if target:
             try:
                 ra, dec = self._query_tap_target(target)
             except Exception:

astroquery/esa/hubble/tests/dummy_handler.py

@@ -73,50 +73,6 @@ def launch_job(self, query, name=None, output_file=None,
         self._parameters['upload_table_name'] = upload_table_name
         return Job(False)
 
-    def launch_job_async(self, query, name=None, output_file=None,
-                         output_format="votable", verbose=False,
-                         dump_to_file=False, upload_resource=None,
-                         upload_table_name=None):
-        self.__invokedMethod = 'launch_job'
-        self._parameters['query'] = query
-        self._parameters['name'] = name
-        self._parameters['output_file'] = output_file
-        self._parameters['output_format'] = output_format
-        self._parameters['verbose'] = verbose
-        self._parameters['dump_to_file'] = dump_to_file
-        self._parameters['upload_resource'] = upload_resource
-        self._parameters['upload_table_name'] = upload_table_name
-        return Job(True)
-
-    def query_criteria(self, calibration_level=None,
-                       data_product_type=None, intent=None,
-                       obs_collection=None, instrument_name=None,
-                       filters=None, async_job=False, output_file=None,
-                       output_format="votable", verbose=False):
-        self.__invokedMethod = 'query_criteria'
-        self._parameters['calibration_level'] = calibration_level
-        self._parameters['data_product_type'] = data_product_type
-        self._parameters['intent'] = intent
-        self._parameters['obs_collection'] = obs_collection
-        self._parameters['instrument_name'] = instrument_name
-        self._parameters['filters'] = filters
-        self._parameters['async_job'] = async_job
-        self._parameters['output_file'] = output_file
-        self._parameters['output_format'] = output_format
-        self._parameters['verbose'] = verbose
-        return Job(True)
-
-    def get_tables(self, only_names=True, verbose=False):
-        self.__invokedMethod = 'get_tables'
-        self._parameters['only_names'] = only_names
-        self._parameters['verbose'] = verbose
-
-    def get_columns(self, table_name=None, only_names=True, verbose=False):
-        self.__invokedMethod = 'get_columns'
-        self._parameters['table_name'] = table_name
-        self._parameters['only_names'] = only_names
-        self._parameters['verbose'] = verbose
-
     def load_tables(self,
                     only_names=True,
                     include_shared_tables=False,

astroquery/esa/hubble/tests/dummy_tap_handler.py

@@ -67,7 +67,7 @@ def ehst_cone_search(request):
     return mp
 
 
-class TestESAHubble():
+class TestESAHubble:
 
     def get_dummy_tap_handler(self):
         parameterst = {'query': "select top 10 * from hsc_v2.hubble_sc2",

astroquery/esa/hubble/tests/test_esa_hubble.py

@@ -48,9 +48,7 @@ def remove_last_job():
 
 
 @pytest.mark.remote_data
-class TestRemoteData(unittest.TestCase):
-
-    temp_file_vot = "/temp.vot"
+class TestEsaHubbleRemoteData:
 
     obs_query = "select top 2050 o.observation_id from ehst.observation o"
 
@@ -62,22 +60,20 @@ class TestRemoteData(unittest.TestCase):
     top_artifact_query = "select top 50 a.artifact_id, a.observation_id "\
                          " from ehst.artifact a"
 
+    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_folder = create_temp_folder()
-        temp_file = temp_folder.name + self.temp_file_vot
+        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.obs_query, async_job=True)
-        assert len(result) > 2000
-        remove_last_job()
         result = esa_hubble.query_hst_tap(self.top_obs_query, async_job=True)
         assert len(result) > 10
         assert "observation_id" in result.keys()
@@ -86,8 +82,7 @@ def test_query_hst_tap_async(self):
     def test_download_product(self):
         result = esa_hubble.query_hst_tap(self.hst_query)
         observation_id = random.choice(result['observation_id'])
-        temp_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/" + observation_id + ".tar"
+        temp_file = self.temp_folder.name + "/" + observation_id + ".tar"
         esa_hubble.download_product(observation_id=observation_id,
                                     filename=temp_file)
         assert os.path.exists(temp_file)
@@ -96,8 +91,7 @@ def test_get_artifact(self):
         result = esa_hubble.query_hst_tap(self.top_artifact_query)
         assert "artifact_id" in result.keys()
         artifact_id = random.choice(result["artifact_id"])
-        temp_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/" + artifact_id + ".gz"
+        temp_file = self.temp_folder.name + "/" + artifact_id + ".gz"
         esa_hubble.get_artifact(artifact_id, temp_file)
         assert os.path.exists(temp_file)
 
@@ -107,59 +101,23 @@ def test_get_postcard(self):
                                           "'preview'")
         assert "observation_id" in result.keys()
         observation_id = random.choice(result["observation_id"])
-        temp_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/" + observation_id + ".jpg"
+        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_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/" + "m31_query.xml"
+        temp_file = self.temp_folder.name + "/" + "m31_query.xml"
         table = esa_hubble.query_target("m31", temp_file)
         assert os.path.exists(temp_file)
         assert 'OBSERVATION_ID' in table.columns
-        assert len(table) > 0
-
-    def test_query_criteria(self):
-        temp_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/output1.vot.gz"
-        table = esa_hubble.query_criteria(calibration_level=1,
-                                          data_product_type="image",
-                                          intent="SCIENCE",
-                                          async_job=False,
-                                          output_file=temp_file,
-                                          output_format="votable",
-                                          verbose=True,
-                                          get_query=False)
-        assert os.path.exists(temp_file)
-        assert 'observation_id' in table.columns
-        assert len(table) > 0
-        remove_last_job()
 
     def test_cone_search(self):
         esa_hubble = ESAHubble()
         c = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs')
-        temp_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/cone_search_m31_5.vot"
-        table = esa_hubble.cone_search(c, 7, temp_file)
-        assert os.path.exists(temp_file)
-        assert 'observation_id' in table.columns
-        assert len(table) > 0
-        remove_last_job()
-
-    def test_cone_search_criteria(self):
-        esa_hubble = ESAHubble()
-        c = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs')
-        temp_folder = create_temp_folder()
-        temp_file = temp_folder.name + "/output1.vot.gz"
-        table = esa_hubble.cone_search_criteria(target='m31', radius=7,
-                                                obs_collection=['HST'],
-                                                data_product_type='image',
-                                                async_job=False,
-                                                filename=temp_file,
-                                                output_format="votable")
+        temp_file = self.temp_folder.name + "/cone_search_m31_5.vot"
+        table = esa_hubble.cone_search(c, 7, temp_file, verbose=True)
         assert os.path.exists(temp_file)
         assert 'observation_id' in table.columns
         assert len(table) > 0