Fix tests.

Author: rickynilsson

astroquery/ipac/nexsci/nasa_exoplanet_archive/__init__.py

@@ -21,6 +21,9 @@ class Conf(_config.ConfigNamespace):
     url_tap = _config.ConfigItem(
         "https://exoplanetarchive.ipac.caltech.edu/TAP/",
         "URL for the NASA Exoplanet Archive TAP")
+    url_aliaslookup = _config.ConfigItem(
+        "https://exoplanetarchive.ipac.caltech.edu/cgi-bin/Lookup/nph-aliaslookup.py?objname=",
+        "URL for the NASA Exoplanet Archive aliaslookup")
     timeout = _config.ConfigItem(
         600, "Time limit for requests from the NASA Exoplanet Archive servers")
     cache = _config.ConfigItem(False, "Should the requests be cached?")

astroquery/ipac/nexsci/nasa_exoplanet_archive/core.py

@@ -107,6 +107,8 @@ def get_access_url(service='tap'):
         url = conf.url_tap
     elif service == 'api':
         url = conf.url_api
+    elif service == 'aliaslookup':
+        url = conf.url_aliaslookup
     return url
 
 
@@ -673,7 +675,7 @@ def _request_to_sql(self, request_payload):
     @deprecated(since="v0.4.1", alternative="query_object")
     @deprecated_renamed_argument(["show_progress", "table_path"],
                                  [None, None], "v0.4.1", arg_in_kwargs=True)
-    def query_planet(self, planet_name, cache=None, regularize=True, **criteria):
+    def query_planet(self, planet_name, cache=None, **criteria):
         """
         Search the ``exoplanets`` table for a confirmed planet
 
@@ -685,22 +687,18 @@ def query_planet(self, planet_name, cache=None, regularize=True, **criteria):
         cache : bool, optional
             Should the request result be cached? This can be useful for large repeated queries,
             but since the data in the archive is updated regularly, this defaults to ``False``.
-        regularize : bool, optional
-            If ``True``, the ``aliastable`` will be used to regularize the target name.
         **criteria
             Any other filtering criteria to apply. Values provided using the ``where`` keyword will
             be ignored.
         """
-        if regularize:
-            planet_name = self._regularize_object_name(planet_name)
         criteria = self._handle_all_columns_argument(**criteria)
         criteria["where"] = "pl_name='{0}'".format(planet_name.strip())
         return self.query_criteria("exoplanets", cache=cache, **criteria)
 
     @deprecated(since="v0.4.1", alternative="query_object")
     @deprecated_renamed_argument(["show_progress", "table_path"],
                                  [None, None], "v0.4.1", arg_in_kwargs=True)
-    def query_star(self, host_name, cache=None, regularize=True, **criteria):
+    def query_star(self, host_name, cache=None, **criteria):
         """
         Search the ``exoplanets`` table for a confirmed planet host
 
@@ -712,14 +710,10 @@ def query_star(self, host_name, cache=None, regularize=True, **criteria):
         cache : bool, optional
             Should the request result be cached? This can be useful for large repeated queries,
             but since the data in the archive is updated regularly, this defaults to ``False``.
-        regularize : bool, optional
-            If ``True``, the ``aliastable`` will be used to regularize the target name.
         **criteria
             Any other filtering criteria to apply. Values provided using the ``where`` keyword will
             be ignored.
         """
-        if regularize:
-            host_name = self._regularize_object_name(host_name)
         criteria = self._handle_all_columns_argument(**criteria)
         criteria["where"] = "pl_hostname='{0}'".format(host_name.strip())
         return self.query_criteria("exoplanets", cache=cache, **criteria)

astroquery/ipac/nexsci/nasa_exoplanet_archive/tests/test_nasa_exoplanet_archive.py

@@ -66,8 +66,7 @@
 
 
 def mock_get(self, method, url, *args, **kwargs):  # pragma: nocover
-    if method!='test_regularize_object_name':
-        assert url == conf.url_api
+    assert url == conf.url_api
 
     params = kwargs.get("params", None)
     assert params is not None
@@ -120,16 +119,16 @@ def patch_get(request):  # pragma: nocover
     return mp
 
 
-def test_regularize_object_name(patch_get):
-    NasaExoplanetArchiveMock = NasaExoplanetArchiveClass()
+# def test_regularize_object_name(patch_get):
+#     NasaExoplanetArchiveMock = NasaExoplanetArchiveClass()
 
-    NasaExoplanetArchiveMock._tap_tables = ['list']
-    assert NasaExoplanetArchiveMock._regularize_object_name("kepler 2") == "HAT-P-7"
-    assert NasaExoplanetArchiveMock._regularize_object_name("kepler 1 b") == "TrES-2 b"
+#     NasaExoplanetArchiveMock._tap_tables = ['list']
+#     assert NasaExoplanetArchiveMock._regularize_object_name("kepler 2") == "HAT-P-7"
+#     assert NasaExoplanetArchiveMock._regularize_object_name("kepler 1 b") == "TrES-2 b"
 
-    with pytest.warns(NoResultsWarning) as warning:
-        NasaExoplanetArchiveMock._regularize_object_name("not a planet")
-    assert "No aliases found for name: 'not a planet'" == str(warning[0].message)
+#     with pytest.warns(NoResultsWarning) as warning:
+#         NasaExoplanetArchiveMock._regularize_object_name("not a planet")
+#     assert "No aliases found for name: 'not a planet'" == str(warning[0].message)
 
 
 def test_backwards_compat(patch_get):
@@ -298,6 +297,25 @@ def mock_run_query(url=conf.url_tap):
     assert 'pscomppars' in result
 
 
+@patch('astroquery.ipac.nexsci.nasa_exoplanet_archive.core.get_access_url',
+       Mock(side_effect=lambda x: 'https://some.url'))
+def test_query_aliases():
+    nasa_exoplanet_archive = NasaExoplanetArchiveClass()
+
+    def mock_run_query(url=conf.url_aliaslookup, object_name="HD 209458"):
+        assert url == conf.url_aliaslookup
+        assert object_name == "HD 209458"
+        result = PropertyMock()
+        result = ['HD 209458', '2MASS J22031077+1853036', 'BD+18 4917', 'Gaia DR2 1779546757669063552',\
+             'HIP 108859', 'SAO 107623', 'TIC 420814525', 'TYC 1688-01821-1', 'V0376 Peg', 'WISE J220310.79+185303.3']
+        return result
+    nasa_exoplanet_archive.query_aliases = mock_run_query
+    result = nasa_exoplanet_archive.query_aliases()
+    assert 'HD 209458' in result
+    assert 'HIP 108859' in result
+    assert 'V0376 Peg' in result
+
+
 def test_deprecated_namespace_import_warning():
     with pytest.warns(DeprecationWarning):
         import astroquery.nasa_exoplanet_archive