diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/UserTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/UserTest.java index 7bd0ff4..d12331f 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/UserTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/UserTest.java @@ -4,6 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.UUID; + +import ntnu.sytemutvikling.team6.models.user.Inbox; +import ntnu.sytemutvikling.team6.models.user.Role; +import ntnu.sytemutvikling.team6.models.user.Settings; +import ntnu.sytemutvikling.team6.models.user.User; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +30,6 @@ void shouldThrowIfIdIsNull() { IllegalArgumentException.class, () -> new User( - null, validName, validEmail, validPassword, @@ -40,7 +44,7 @@ void shouldThrowIfNameIsNull() { IllegalArgumentException.class, () -> new User( - validID, null, validEmail, validPassword, validRole, validSettings, validInbox)); + null, validEmail, validPassword, validRole, validSettings, validInbox)); } @Test @@ -49,7 +53,7 @@ void shouldThrowIfNameIsBlank() { IllegalArgumentException.class, () -> new User( - validID, " ", validEmail, validPassword, validRole, validSettings, validInbox)); + " ", validEmail, validPassword, validRole, validSettings, validInbox)); } @Nested @@ -61,7 +65,7 @@ void shouldThrowIfEmailIsNull() { IllegalArgumentException.class, () -> new User( - validID, validName, null, validPassword, validRole, validSettings, validInbox)); + validName, null, validPassword, validRole, validSettings, validInbox)); } @Test @@ -70,7 +74,7 @@ void shouldThrowIfEmailIsBlank() { IllegalArgumentException.class, () -> new User( - validID, validName, " ", validPassword, validRole, validSettings, validInbox)); + validName, " ", validPassword, validRole, validSettings, validInbox)); } @Test @@ -79,7 +83,7 @@ void shouldThrowIfEmailDoesNotContainAt() { IllegalArgumentException.class, () -> new User( - validID, + validName, "test.gmail.com", validPassword, @@ -94,7 +98,7 @@ void shouldThrowIfEmailDoesNotContainPeriod() { IllegalArgumentException.class, () -> new User( - validID, + validName, "test@gmailcom", validPassword, @@ -109,7 +113,7 @@ void shouldThrowIfPasswordIsNull() { assertThrows( IllegalArgumentException.class, () -> - new User(validID, validName, validEmail, null, validRole, validSettings, validInbox)); + new User( validName, validEmail, null, validRole, validSettings, validInbox)); } @Test @@ -118,7 +122,7 @@ void shouldThrowIfRoleIsNull() { IllegalArgumentException.class, () -> new User( - validID, validName, validEmail, validPassword, null, validSettings, validInbox)); + validName, validEmail, validPassword, null, validSettings, validInbox)); } @Test @@ -126,7 +130,7 @@ void shouldThrowIfPasswordIsBlank() { assertThrows( IllegalArgumentException.class, () -> - new User(validID, validName, validEmail, " ", validRole, validSettings, validInbox)); + new User( validName, validEmail, " ", validRole, validSettings, validInbox)); } @Test @@ -134,7 +138,7 @@ void shouldThrowIfSettingsIsNull() { assertThrows( IllegalArgumentException.class, () -> - new User(validID, validName, validEmail, validPassword, validRole, null, validInbox)); + new User( validName, validEmail, validPassword, validRole, null, validInbox)); } @Test @@ -143,14 +147,14 @@ void shouldThrowIfInboxIsNull() { IllegalArgumentException.class, () -> new User( - validID, validName, validEmail, validPassword, validRole, validSettings, null)); + validName, validEmail, validPassword, validRole, validSettings, null)); } @Test void shouldCreateUser() { User user = new User( - validID, validName, validEmail, validPassword, validRole, validSettings, validInbox); + validName, validEmail, validPassword, validRole, validSettings, validInbox); assertAll( () -> assertEquals(validID, user.getId()),