Fixed mock test

Author: rickynilsson

astroquery/ipac/nexsci/nasa_exoplanet_archive/core.py

@@ -391,8 +391,7 @@ def query_aliases(self, object_name, *, cache=None):
         response : list
             A list of aliases found for the object name. The default name will be listed first.
         """
-        url = requests.get(get_access_url('aliaslookup')+object_name)
-        data = json.loads(url.text)
+        data = self._request_query_aliases(object_name)
 
         try:
             objname_split = object_name.split()
@@ -427,6 +426,12 @@ def _regularize_object_name(self, object_name):
         warnings.warn("No aliases found for name: '{0}'".format(object_name), NoResultsWarning)
         return object_name
 
+    def _request_query_aliases(self, object_name):
+        """Service request for query_aliases()"""
+        url = requests.get(get_access_url('aliaslookup')+object_name)
+        response = json.loads(url.text)
+        return response
+    
     # Look for response errors. This might need to be updated for TAP
     def _handle_error(self, text):
         """

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

@@ -129,34 +129,31 @@ def data_path(filename):
 
 
 # monkeypatch replacement request function
-def nonremote_request(self, url, **kwargs):
+def query_aliases_mock(self, *args, **kwargs):
     with open(data_path(LOOKUP_DATA_FILE), 'rb') as f:
-        response = MockResponse(content=json.loads(f), url=url)
+        response = json.load(f)
     return response
 
 
 # use a pytest fixture to create a dummy 'requests.get' function,
 # that mocks(monkeypatches) the actual 'requests.get' function:
 @pytest.fixture
-def patch_request(request):
+def query_aliases_request(request):
     mp = request.getfixturevalue("monkeypatch")
-
-    mp.setattr(NasaExoplanetArchiveClass, '_request', nonremote_request)
+    mp.setattr(NasaExoplanetArchiveClass, '_request_query_aliases', query_aliases_mock)
     return mp
 
 
-@pytest.mark.remote_data
-def test_query_aliases(patch_request):
+def test_query_aliases(query_aliases_request):
     nasa_exoplanet_archive = NasaExoplanetArchiveClass()
-    result = nasa_exoplanet_archive.query_aliases('bet Pic')
+    result = nasa_exoplanet_archive.query_aliases(object_name='bet Pic')
     assert len(result) > 10
     assert 'GJ 219' in result
     assert 'bet Pic' in result
     assert '2MASS J05471708-5103594' in result
 
 
-@pytest.mark.remote_data
-def test_query_aliases_planet(patch_request):
+def test_query_aliases_planet(query_aliases_request):
     nasa_exoplanet_archive = NasaExoplanetArchiveClass()
     result = nasa_exoplanet_archive.query_aliases('bet Pic b')
     assert len(result) > 10
@@ -165,14 +162,6 @@ def test_query_aliases_planet(patch_request):
     assert '2MASS J05471708-5103594 b' in result
 
 
-@pytest.mark.remote_data
-def test_query_aliases_noresult(patch_request):
-    nasa_exoplanet_archive = NasaExoplanetArchiveClass()
-    with pytest.warns(NoResultsWarning):
-        result = nasa_exoplanet_archive.query_aliases('invalid')
-    assert len(result) == 0
-
-
 def test_get_access_url():
     assert get_access_url('tap') == conf.url_tap
     assert get_access_url('api') == conf.url_api