TST: adding test for list_collections() servicetype

Author: bsipocz

astroquery/ipac/irsa/core.py

@@ -132,22 +132,22 @@ def list_collections(self, servicetype=None):
             A table listing all the possible collections for IRSA SIA queries.
         """
 
-        servicetype = servicetype.upper()
-
         if not servicetype:
             query = "SELECT DISTINCT collection from caom.observation ORDER by collection"
-        elif servicetype == 'SIA':
-            query = ("SELECT DISTINCT o.collection FROM caom.observation o "
-                     "JOIN caom.plane p ON o.obsid = p.obsid "
-                     "WHERE (p.dataproducttype = 'image' OR p.dataproducttype = 'cube') "
-                     "order by collection")
-        elif servicetype == 'SSA':
-            query = ("SELECT DISTINCT o.collection FROM caom.observation o "
-                     "JOIN caom.plane p ON o.obsid = p.obsid "
-                     "WHERE (p.dataproducttype = 'spectrum' OR p.dataproducttype = 'cube') "
-                     "order by collection")
         else:
-            raise ValueError("if specified, servicetype should be 'SIA' or 'SSA'")
+            servicetype = servicetype.upper()
+            if servicetype == 'SIA':
+                query = ("SELECT DISTINCT o.collection FROM caom.observation o "
+                         "JOIN caom.plane p ON o.obsid = p.obsid "
+                         "WHERE (p.dataproducttype = 'image' OR p.dataproducttype = 'cube') "
+                         "order by collection")
+            elif servicetype == 'SSA':
+                query = ("SELECT DISTINCT o.collection FROM caom.observation o "
+                         "JOIN caom.plane p ON o.obsid = p.obsid "
+                         "WHERE (p.dataproducttype = 'spectrum' OR p.dataproducttype = 'cube') "
+                         "order by collection")
+            else:
+                raise ValueError("if specified, servicetype should be 'SIA' or 'SSA'")
 
         collections = self.query_tap(query=query)
         return collections.to_table()

astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -67,13 +67,18 @@ def test_list_catalogs(self):
         # (at the time of writing there are 933 tables in the list).
         assert len(catalogs) > 900
 
-    def test_list_collections(self):
-        collections = Irsa.list_collections()
+    @pytest.mark.parametrize('servicetype', (None, 'sia', 'ssa'))
+    def test_list_collections(self, servicetype):
+        collections = Irsa.list_collections(servicetype=servicetype)
         # Number of available collections may change over time, test only for significant drop.
-        # (at the time of writing there are 110 collections in the list).
-        assert len(collections) > 100
-        assert 'spitzer_seip' in collections['collection']
-        assert 'wise_allwise' in collections['collection']
+        # (at the time of writing there are 104 SIA and 35 SSA collections in the list).
+        if servicetype == 'ssa':
+            assert len(collections) > 30
+            assert 'sofia_exes' in collections['collection']
+        else:
+            assert len(collections) > 100
+            assert 'spitzer_seip' in collections['collection']
+            assert 'wise_allwise' in collections['collection']
 
     def test_tap(self):
         query = "SELECT TOP 5 ra,dec FROM cosmos2015"