New unit tests to cover new filters.

Author: Raul Gutierrez

astroquery/jwst/core.py

@@ -883,8 +883,7 @@ def __get_callevel_condition(self, cal_level):
                 condition = " AND calibrationlevel="+\
                                         str(cal_level)+" "
             else:
-                raise ValueError("cal_level must be either 'Top' or \
-                                an integer. ")
+                raise ValueError("cal_level must be either 'Top' or an integer")
         return condition
 
     def __get_public_condition(self, only_public):
@@ -895,16 +894,16 @@ def __get_public_condition(self, only_public):
             condition = " AND public='true' "
         return condition
 
-    def __get_plane_dataproducttype_condition(self, dataproduct_type=None):
+    def __get_plane_dataproducttype_condition(self, prod_type=None):
         condition = ""
-        if(dataproduct_type is not None):
-            if(not isinstance(dataproduct_type, str)):
-                raise ValueError("dataproduct_type must be string")
-            elif(str(dataproduct_type).lower() not in self.PLANE_DATAPRODUCT_TYPES):
-                raise ValueError("dataproduct_type must be one of: " +\
+        if(prod_type is not None):
+            if(not isinstance(prod_type, str)):
+                raise ValueError("prod_type must be string")
+            elif(str(prod_type).lower() not in self.PLANE_DATAPRODUCT_TYPES):
+                raise ValueError("prod_type must be one of: " +\
                                  str(', '.join(self.PLANE_DATAPRODUCT_TYPES)))
             else:
-                condition = " AND dataproducttype LIKE '"+dataproduct_type.lower()+"' "
+                condition = " AND dataproducttype LIKE '"+prod_type.lower()+"' "
         return condition
 
     def __get_instrument_name_condition(self, value=None):

astroquery/jwst/tests/test_jwsttap.py

@@ -197,15 +197,54 @@ def test_query_region(self):
         sc = SkyCoord(ra=29.0, dec=15.0, unit=(u.degree, u.degree), frame='icrs')
         with pytest.raises(ValueError) as err:
             tap.query_region(sc)
+            print(err.value.args[0])
         assert "Missing required argument: 'width'" in err.value.args[0]
 
         width = Quantity(12, u.deg)
+        height = Quantity(10, u.deg)
 
         with pytest.raises(ValueError) as err:
             tap.query_region(sc, width=width)
         assert "Missing required argument: 'height'" in err.value.args[0]
 
-        height = Quantity(10, u.deg)
+        #Test cal_level argument
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, cal_level='a')
+        assert "cal_level must be either 'Top' or an integer" in err.value.args[0]
+
+        #Test only_public
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, only_public='a')
+        assert "only_public must be boolean" in err.value.args[0]
+
+        #Test dataproduct_type argument
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, prod_type=1)
+        assert "prod_type must be string" in err.value.args[0]
+
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, prod_type='a')
+        assert "prod_type must be one of: " in err.value.args[0]
+
+        #Test instrument_name argument
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, instrument_name=1)
+        assert "instrument_name must be string" in err.value.args[0]
+
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, instrument_name='a')
+        assert "instrument_name must be one of: " in err.value.args[0]
+
+        #Test filter_name argument
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, filter_name=1)
+        assert "filter_name must be string" in err.value.args[0]
+
+        #Test proposal_id argument
+        with pytest.raises(ValueError) as err:
+            tap.query_region(sc, width=width, height=height, proposal_id='a')
+        assert "proposal_id must be an integer" in err.value.args[0]
+
         table = tap.query_region(sc, width=width, height=height)
         assert len(table) == 3, \
             "Wrong job results (num rows). Expected: %d, found %d" % \
@@ -403,6 +442,45 @@ def test_cone_search_sync(self):
                                     None,
                                     np.int32)
 
+        #Test cal_level argument
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, cal_level='a')
+        assert "cal_level must be either 'Top' or an integer" in err.value.args[0]
+
+        #Test only_public
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, only_public='a')
+        assert "only_public must be boolean" in err.value.args[0]
+
+        #Test dataproduct_type argument
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, prod_type=1)
+        assert "prod_type must be string" in err.value.args[0]
+
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, prod_type='a')
+        assert "prod_type must be one of: " in err.value.args[0]
+
+        #Test instrument_name argument
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, instrument_name=1)
+        assert "instrument_name must be string" in err.value.args[0]
+
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, instrument_name='a')
+        assert "instrument_name must be one of: " in err.value.args[0]
+
+        #Test filter_name argument
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, filter_name=1)
+        assert "filter_name must be string" in err.value.args[0]
+
+        #Test proposal_id argument
+        with pytest.raises(ValueError) as err:
+            tap.cone_search(sc, radius, proposal_id='a')
+        assert "proposal_id must be an integer" in err.value.args[0]
+
+
     def test_cone_search_async(self):
         connHandler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)