debugging: changes in user name(...)

cathrkri · Apr 17, 2026 · 0881467 · 0881467
1 parent 863b00b
commit 0881467
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 8 deletions.
diff --git a/...elpapplication/src/test/java/ntnu/systemutvikling/team6/database/DAO/DonationDAOTest.java b/...elpapplication/src/test/java/ntnu/systemutvikling/team6/database/DAO/DonationDAOTest.java
@@ -40,14 +40,22 @@ void setUp() {
   void addDonationShouldInsertDonationIntoDatabase() throws Exception {
     double amount = 100.0;
 
-    DonationDAO.addDonation(
-        charity,
-        new User(UUID.randomUUID().toString(), "ad", "dwad@ca.com", "CHARITY_USER", "NORMAL_USER"),
-        amount);
+    DonationDAO donationDAO = new DonationDAO(new DatabaseConnection());
+
+    donationDAO.addDonation(
+            charity,
+            new User(
+                    UUID.randomUUID().toString(),
+                    "ad",
+                    "aduser",
+                    "dwad@ca.com",
+                    "secret",
+                    "NORMAL_USER"),
+            amount);
 
     try (Connection conn = new DatabaseConnection().getMySqlConnection()) {
       PreparedStatement stmt =
-          conn.prepareStatement("SELECT amount FROM Donations WHERE charity_id = ?");
+              conn.prepareStatement("SELECT amount FROM Donations WHERE charity_id = ?");
 
       stmt.setString(1, charity.getUUID().toString());
 

diff --git a/...lication/src/test/java/ntnu/systemutvikling/team6/database/Readers/CharitySelectTest.java b/...lication/src/test/java/ntnu/systemutvikling/team6/database/Readers/CharitySelectTest.java
@@ -270,7 +270,7 @@ void getFeedbackforCharityUUID_oneRow_returnsSingleFeedback() throws Exception {
     Feedback feedback = result.get(0);
     assertEquals(feedback1Id, feedback.getFeedbackId().toString());
     assertEquals("Very helpful!", feedback.getComment());
-    assertEquals("Bob", feedback.getUser().getName());
+    assertEquals("Bob", feedback.getUser().getDisplayName());
   }
 
   @Test

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java
@@ -19,7 +19,14 @@ public void setup() {
     charity = new Charity("Charity1", "www.aaaa.com", "Cancer", false, "unverified");
 
     user =
-        new User("Name", "Valid@gmail.com", "123", Role.NORMAL_USER, new Settings(), new Inbox());
+            new User(
+                    "Name",
+                    "username",
+                    "Valid@gmail.com",
+                    "123",
+                    Role.NORMAL_USER,
+                    new Settings(),
+                    new Inbox());
   }
 
   // --- Tests ---

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java
@@ -21,7 +21,14 @@ class FeedbackTest {
   public void setup() {
     settings = new Settings(); // default anonymous = true
     user =
-        new User("Name", "Valid@gmail.com", "123", Role.NORMAL_USER, new Settings(), new Inbox());
+            new User(
+                    "Name",
+                    "username",
+                    "Valid@gmail.com",
+                    "123",
+                    Role.NORMAL_USER,
+                    new Settings(),
+                    new Inbox());
   }
 
   // --- Tests ---

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
@@ -171,6 +171,21 @@ void shouldThrowIfRoleIsNull() {
                               validInbox));
     }
 
+    @Test
+    void shouldThrowIfPasswordIsBlank() {
+      assertThrows(
+              IllegalArgumentException.class,
+              () ->
+                      new User(
+                              validDisplayName,
+                              validUsername,
+                              validEmail,
+                              " ",
+                              validRole,
+                              validSettings,
+                              validInbox));
+    }
+
     @Test
     void shouldThrowIfSettingsIsNull() {
       assertThrows(