finally fixed all tests

Author: keflavich

astroquery/splatalogue/core.py

@@ -274,10 +274,6 @@ def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
 
         """
 
-        payload = {'submit': 'Search',
-                   'frequency_units': 'GHz',
-                   }
-
         payload = {"searchSpecies": "",
                    "speciesSelectBox": [],
                    "dataVersion": "v3.0",
@@ -346,9 +342,11 @@ def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
             payload['userInputFrequenciesFrom'] = [min_frequency.value]
             payload['userInputFrequenciesTo'] = [max_frequency.value]
 
-        if chemical_name in ('', {}, (), [], set()):
-            # include all
-            payload['speciesSelectBox'] = []
+        if chemical_name in ('', {}, (), [], set(), None):
+            # include all by default, or whatever default was set
+            payload['speciesSelectBox'] = (self.data['speciesSelectBox']
+                                           if hasattr(self, 'data')
+                                           else [])
         elif chemical_name is not None:
             if parse_chemistry_locally:
                 species_ids = self.get_species_ids(species_regex=chemical_name, reflags=chem_re_flags)

astroquery/splatalogue/tests/test_splatalogue.py

@@ -24,7 +24,7 @@ def test_simple(patch_post):
 
 
 @pytest.mark.remote_data
-def test_init(patch_post):
+def test_init_remote(patch_post):
     x = splatalogue.Splatalogue.query_lines(min_frequency=114 * u.GHz,
                                             max_frequency=116 * u.GHz,
                                             chemical_name=' CO ')
@@ -34,10 +34,21 @@ def test_init(patch_post):
     # masked arrays fail
     # assert y == x
     assert len(x) == len(y)
-    assert all(y['Species'] == x['Species'])
-    assert all(x['Chemical Name'] == y['Chemical Name'])
+    assert all(y['species_id'] == x['species_id'])
+    assert all(y['name'] == x['name'])
+    assert all(y['chemical_name'] == x['chemical_name'])
 
 
+def test_init():
+    splat = splatalogue.Splatalogue(chemical_name=' CO ')
+    assert splat.data['speciesSelectBox'] == ['204', '990', '991', '1343']
+    payload = splat.query_lines(min_frequency=114 * u.GHz, max_frequency=116 * u.GHz,
+                                get_query_payload=True)
+    payload = json.loads(payload['body'])
+    assert payload['speciesSelectBox'] == ['204', '990', '991', '1343']
+    assert payload['userInputFrequenciesFrom'] == [114.0]
+    assert payload['userInputFrequenciesTo'] == [116.0]
+
 def test_load_species_table():
     tbl = splatalogue.load_species_table.species_lookuptable()
     CO = tbl.find(' CO ')

astroquery/splatalogue/tests/test_utils.py

@@ -30,6 +30,10 @@ def test_minimize(patch_post):
 
 @pytest.mark.remote_data
 def test_minimize_issue2135():
+    """
+    This was a regression test for 2135, but is now just a basic test for the
+    new (March 2024) keywords
+    """
     rslt = splatalogue.Splatalogue.query_lines(min_frequency=100*u.GHz,
                                                max_frequency=200*u.GHz,
                                                chemical_name=' SiO ',
@@ -40,6 +44,4 @@ def test_minimize_issue2135():
 
     minimized = utils.minimize_table(rslt)
 
-    theomask = rslt['orderedFreq'].mask
-    np.testing.assert_allclose(minimized['Freq'][theomask],
-                               rslt['measFreq'][theomask])
+    np.testing.assert_allclose(minimized['Freq'], rslt['orderedfreq'])