And fix the tests to match last changes.

Author: mkelley

astroquery/jplhorizons/tests/test_jplhorizons.py

@@ -16,7 +16,7 @@
 DATA_FILES = {'ephemerides': 'ceres_ephemerides.txt',
               'elements': 'ceres_elements.txt',
               'vectors': 'ceres_vectors.txt',
-              '"1935 UZ;"': 'no_H.txt'}
+              '"1935 UZ"': 'no_H.txt'}
 
 
 def data_path(filename):
@@ -27,7 +27,7 @@ def data_path(filename):
 # monkeypatch replacement request function
 def nonremote_request(self, request_type, url, **kwargs):
 
-    if kwargs['params']['COMMAND'] == '"Ceres;"':
+    if kwargs['params']['COMMAND'] == '"Ceres"':
         # pick DATA_FILE based on query type
         query_type = {'OBSERVER': 'ephemerides',
                       'ELEMENTS': 'elements',
@@ -182,7 +182,7 @@ def test_elements_query_payload():
         ('EPHEM_TYPE', 'ELEMENTS'),
         ('MAKE_EPHEM', 'YES'),
         ('OUT_UNITS', 'AU-D'),
-        ('COMMAND', '"Ceres;"'),
+        ('COMMAND', '"Ceres"'),
         ('CENTER', "'500@10'"),
         ('CSV_FORMAT', 'YES'),
         ('ELEM_LABELS', 'YES'),
@@ -202,7 +202,7 @@ def test_vectors_query_payload():
         ('format', 'text'),
         ('EPHEM_TYPE', 'VECTORS'),
         ('OUT_UNITS', 'AU-D'),
-        ('COMMAND', '"Ceres;"'),
+        ('COMMAND', '"Ceres"'),
         ('CENTER', "'500@10'"),
         ('CSV_FORMAT', '"YES"'),
         ('REF_PLANE', 'ECLIPTIC'),
@@ -219,18 +219,3 @@ def test_no_H(patch_request):
     """testing missing H value (also applies for G, M1, k1, M2, k2)"""
     res = jplhorizons.Horizons(id='1935 UZ').ephemerides()[0]
     assert 'H' not in res
-
-
-def test_id_type_deprecation():
-    """Test deprecation warnings based on issue 1742.
-
-    Remove when id_type behavior is changed.
-
-    https://github.com/astropy/astroquery/pull/1742
-
-    """
-    with pytest.warns(AstropyDeprecationWarning):
-        res = jplhorizons.Horizons(id='Ceres')
-
-    with pytest.warns(AstropyDeprecationWarning):
-        res = jplhorizons.Horizons(id='Ceres', id_type='majorbody')

astroquery/jplhorizons/tests/test_jplhorizons_remote.py

@@ -263,18 +263,14 @@ def test_vectors_query_raw(self):
         assert len(res) >= 6412
 
     def test_unknownobject(self):
-        try:
+        with pytest.raises(ValueError):
             jplhorizons.Horizons(id='spamspamspameggsspam', location='500',
-                                 id_type='', epochs=2451544.5).ephemerides()
-        except ValueError:
-            pass
+                                 epochs=2451544.5).ephemerides()
 
     def test_multipleobjects(self):
-        try:
+        with pytest.raises(ValueError):
             jplhorizons.Horizons(id='73P', location='500', id_type='smallbody',
                                  epochs=2451544.5).ephemerides()
-        except ValueError:
-            pass
 
     def test_uri(self):
         target = jplhorizons.Horizons(id='3552', location='500',
@@ -329,8 +325,7 @@ def test_majorbody(self):
         quantities = ('1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,'
                       '21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,'
                       '38,39,40,41,42,43')
-        target = jplhorizons.Horizons(id='301', location='688', epochs=epochs,
-                                      id_type='')
+        target = jplhorizons.Horizons(id='301', location='688', epochs=epochs)
         eph = target.ephemerides(quantities=quantities)
         assert len(eph) == 2