diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java index c4851b5..17bfaef 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java @@ -43,11 +43,6 @@ void testDonationInitialization() { void testAnonymousFlagWhenUserIsAnonymous() { Donation donation = new Donation(100, LocalDateTime.now(), charity, user); - // According to your logic: - // if donor.getSettings().isAnonymous() == false → donation.isAnonymous = true - // else → donation.isAnonymous = false - // - // So if user.isAnonymous() == true → donation.isAnonymous should be false assertFalse(donation.isAnonymous()); } @@ -55,8 +50,7 @@ void testAnonymousFlagWhenUserIsAnonymous() { void testAnonymousFlagWhenUserIsNotAnonymous() { Donation donation = new Donation(100, LocalDateTime.now(), charity, user); - // If user.isAnonymous() == false → donation.isAnonymous = true - assertTrue(donation.isAnonymous()); + assertFalse(donation.isAnonymous()); } @Test diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java index b21def7..a9fc57d 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java @@ -50,6 +50,7 @@ void testAnonymousFlagWhenUserIsAnonymous() { @Test void testAnonymousFlagWhenUserIsNotAnonymous() { + user.getSettings().toggleAnonymousMode(); Feedback feedback = new Feedback(user, "Not anonymous"); assertTrue(feedback.isAnonymous()); 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 d12331f..fd20091 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 @@ -24,20 +24,6 @@ class constructorTests { private final Settings validSettings = new Settings(); private final Inbox validInbox = new Inbox(); - @Test - void shouldThrowIfIdIsNull() { - assertThrows( - IllegalArgumentException.class, - () -> - new User( - validName, - validEmail, - validPassword, - validRole, - validSettings, - validInbox)); - } - @Test void shouldThrowIfNameIsNull() { assertThrows( @@ -157,7 +143,6 @@ void shouldCreateUser() { validName, validEmail, validPassword, validRole, validSettings, validInbox); assertAll( - () -> assertEquals(validID, user.getId()), () -> assertEquals(validName, user.getName()), () -> assertEquals(validEmail, user.getEmail()), () -> assertEquals(validRole, user.getRole()), diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/security/PasswordHasherTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/security/PasswordHasherTest.java index dada18f..d195989 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/security/PasswordHasherTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/security/PasswordHasherTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.*; +import ntnu.sytemutvikling.team6.security.PasswordHasher; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test;