From 95ac6269333c8b099a68c7eaaa18339bfa8edb7e Mon Sep 17 00:00:00 2001
From: Julian Lobbes <julian.lobbes@protonmail.com>
Date: Fri, 18 Nov 2022 10:38:03 +0100
Subject: [PATCH] fix(tests): update usermodel tests to handle assertions

---
 lumi2/usermodel.py      |  6 +++---
 tests/test_usermodel.py | 38 ++++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/lumi2/usermodel.py b/lumi2/usermodel.py
index 1a14cf2..66cfad9 100644
--- a/lumi2/usermodel.py
+++ b/lumi2/usermodel.py
@@ -6,7 +6,7 @@ import hashlib
 from binascii import Error as Base64DecodeError
 from pathlib import Path
 
-from PIL.Image import Image
+from PIL import Image
 from PIL.JpegImagePlugin import JpegImageFile
 from flask import current_app
 
@@ -257,7 +257,7 @@ class User:
             If the input image's type is not PIL.Image.JpegImageFile.
         """
 
-        if not isinstance(input_image, Image):
+        if not isinstance(input_image, Image.Image):
             raise TypeError(f"Expected a PIL Image but got: '{type(input_image)}'.")
         if not isinstance(input_image, JpegImageFile):
             raise InvalidImageException(
@@ -298,7 +298,7 @@ class User:
 
 
     @staticmethod
-    def _get_default_picture() -> Image:
+    def _get_default_picture() -> Image.Image:
         """Returns the default user picture as a PIL Image object.
 
         Returns
diff --git a/tests/test_usermodel.py b/tests/test_usermodel.py
index 487e646..cbff586 100644
--- a/tests/test_usermodel.py
+++ b/tests/test_usermodel.py
@@ -4,12 +4,13 @@ import pytest
 from PIL import Image, JpegImagePlugin
 
 from lumi2.usermodel import User, Group
+from lumi2.exceptions import InvalidStringFormatException
 
 
 def test_is_valid_username():
     for invalid_type in [None, 0, True, ("x",), ["x"]]:
         with pytest.raises(TypeError):
-            User.is_valid_username(invalid_type)
+            User.assert_is_valid_username(invalid_type)
 
     invalid_usernames = [
         "", " ", "\u1337", "\t", "\n",
@@ -17,20 +18,21 @@ def test_is_valid_username():
         "1alice", "alice bob",
     ]
     for username in invalid_usernames:
-        assert not User.is_valid_username(username)
+        with pytest.raises(InvalidStringFormatException):
+            User.assert_is_valid_username(username)
 
     valid_usernames = [
         "alice", "Al1ce",
         "Aa0-_.", "a",
     ]
     for username in valid_usernames:
-        assert User.is_valid_username(username)
+        User.assert_is_valid_username(username)
 
 
 def test_is_valid_password_hash():
     for invalid_type in [None, 0, True, ("x",), ["x"]]:
         with pytest.raises(TypeError):
-            User.is_valid_password_hash(invalid_type)
+            User.assert_is_valid_password_hash(invalid_type)
 
     invalid_hashes = [
         "", " ", "\t", "\n",
@@ -38,20 +40,21 @@ def test_is_valid_password_hash():
         "foobar$", "foo bar",
     ]
     for invalid_hash in invalid_hashes:
-        assert not User.is_valid_password_hash(invalid_hash)
+        with pytest.raises(InvalidStringFormatException):
+            User.assert_is_valid_password_hash(invalid_hash)
 
     valid_hashes = [
         # can contain [A-Za-z0-9+/] and up to two '=' at the end
         "EzM3", "abcABC123+/=",
     ]
     for valid_hash in valid_hashes:
-        assert User.is_valid_password_hash(valid_hash)
+        User.assert_is_valid_password_hash(valid_hash)
 
 
 def test_is_valid_email():
     for invalid_type in [None, 0, True, ("x",), ["x"]]:
         with pytest.raises(TypeError):
-            User.is_valid_email(invalid_type)
+            User.assert_is_valid_email(invalid_type)
 
     invalid_emails = [
         "", " ", "\t", "\n",
@@ -59,34 +62,36 @@ def test_is_valid_email():
         "alice@example.com ", "alice@ex ample.com"
     ]
     for invalid_email in invalid_emails:
-        assert not User.is_valid_email(invalid_email)
+        with pytest.raises(InvalidStringFormatException):
+            User.assert_is_valid_email(invalid_email)
 
     valid_emails = [
         # can contain [A-Za-z0-9+/] and up to two '=' at the end
         "alice@example.com", "a@b.c", "Alice.1337$&@Fo0.xyz",
     ]
     for valid_email in valid_emails:
-        assert User.is_valid_email(valid_email)
+        User.assert_is_valid_email(valid_email)
     
 
-def test_is_valid_person_name():
+def test_is_valid_name():
     for invalid_type in [None, 0, True, ("x",), ["x"]]:
         with pytest.raises(TypeError):
-            User.is_valid_person_name(invalid_type)
+            User.assert_is_valid_name(invalid_type)
 
     invalid_names = [
         "", " ", "\t", "\n",
         "Alice Jones", " Alice",
     ]
     for invalid_name in invalid_names:
-        assert not User.is_valid_person_name(invalid_name)
+        with pytest.raises(InvalidStringFormatException):
+            User.assert_is_valid_name(invalid_name)
 
     valid_names = [
         "Alice", "Älice", "Böb", "A1lic3$",
         "a", "1",
     ]
     for valid_name in valid_names:
-        assert User.is_valid_person_name(valid_name)
+        User.assert_is_valid_name(valid_name)
 
 
 def test_is_valid_picture():
@@ -218,18 +223,19 @@ def test_User_eq(app):
 def test_is_valid_groupname():
     for invalid_type in [None, 0, True, ("x",), ["x"]]:
         with pytest.raises(TypeError):
-            Group.is_valid_groupname(invalid_type)
+            Group.assert_is_valid_groupname(invalid_type)
 
     for invalid_input in [
         "", " ", "foo ", " foo",
         "1foo", "foo_", "Foo="
     ]:
-        assert not Group.is_valid_groupname(invalid_input)
+        with pytest.raises(InvalidStringFormatException):
+            Group.assert_is_valid_groupname(invalid_input)
 
     for valid_input in [
         "foo", "foo123", "F1oFoFo", "o2FoFo",
     ]:
-        assert Group.is_valid_groupname(valid_input)
+        Group.assert_is_valid_groupname(valid_input)
 
 
 def test_Group(app):