added test for exception with invalid input

Author: martinkilbinger

cs_util/cfis.py

@@ -65,9 +65,9 @@ def get_tile_coord_from_nixy(nix, niy):
     Parameters
     ----------
     nix : str or list
-        tile number(s) for x
+        tile number(s) for x coordinate(s);
     niy : str or list
-        tile number(s) for y
+        tile number(s) for y coordinate(s)
 
     See also
     --------
@@ -79,12 +79,25 @@ def get_tile_coord_from_nixy(nix, niy):
         right ascension and declination
 
     """
-    # Transform to int
+    number_pattern = re.compile(r'\d{3}')
+
+    # Transform from str to int
     if not np.isscalar(nix):
+        # Check input numbers
+        if not all(
+            [bool(number_pattern.fullmatch(number)) for number in nix + niy]
+        ):
+            raise ValueError('Input needs to be three-digit numbers')
+
         # Transform to list
         xi = np.array(nix).astype(int)
         yi = np.array(niy).astype(int)
     else:
+        if not all(
+            [bool(number_pattern.fullmatch(number)) for number in [nix, niy]]
+        ):
+            raise ValueError('Input needs to be three-digit numbers')
+
         xi = int(nix)
         yi = int(niy)
 

cs_util/tests/test_cfis.py

@@ -30,6 +30,7 @@ def setUp(self):
         self._ra = [216.86237, 214.43017]
         self._unit = units.deg
 
+        self._nix_nok = ['23x', '1234']
         self._tile_number_nok = '12x.456'
 
     def tearDown(self):
@@ -109,3 +110,23 @@ def test_get_tile_coord_from_nixy(self):
             # Test units
             self.assertTrue(ra[idx].unit == self._unit)
             self.assertTrue(dec[idx].unit == self._unit)
+
+        # Test exception for invalid input
+        self.assertRaises(
+            ValueError,
+            cfis.get_tile_coord_from_nixy,
+            self._nix_nok,
+            self._niy,
+        )
+        self.assertRaises(
+            ValueError,
+            cfis.get_tile_coord_from_nixy,
+            self._niy,
+            self._nix_nok,
+        )
+        self.assertRaises(
+            ValueError,
+            cfis.get_tile_coord_from_nixy,
+            self._nix_nok[0],
+            self._niy[0],
+        )