tags and
elements as separate paragraphs
- String description = section.select("p, div").stream()
- .filter(el -> el.tagName().equals("p") || el.select("p").isEmpty())
- .filter(el -> !el.hasClass("extra-info") && !el.hasClass("logo"))
- .map(Element::text)
- .map(text -> text.replace("Les mer", "").trim())
- .filter(text -> !text.isBlank())
- .collect(Collectors.joining("\n\n"));
-
- // Fallback: if no paragraphs found, get all text from section
- if (description.isBlank()) {
- description = section.text().trim();
- }
- description = description.replace("Les mer", "").trim();
-
- // Only cache and return if we found something meaningful
- if (!description.isBlank()) {
- descriptionCache.put(pageUrl, description);
- return description;
- }
+ String description = parseDescription(doc);
+ if (!description.isBlank()) {
+ descriptionCache.put(pageUrl, description);
+ return description;
}
} catch (Exception e) {
System.out.println("Could not get description for: " + pageUrl);
@@ -72,6 +51,42 @@ public String fetchDescription(String pageUrl) {
return null;
}
+ /**
+ * Parses the description from a Document by extracting text content
+ * from {@code }.
+ *
+ * @param doc the Document to parse
+ * @return the description text, or empty string if not found
+ */
+ protected String parseDescription(Document doc) {
+ Element section = doc.selectFirst("section.information");
+ if (section != null) {
+ section.select("div.extra-info").remove();
+ section.select("a.read-more").remove();
+
+ // Extract all
tags and
elements as separate paragraphs
+ String description = section.select("p, div").stream()
+ .filter(el -> el.tagName().equals("p") || el.select("p").isEmpty())
+ .filter(el -> !el.hasClass("extra-info") && !el.hasClass("logo"))
+ .map(Element::text)
+ .map(text -> text.replace("Les mer", "").trim())
+ .filter(text -> !text.isBlank())
+ .collect(Collectors.joining("\n\n"));
+
+ // Fallback: if no paragraphs found, get all text from section
+ if (description.isBlank()) {
+ description = section.text().trim();
+ }
+ description = description.replace("Les mer", "").trim();
+
+ // Only return if we found something meaningful
+ if (!description.isBlank()) {
+ return description;
+ }
+ }
+ return "";
+ }
+
/**
* Fetches the logo URL for the given page by scraping the {@code div.logo img}
* element. Results are cached so each URL is only fetched once.
@@ -88,10 +103,9 @@ public String fetchLogoUrl(String pageUrl) {
Document doc = Jsoup.connect(pageUrl)
.userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36")
.timeout(5000).get();
- Element img = doc.selectFirst("div.logo img");
- if (img != null) {
- String logoUrl = img.absUrl("src");
+ String logoUrl = parseLogoUrl(doc);
+ if (!logoUrl.isBlank()) {
logoCache.put(pageUrl, logoUrl);
return logoUrl;
}
@@ -100,4 +114,20 @@ public String fetchLogoUrl(String pageUrl) {
}
return null;
}
+
+ /**
+ * Parses the logo URL from a Document by extracting the image src
+ * from {@code div.logo img}.
+ *
+ * @param doc the Document to parse
+ * @return the absolute logo URL, or empty string if not found
+ */
+ protected String parseLogoUrl(Document doc) {
+ Element img = doc.selectFirst("div.logo img");
+ if (img != null) {
+ String logoUrl = img.absUrl("src");
+ return logoUrl.isBlank() ? "" : logoUrl;
+ }
+ return "";
+ }
}
diff --git a/src/main/java/edu/group5/app/model/user/UserRepository.java b/src/main/java/edu/group5/app/model/user/UserRepository.java
index 07f9ca8..aec3e9d 100644
--- a/src/main/java/edu/group5/app/model/user/UserRepository.java
+++ b/src/main/java/edu/group5/app/model/user/UserRepository.java
@@ -6,7 +6,13 @@
import edu.group5.app.model.DBRepository;
import edu.group5.app.utils.ParameterValidator;
-
+/**
+ * Repository class for managing User entities.
+ * It provides methods to retrieve users, find users by their unique identifier
+ * or email address, and initializes the repository with input data.
+ * The repository uses a HashMap to store
+ * User objects for efficient retrieval based on their unique identifier.
+ */
public class UserRepository extends DBRepository {
public final static String ROLE_CUSTOMER = "Customer";
@@ -14,7 +20,7 @@ public class UserRepository extends DBRepository {
* Constructs UserRepository using Hashmap,
* and extends the content from DBRepository.
*
- * @param content the underlying map used to store users,
+ * @param rows the underlying map used to store users,
* where the key represents the user ID
*/
public UserRepository(List rows) {
@@ -69,6 +75,11 @@ public List export() {
}
+ /**
+ * Retrieves a copy of the current users in the repository.
+ * @return a HashMap containing the current users,
+ * where the key is the user ID and the value is the User object
+ */
public HashMap getUsers() {
return new HashMap<>(content);
}
diff --git a/src/main/java/edu/group5/app/model/user/UserService.java b/src/main/java/edu/group5/app/model/user/UserService.java
index 6bee483..e6439f1 100644
--- a/src/main/java/edu/group5/app/model/user/UserService.java
+++ b/src/main/java/edu/group5/app/model/user/UserService.java
@@ -51,7 +51,8 @@ public boolean registerUser(String role, String firstName, String lastName,
firstName == null || firstName.trim().isEmpty() ||
lastName == null || lastName.trim().isEmpty() ||
email == null || email.trim().isEmpty() ||
- passwordHash == null || passwordHash.trim().isEmpty()) {
+ passwordHash == null || passwordHash.trim().isEmpty() ||
+ this.getUserByEmail(email) != null) {
return false;
}
User user;
diff --git a/src/main/java/edu/group5/app/model/wrapper/DbWrapper.java b/src/main/java/edu/group5/app/model/wrapper/DbWrapper.java
index f357ae1..d0239ae 100644
--- a/src/main/java/edu/group5/app/model/wrapper/DbWrapper.java
+++ b/src/main/java/edu/group5/app/model/wrapper/DbWrapper.java
@@ -14,7 +14,9 @@
import java.util.logging.Logger;
/**
- * A class for wrapping the database.
+ * A class for wrapping the database. It provides methods for connecting and disconnecting to the database,
+ * importing and exporting users and donations, and handling SQL exceptions.
+ * The class uses a logger to log important events and exceptions that occur during database operations.
*/
public class DbWrapper {
protected Connection connection;
@@ -132,8 +134,10 @@ public List importUsers() {
* @throws IllegalArgumentException This exception is thrown when data is null, its rows are not
* of length 6, any of the rows are null, any of the rows are duplicates or existing rows in
* the database, or any of the values in the rows can't be cast to the correct data-types.
+ * @throws SQLException Is thrown when an unexpected exception like trying to export a number
+ * that's too big happens.
*/
- public int exportUsers(List data) throws IllegalArgumentException {
+ public int exportUsers(List data) throws IllegalArgumentException, SQLException {
this.importUsers();
ParameterValidator.exportChecker(data, "data", this.users, 6);
@@ -163,6 +167,7 @@ public int exportUsers(List data) throws IllegalArgumentException {
this.logger.info("Users exported");
} catch (SQLException e) {
this.logger.log(Level.SEVERE, "Unexpected SQL exception", e);
+ throw new SQLException("An unexpected SQL exception has occurred. This might be caused by inserting an item that is too large.");
} finally {
this.close(null, ps);
}
@@ -230,8 +235,10 @@ private List importDonations(int user_id, boolean all) {
* @throws IllegalArgumentException This exception is thrown when data is null, its rows are not
* of length 6, any of the rows are null, any of the rows are duplicates or existing rows in
* the database, or any of the values in the rows can't be cast to the correct data-types.
+ * @throws SQLException Is thrown when an unexpected exception like trying to export a number that's
+ * too big happens.
*/
- public int exportDonations(List data) throws IllegalArgumentException {
+ public int exportDonations(List data) throws IllegalArgumentException, SQLException {
this.fetchAllDonations();
ParameterValidator.exportChecker(data, "data", this.donations, 6);
@@ -263,6 +270,7 @@ public int exportDonations(List data) throws IllegalArgumentException
this.logger.info("Donations exported");
} catch (SQLException e) {
this.logger.log(Level.SEVERE, "Unexpected SQL exception", e);
+ throw new SQLException("An unexpected SQL exception has occurred. This might be caused by inserting an item that is too large.");
} finally {
this.close(null, ps);
}
diff --git a/src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java b/src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java
index 2a493e4..d2ebb1a 100644
--- a/src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java
+++ b/src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java
@@ -10,7 +10,8 @@
import tools.jackson.databind.ObjectMapper;
/**
- * A Class for Wrapping an API.
+ * A Class for Wrapping an API.
+ * It provides methods for importing data from the API and accessing the imported data.
*/
public class OrgApiWrapper extends Wrapper {
private Object[] data;
diff --git a/src/main/java/edu/group5/app/model/wrapper/Wrapper.java b/src/main/java/edu/group5/app/model/wrapper/Wrapper.java
index 85d8dc8..cc54c29 100644
--- a/src/main/java/edu/group5/app/model/wrapper/Wrapper.java
+++ b/src/main/java/edu/group5/app/model/wrapper/Wrapper.java
@@ -2,6 +2,9 @@
/**
* An abstract class for all Wrappers of datasets.
+ * This class defines the structure for dataset wrappers, which are responsible for importing data from various sources
+ * and providing access to the imported data. Each wrapper must implement the importData method to handle the specific
+ * data import logic and the getData method to return the imported data in a suitable format.
*/
abstract class Wrapper {
diff --git a/src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java b/src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java
index bdcfb54..70f40ea 100644
--- a/src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java
+++ b/src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java
@@ -66,6 +66,7 @@ public char[] getPassword() {
public void showError(String message) {
errorLabel.setText(message);
+ errorLabel.setWrapText(true);
errorLabel.setStyle("-fx-text-fill: red;");
}
@@ -87,7 +88,6 @@ private VBox getSignUpBox() {
private Label getErrorLabel() {
errorLabel = new Label();
- errorLabel.setPrefHeight(20);
return errorLabel;
}
diff --git a/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java b/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java
index f591d26..7ea3b6b 100644
--- a/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java
+++ b/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java
@@ -96,7 +96,7 @@ private StackPane createImageContainer() {
// Load image in background thread to avoid blocking UI
new Thread(() -> {
try {
- Image image = new Image(org.logoUrl(), 120, 120, true, true);
+ Image image = new Image(org.logoUrl(), 350, 350, true, true);
Platform.runLater(() -> {
ImageView logo = new ImageView(image);
logo.setId("logo");
diff --git a/src/main/java/edu/group5/app/view/userpage/UserPageView.java b/src/main/java/edu/group5/app/view/userpage/UserPageView.java
index cf6f801..aff5b32 100644
--- a/src/main/java/edu/group5/app/view/userpage/UserPageView.java
+++ b/src/main/java/edu/group5/app/view/userpage/UserPageView.java
@@ -23,7 +23,18 @@
import java.text.SimpleDateFormat;
import java.util.*;
-
+/**
+ * A view for the user profile page.
+ *
+ * donations = donationService.getOrganizationDonations(101);
+ assertEquals(2, donations.size());
+ assertTrue(donations.containsKey(1));
+ assertTrue(donations.containsKey(2));
+ assertEquals(donation1, donations.get(1));
+ assertEquals(donation2, donations.get(2));
+ }
+
+ @Test
+ void getOrganizationDonationsReturnsEmptyMapIfNoDonations() {
+ assertTrue(donationService.getOrganizationDonations(1).isEmpty());
+ }
+
@Test
void donateReturnsFalseIfCustomerNull() {
boolean result = donationService.donate(null,
diff --git a/src/test/java/edu/group5/app/model/donation/DonationTest.java b/src/test/java/edu/group5/app/model/donation/DonationTest.java
index f8f9069..1de92f9 100644
--- a/src/test/java/edu/group5/app/model/donation/DonationTest.java
+++ b/src/test/java/edu/group5/app/model/donation/DonationTest.java
@@ -74,11 +74,19 @@ void testIfThrowsExceptionWhenOrganizationIdIsNotPositive() {
amount1, date1, paymentMethod1);
}
@Test
- void testIfThrowsExceptionWhenAmountIsNotPositive() {
+ void testIfThrowsExceptionWhenAmountIsNegative() {
expectedMessage = "Amount must be positive and not null";
exceptionTest(donationId1, userId1, organizationId1,
- new BigDecimal("0.00"), date1, paymentMethod1);
+ new BigDecimal("-1.00"), date1, paymentMethod1);
}
+
+ @Test
+ void testIfThrowsExceptionWhenAmountIsNull() {
+ expectedMessage = "Amount must be positive and not null";
+ exceptionTest(donationId1, userId1, organizationId1,
+ null, date1, paymentMethod1);
+ }
+
@Test
void testIfThrowsExceptionWhenDateIsNull() {
expectedMessage = "Date must not be null";
diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java
index a5eab05..e6b0cf9 100644
--- a/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java
+++ b/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java
@@ -60,6 +60,30 @@ void constructor_ThrowsWhenContentIsNull() {
constructorTest(null, "Input data can't be null");
}
+ @Test
+ void constructor_SkipsOrganizationWithMissingOrgNumber() {
+ Object[] content = new Object[] {
+ Map.of(
+ "name", "Good Org",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ ),
+ Map.of(
+ "org_number", "999",
+ "name", "Bad Org",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ )
+ };
+
+ OrganizationRepository repo = new OrganizationRepository(content, scraper);
+
+ assertEquals(1, repo.findByOrgNumber(999) != null ? 1 : 0);
+ assertNull(repo.findByOrgNumber(1));
+ }
+
@Test
void constructor_ThrowsWhenScraperIsNull() {
Object[] content = new Object[] {
diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java
index c6c318b..5d48428 100644
--- a/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java
+++ b/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java
@@ -2,6 +2,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
import static org.junit.jupiter.api.Assertions.*;
@@ -15,23 +18,23 @@ void setUp() {
}
@Test
- void fetchDescription_ReturnsNullWhenUrlIsNull() {
+ void fetchDescriptionReturnsNullWhenUrlIsNull() {
assertNull(scraper.fetchDescription(null));
}
@Test
- void fetchDescription_ReturnsNullWhenUrlIsBlank() {
+ void fetchDescriptionReturnsNullWhenUrlIsBlank() {
assertNull(scraper.fetchDescription(""));
}
@Test
- void fetchDescription_ReturnsNullWhenUrlIsInvalid() {
+ void fetchDescriptionReturnsNullWhenUrlIsInvalid() {
String result = scraper.fetchDescription("https://invalid-url-that-does-not-exist-xyz123.com");
assertNull(result);
}
@Test
- void fetchDescription_CachesResultOnSecondCall() {
+ void fetchDescriptionCachesResultOnSecondCall() {
// Mock URLs won't work, but cache still works with null returns
scraper.fetchDescription("https://example.com");
scraper.fetchDescription("https://example.com");
@@ -40,27 +43,104 @@ void fetchDescription_CachesResultOnSecondCall() {
}
@Test
- void fetchLogoUrl_ReturnsNullWhenUrlIsNull() {
+ void fetchLogoUrlReturnsNullWhenUrlIsNull() {
assertNull(scraper.fetchLogoUrl(null));
}
@Test
- void fetchLogoUrl_ReturnsNullWhenUrlIsBlank() {
+ void fetchLogoUrlReturnsNullWhenUrlIsBlank() {
assertNull(scraper.fetchLogoUrl(""));
}
@Test
- void fetchLogoUrl_ReturnsNullWhenUrlIsInvalid() {
+ void fetchLogoUrlReturnsNullWhenUrlIsInvalid() {
String result = scraper.fetchLogoUrl("https://invalid-url-that-does-not-exist-xyz123.com");
assertNull(result);
}
@Test
- void fetchLogoUrl_CachesResultOnSecondCall() {
+ void fetchLogoUrlCachesResultOnSecondCall() {
// Mock URLs won't work, but cache still works with null returns
scraper.fetchLogoUrl("https://example.com");
scraper.fetchLogoUrl("https://example.com");
// If no exception thrown, cache works
assertTrue(true);
}
-}
+
+ @Test
+ void fetchDescriptionReturnsCachedValue() {
+ OrganizationScraper scraper = new OrganizationScraper();
+
+ // First call - caches (but makes real request)
+ String result1 = scraper.fetchDescription("https://example.com");
+
+ // Second call - should return cached without new request
+ String result2 = scraper.fetchDescription("https://example.com");
+
+ assertEquals(result1, result2); // Same object = cached
+ }
+
+ @Test
+ void fetchDescriptionHandlesExceptionGracefully() {
+ String result = scraper.fetchDescription("https://invalid-domain-xyz.test");
+ assertNull(result);
+ }
+
+ @Test
+ void fetchLogoUrlHandlesExceptionGracefully() {
+ String result = scraper.fetchLogoUrl("https://invalid-domain-xyz.test");
+ assertNull(result);
+ }
+
+ @Test
+ void parseDescriptionExtractsParagraphs() {
+ String html = "Fallback text without paragraph tags ";
+ Document doc = Jsoup.parse(html);
+ assertEquals("Fallback text without paragraph tags", scraper.parseDescription(doc));
+ }
+
+ @Test
+ void parseDescriptionRemovesExtraInfoDivs() {
+ String html = "![](\"/logo.png\")
";
+ Document doc = Jsoup.parse(html);
+ doc.setBaseUri("https://example.com");
+ assertTrue(scraper.parseLogoUrl(doc).contains("logo.png"));
+ }
+
+ @Test
+ void parseLogoUrlReturnsEmptyWhenNoImage() {
+ String html = "";
+ Document doc = Jsoup.parse(html);
+ assertEquals("", scraper.parseLogoUrl(doc));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/edu/group5/app/model/user/UserServiceTest.java b/src/test/java/edu/group5/app/model/user/UserServiceTest.java
index 104e2f1..459b635 100644
--- a/src/test/java/edu/group5/app/model/user/UserServiceTest.java
+++ b/src/test/java/edu/group5/app/model/user/UserServiceTest.java
@@ -71,11 +71,11 @@ void registerUserInvalidInputsReturnFalse() {
}
@Test
- void registerUserDuplicateEmailAllowedInCurrentCode() {
+ void registerUserDuplicateEmailNotAllowedInCurrentCode() {
boolean result = service.registerUser("Customer", "John", "Cena",
"john.cena@example.com", "$2a$10$hashed");
- assertTrue(result);
- assertEquals(3, repo.getUsers().size());
+ assertFalse(result);
+ assertEquals(2, repo.getUsers().size());
}
@Test
diff --git a/src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java b/src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java
index 1db7a90..289b803 100644
--- a/src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java
+++ b/src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,12 +26,14 @@ public class DbWrapperDonationsTest {
private Object[] cutoffDonation;
private Object[] freakyDonation;
private Object[] repeatingDonation;
+ private Object[] tooBigDonation;
private List donations;
private List donations2;
private List donations3;
private List repeatedDonations;
private List wrongFormatDonations;
private List wrongDatatypeDonations;
+ private List tooBigDonations;
private List nullList;
private static final int PRECISION = 5;
@@ -40,10 +43,10 @@ public class DbWrapperDonationsTest {
@BeforeEach
void init() {
this.db = new DbWrapper(true);
- String[] firstNames = new String[] { "John", "Jane", "Cutoff", "Freaky", "Repeating" };
- String[] lastNames = new String[] { "Doe", "Doe", "Joh", "Bill", "JoeJoe" };
+ String[] firstNames = new String[] { "John", "Jane", "Cutoff", "Freaky", "Repeating", "Big" };
+ String[] lastNames = new String[] { "Doe", "Doe", "Joh", "Bill", "JoeJoe", "Willy" };
this.users = new ArrayList();
- for (int i = 0; i < 5; i++) {
+ for (int i = 0; i < firstNames.length; i++) {
Object[] row = new Object[6];
row[0] = i + 1;
row[1] = "Customer";
@@ -84,12 +87,23 @@ void init() {
this.wrongDatatypeDonations = new ArrayList();
this.wrongDatatypeDonations.add(freakyDonation);
+ this.tooBigDonation = new Object[] {
+ 6, 6, 999999, new BigDecimal("9999999999999999999999999999999"),
+ new Timestamp(new Date().getTime()), "Azerbaijani technologies"
+ };
+ this.tooBigDonations = new ArrayList();
+ this.tooBigDonations.add(tooBigDonation);
+
Object[] nullRow = new Object[] {null, null, null, null, null, null};
this.nullList = new ArrayList();
this.nullList.add(nullRow);
this.db.connect();
- this.db.exportUsers(users);
+ try {
+ this.db.exportUsers(users);
+ } catch (Exception e) {
+ // This exception won't happen
+ }
}
private static boolean donationEquals(Object[] array1, Object[] array2) {
@@ -150,7 +164,7 @@ public void wronglyDatatypedDonationsThrowsExpectedException() {
@Test
public void addingSameDonationTwiceThrowsExpectedException() {
assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
- assertEquals(1, this.db.exportDonations(this.donations));
+ assertDoesNotThrow(() -> assertEquals(1, this.db.exportDonations(this.donations)));
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
this.db.exportDonations(this.donations);
});
@@ -163,7 +177,7 @@ public void addingSameDonationTwiceThrowsExpectedException() {
public void addingSameDonationTwiceThrowsExpectedException2() {
assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
assertTrue(this.db.importDonations((int) this.users.get(1)[0]).size() == 0);
- assertEquals(2, this.db.exportDonations(this.donations2));
+ assertDoesNotThrow(() -> assertEquals(2, this.db.exportDonations(this.donations2)));
IllegalArgumentException exception = assertThrows(
IllegalArgumentException.class,
() -> {
@@ -212,8 +226,20 @@ public void addingDonationListWithNullInRowThrowsExpectedException() {
@Test
public void dataIsEmptyAfterExportingAndImportingEmptyList() {
assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
- assertEquals(0, this.db.exportDonations(new ArrayList()));
+ assertDoesNotThrow(() -> assertEquals(0, this.db.exportDonations(new ArrayList())));
assertTrue(this.db.importDonations((int) this.users.get(0)[0]).size() == 0);
assertTrue(this.db.disconnect());
}
+
+ @Test
+ public void exportTooBigNumberThrowsSQLException() {
+ SQLException exception = assertThrows(SQLException.class, () -> {
+ this.db.exportDonations(this.tooBigDonations);
+ });
+ assertEquals(
+ "An unexpected SQL exception has occurred. " +
+ "This might be caused by inserting an item that is too large.",
+ exception.getMessage()
+ );
+ }
}
diff --git a/src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java b/src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java
index 00107de..e8621d8 100644
--- a/src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java
+++ b/src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java
@@ -5,6 +5,7 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -20,12 +21,14 @@ public class DbWrapperUserTest {
private Object[] cutoffJoh;
private Object[] freakyBill;
private Object[] repeatingJoeJoe;
+ private Object[] bigWilly;
private List users;
private List users2;
private List users3;
private List repeatedUsers;
private List wrongFormatUsers;
private List wrongDatatypeUsers;
+ private List tooBigUsers;
private List nullList;
private DbWrapper db;
@@ -60,6 +63,12 @@ void init() {
this.wrongDatatypeUsers = new ArrayList();
this.wrongDatatypeUsers.add(freakyBill);
+ this.bigWilly = new Object[] {
+ 6, "Customer", "Big", "Willy", "bigdwilly@waaaaaytoolargemail.com", "passssssssssssword"
+ };
+ this.tooBigUsers = new ArrayList();
+ this.tooBigUsers.add(this.bigWilly);
+
Object[] nullRow = new Object[] {null, null, null, null, null, null};
this.nullList = new ArrayList();
this.nullList.add(nullRow);
@@ -122,7 +131,7 @@ public void wronglyDatatypedUsersThrowsExpectedException() {
public void addingSameUserTwiceThrowsExpectedException() {
assertTrue(this.db.connect());
assertTrue(this.db.importUsers().size() == 0);
- assertEquals(1, this.db.exportUsers(this.users));
+ assertDoesNotThrow(() -> assertEquals(1, this.db.exportUsers(this.users)));
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
this.db.exportUsers(this.users);
});
@@ -135,7 +144,7 @@ public void addingSameUserTwiceThrowsExpectedException() {
public void addingSameUserTwiceThrowsExpectedException2() {
assertTrue(this.db.connect());
assertTrue(this.db.importUsers().size() == 0);
- assertEquals(2, this.db.exportUsers(this.users2));
+ assertDoesNotThrow(() -> assertEquals(2, this.db.exportUsers(this.users2)));
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
this.db.exportUsers(this.users);
});
@@ -179,4 +188,18 @@ public void addingUserListWithNullInRowThrowsExpectedException() {
assertTrue(this.db.disconnect());
assertEquals("One or more rows in data contains null values", exception.getMessage());
}
+
+ @Test
+ public void exportTooLongNameThrowsSQLException() {
+ assertTrue(this.db.connect());
+ assertTrue(this.db.importUsers().size() == 0);
+ SQLException exception = assertThrows(SQLException.class, () -> {
+ this.db.exportUsers(this.tooBigUsers);
+ });
+ assertEquals(
+ "An unexpected SQL exception has occurred. " +
+ "This might be caused by inserting an item that is too large.",
+ exception.getMessage()
+ );
+ }
}
Displays the current user's profile information, + * including avatar, full name, email and location, along with a logout button. + * The page is divided into three sections: + * Profile information, Supported causes, and previous donations.
+ * + *Supported causes shows all the organizations that the user has donated to. + * Previous donations shows a list of all the user's donations, + * and includes a search bar to filter through them.
+ */ public class UserPageView extends BorderPane { private final NavigationController nav; private final AuthController authController; diff --git a/src/test/java/edu/group5/app/model/AppStateTest.java b/src/test/java/edu/group5/app/model/AppStateTest.java new file mode 100644 index 0000000..1254033 --- /dev/null +++ b/src/test/java/edu/group5/app/model/AppStateTest.java @@ -0,0 +1,69 @@ +package edu.group5.app.model; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.math.BigDecimal; + +import org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import edu.group5.app.model.organization.Organization; +import edu.group5.app.model.user.Customer; +import edu.group5.app.model.user.User; + +public class AppStateTest { + private User nullUser; + private BigDecimal nullDonationAmount; + private Organization nullOrganization; + private String nullPaymentMethod; + + private User currentTestUser; + private BigDecimal currentTestDonationAmount; + private Organization currentTestOrganization; + private String currentTestPaymentMethod; + + @BeforeEach + void setUp() { + nullUser = null; + nullDonationAmount = null; + nullOrganization = null; + nullPaymentMethod = null; + + currentTestUser = new Customer(1, "Bob", + "Builder", "testuser@example.com", + "password123"); + + currentTestDonationAmount = BigDecimal.ZERO; + + currentTestOrganization = new Organization(1738, "TestOrg", + true, "https://testorg.example.com", true, + "A test organization", "https://testorg.example.com/logo.png"); + + currentTestPaymentMethod = "Credit Card"; + } + + @Test + void gettersAndSetters_WorkCorrectly() { + AppState appState = new AppState(); + + // Test current user + assertEquals(nullUser, appState.getCurrentUser()); + appState.setCurrentUser(currentTestUser); + assertEquals(currentTestUser, appState.getCurrentUser()); + + // Test current donation amount + assertEquals(nullDonationAmount, appState.getCurrentDonationAmount()); + appState.setCurrentDonationAmount(currentTestDonationAmount); + assertEquals(currentTestDonationAmount, appState.getCurrentDonationAmount()); + + // Test current organization + assertEquals(nullOrganization, appState.getCurrentOrganization()); + appState.setCurrentOrganization(currentTestOrganization); + assertEquals(currentTestOrganization, appState.getCurrentOrganization()); + + // Test current payment method + assertEquals(nullPaymentMethod, appState.getCurrentPaymentMethod()); + appState.setCurrentPaymentMethod(currentTestPaymentMethod); + assertEquals(currentTestPaymentMethod, appState.getCurrentPaymentMethod()); + } +} diff --git a/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java b/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java index 58bd170..3b1e5ff 100644 --- a/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java +++ b/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java @@ -12,7 +12,7 @@ import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; - +import java.util.Map; import static org.junit.jupiter.api.Assertions.*; @@ -61,6 +61,33 @@ void testConstructorThrowsIfOrganizationRepositoryIsNull() { assertEquals("OrganizationRepository can't be null", exception.getMessage()); } + @Test + void getUserDonationsReturnsEmptyMapIfNoDonations() { + assertTrue(donationService.getUserDonations(customer.getUserId()).isEmpty()); + } + + @Test + void getOrganizationDonationsReturnsMapOfDonations() { + Donation donation1 = new Donation(1, customer.getUserId(), + 101, new BigDecimal("20.00"), Timestamp.from(Instant.now()), "Card"); + Donation donation2 = new Donation(2, customer.getUserId(), + 101, new BigDecimal("30.00"), Timestamp.from(Instant.now()), "PayPal"); + donationRepository.addContent(donation1); + donationRepository.addContent(donation2); + + MapFirst paragraph
Second paragraph
Keep this
Remove this
Some text Les mer More text
No section here
";
+ Document doc = Jsoup.parse(html);
+ assertEquals("", scraper.parseDescription(doc));
+ }
+
+ @Test
+ void parseLogoUrlExtractsImageUrl() {
+ String html = "