test: updated test to match interface; solved other xfail tests

src/input/input_validator.py

@@ -41,7 +41,9 @@ def is_valid_email(email:str) -> bool:
     Returns:
         bool: True if the email address is valid, False otherwise.
     """
-    pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
+    #pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
+    # do not allow starting with a +
+    pattern = r'^[a-zA-Z0-9_]+[a-zA-Z0-9._%+-]*@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
     return re.match(pattern, email) is not None
 
 # Function to extract date and time from image metadata
@@ -125,4 +127,4 @@ def get_image_latlon(image_file: UploadedFile) :
     except Exception as e: # FIXME: what types of exception?
          st.warning(f"Could not extract latitude and longitude from image metadata. (file: {str(image_file)}")
     
-    return None, None
+    return None, None

src/whale_viewer.py

@@ -115,6 +115,9 @@ def format_whale_name(whale_class:str) -> str:
     Returns:
         str: The formatted whale name with spaces instead of underscores and each word capitalized.
     """
+    if not isinstance(whale_class, str):
+        raise TypeError("whale_class should be a string.")
+    
     whale_name = whale_class.replace("_", " ").title()
     return whale_name
 

tests/test_input_handling.py

@@ -51,9 +51,6 @@ def test_is_valid_email_invalid():
     assert not is_valid_email("[email protected].")
     assert not is_valid_email("a@[email protected]")
 
-# not sure how xfails come through the CI pipeline yet.
-# maybe better to just comment out this stuff until pipeline is setup, then can check /extend
-@pytest.mark.xfail(reason="Bug identified, but while setting up CI having failing tests causes more headache")
 def test_is_valid_email_invalid_plus():
     assert not is_valid_email("[email protected]")
     assert not is_valid_email("[email protected]")
@@ -143,7 +140,7 @@ def test_get_image_latlon():
     
     # missing GPS loc
     f2 = test_data_pth / 'cakes_no_exif_gps.jpg'
-    assert get_image_latlon(f2) == None
+    assert get_image_latlon(f2) == (None, None)
     
     # missng datetime -> expect gps not affected
     f3 = test_data_pth / 'cakes_no_exif_datetime.jpg'
@@ -151,7 +148,7 @@ def test_get_image_latlon():
 
 # tests for get_image_latlon with empty file
 def test_get_image_latlon_empty():
-    assert get_image_latlon("") == None
+    assert get_image_latlon("") == (None, None)
     
 # tests for decimal_coords
 # - without input, py raises TypeError 

tests/test_whale_viewer.py

@@ -40,11 +40,9 @@ def test_format_whale_name_empty():
     assert format_whale_name("") == ""
     
 # testing with the wrong datatype
-# we should get a TypeError - currently it fails with a AttributeError
-@pytest.mark.xfail
 def test_format_whale_name_none():
     with pytest.raises(TypeError):
         format_whale_name(None)
         
 
-# display_whale requires UI to test it. 
+# display_whale requires UI to test it.