TST: fixing up tests to make them pass

Author: bsipocz

astroquery/neodys/__init__.py

@@ -1,6 +1,6 @@
 """
 NEODyS Query Tool
----------------
+-----------------
 
 :Author: B612 Foundation
 

astroquery/neodys/core.py

@@ -1,4 +1,3 @@
-import requests
 from . import conf
 from ..query import BaseQuery
 
@@ -11,9 +10,6 @@ class NEODySClass(BaseQuery):
     NEODYS_URL = conf.server
     TIMEOUT = conf.timeout
 
-    def __init__(self):
-        super(NEODySClass, self).__init__()
-
     def query_object(self, object_id, orbital_element_type="eq", epoch_near_present=0):
         """
         Parameters
@@ -70,7 +66,6 @@ def query_object(self, object_id, orbital_element_type="eq", epoch_near_present=
 
         COV = []
         COR = []
-        NOR = []
 
         if orbital_element_type != 'ke' and orbital_element_type != 'eq':
             raise ValueError("OrbitElementType must be ke or eq")

astroquery/neodys/setup_package.py

@@ -0,0 +1,8 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+import os
+
+
+def get_package_data():
+    paths_test = [os.path.join('data', '2018vp1_eq0.txt')]
+
+    return {'astroquery.neodys.tests': paths_test}

astroquery/neodys/tests/test_neodys.py

@@ -1,9 +1,10 @@
 import pytest
 import os
 
-from ...utils.testing_tools import MockResponse
+import numpy as np
 
-from ... import neodys
+from astroquery.utils.mocks import MockResponse
+from astroquery.neodys import NEODySClass, NEODyS
 
 DATA_FILE = '2018vp1_eq0.txt'
 
@@ -24,28 +25,24 @@ def nonremote_request(self, request_type, url, **kwargs):
 # that mocks(monkeypatches) the actual 'requests.get' function:
 @pytest.fixture
 def patch_request(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:
-        mp = request.getfuncargvalue("monkeypatch")
-    mp.setattr(neodys.core.NEODySClass, '_request',
-               nonremote_request)
+    mp = request.getfixturevalue("monkeypatch")
+    mp.setattr(NEODySClass, '_request', nonremote_request)
     return mp
 
 
-def test_neodys_query():
-    res = neodys.core.NEODyS.query_object(
-        "2018VP1", orbital_element_type='eq', epoch_near_present=0)
-    assert res['Equinoctial State Vector'] == [1.5881497559198392,
-    -0.037761493287362, 0.428349632624304, 0.018136658553998,
-    0.021742631955829, 14.9386830433394]
+def test_neodys_query(patch_request):
+    res = NEODyS.query_object(
+        object_id="2018VP1", orbital_element_type='eq', epoch_near_present=0)
+    np.testing.assert_allclose(res['Equinoctial State Vector'],
+                               [1.5881497559198392, -0.037761493287362, 0.428349632624304, 0.018136658553998,
+                                0.021742631955829, 14.9386830433394])
     assert res['Mean Julian Date'] == ['58430.299591399', 'TDT']
     assert res['Magnitude'] == [30.865, 0.15]
-    assert res['Covariance Matrix'] == [3.212371896244936e-07,
-    -1.890888042008199e-08, 1.279370251108077e-07, 4.306149504243656e-09,
-    5.180213121424896e-09, -7.806384186165599e-06, 1.113155399664521e-09,
-    -7.5307541846631e-09, -2.534799484876558e-10, -3.049291243256377e-10,
-    4.595165457505564e-07, 5.095265031422349e-08, 1.714984526308656e-09,
-    2.063091894997213e-09, -3.109000937067305e-06, 5.772527813183736e-11,
-    6.944207925151111e-11, -1.04644520025806e-07, 8.353717813321847e-11,
-    -1.258850849126041e-07, 0.0001897040272481179]
+    np.testing.assert_allclose(
+        res['Covariance Matrix'],
+        [3.212371896244936e-07, -1.890888042008199e-08, 1.279370251108077e-07, 4.306149504243656e-09,
+         5.180213121424896e-09, -7.806384186165599e-06, 1.113155399664521e-09, -7.5307541846631e-09,
+         -2.534799484876558e-10, -3.049291243256377e-10, 4.595165457505564e-07, 5.095265031422349e-08,
+         1.714984526308656e-09, 2.063091894997213e-09, -3.109000937067305e-06, 5.772527813183736e-11,
+         6.944207925151111e-11, -1.04644520025806e-07, 8.353717813321847e-11, -1.258850849126041e-07,
+         0.0001897040272481179])

astroquery/neodys/tests/test_neodys_remote.py

@@ -1,19 +1,18 @@
+import pytest
 
-from ... import neodys
+from astroquery.neodys import NEODyS
 
 
+@pytest.mark.remote_data
 def test_neodys_query():
 
     test_object = "2018VP1"
 
-    res_kep_0 = neodys.core.NEODyS.query_object(
-        test_object, orbital_element_type="ke", epoch_near_present=0)
-    res_kep_1 = neodys.core.NEODyS.query_object(
-        test_object, orbital_element_type="ke", epoch_near_present=1)
-    res_eq_0 = neodys.core.NEODyS.query_object(
-        test_object, orbital_element_type="eq", epoch_near_present=0)
-    res_eq_1 = neodys.core.NEODyS.query_object(
-        test_object, orbital_element_type="eq", epoch_near_present=1)
+    res_kep_0 = NEODyS.query_object(test_object, orbital_element_type="ke", epoch_near_present=0)
+    res_kep_1 = NEODyS.query_object(test_object, orbital_element_type="ke", epoch_near_present=1)
+    res_eq_0 = NEODyS.query_object(test_object, orbital_element_type="eq", epoch_near_present=0)
+    res_eq_1 = NEODyS.query_object(test_object, orbital_element_type="eq", epoch_near_present=1)
+
     assert len(res_kep_0['Keplerian State Vector']) == 6
     assert len(res_kep_0['Covariance Matrix']) == 21
     assert res_kep_0['Mean Julian Date'][0] != res_kep_1['Mean Julian Date'][0]

docs/index.rst

@@ -401,6 +401,7 @@ above categories. Those services are here:
   jplhorizons/jplhorizons.rst
   jplsbdb/jplsbdb.rst
   nasa_ads/nasa_ads.rst
+  neodys/neodys.rst
   utils/tap.rst