Skip to content

Refactor database query tests to handle empty result sets #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rvosa merged 5 commits into from
Dec 21, 2025
Merged

Refactor database query tests to handle empty result sets #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efb064d
Initial plan
Copilot Dec 21, 2025
0149dd4
Refactor DAO tests to handle empty database
Copilot Dec 21, 2025
80748cb
Refactor additional tests to handle empty database
Copilot Dec 21, 2025
ed1594f
Complete refactoring of all Nexus tests to handle empty database
Copilot Dec 21, 2025
6dce4f6
Fix missing List import in SubmissionDAOTest and AnalyzedDataDAOTest
Copilot Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 47 additions & 28 deletions treebase-core/src/test/java/org/cipres/treebase/dao/admin/PersonDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,27 @@ public void testFindByID() {
// 1. find a valid id first:
List<String> ids = jdbcTemplate.queryForList("select person_id from person", String.class);

// 2. verify correct handling of empty database
assertNotNull("Query should return non-null list", ids);

if (ids.size() > 0) {
assertTrue("Empty Person table.", ids.size() > 0);

// 2. find by user name:
// 3. find by user name:
PersonHome fixture = getPersonHome();
Long anId = Long.parseLong(ids.get(0));

Person result = fixture.findPersistedObjectByID(Person.class, anId);

// 3. verify
// 4. verify
assertTrue("Result is null", result != null);
assertTrue("Result id does not match.", result.getId().equals(anId));

if (logger.isInfoEnabled()) {
logger.info(testName + " verified id =" + anId);
}
} else {
if (logger.isInfoEnabled()) {
logger.info(testName + " - empty database, test skipped");
}
}

}
Expand All @@ -137,26 +142,30 @@ public void testFindByExactMatch() throws Exception {
// 1. find a valid person first:
Person p = (Person) loadObject(Person.class);

assertTrue("Empty Person table.", p != null);

// 2. create a new person object and test:
Person newP = new Person();
newP.setEmailAddressString(p.getEmailAddressString());
newP.setFirstName(p.getFirstName());
newP.setLastName(p.getLastName());
if (p != null) {
// 2. create a new person object and test:
Person newP = new Person();
newP.setEmailAddressString(p.getEmailAddressString());
newP.setFirstName(p.getFirstName());
newP.setLastName(p.getLastName());

PersonHome fixture = getPersonHome();
Person result = fixture.findByExactMatch(newP);
PersonHome fixture = getPersonHome();
Person result = fixture.findByExactMatch(newP);

// 3. verify
assertTrue(result != null);
assertTrue(result.getLastName().equals(result.getLastName()));
// 3. verify
assertTrue(result != null);
assertTrue(result.getLastName().equals(result.getLastName()));

// Notes: this is a dangerous verification. Let's see if it works:
assertTrue(result.getId().equals(p.getId()));
// Notes: this is a dangerous verification. Let's see if it works:
assertTrue(result.getId().equals(p.getId()));

if (logger.isInfoEnabled()) {
logger.info(testName + " verified id =" + p.getId() + " lastname =" + p.getLastName());
if (logger.isInfoEnabled()) {
logger.info(testName + " verified id =" + p.getId() + " lastname =" + p.getLastName());
}
} else {
if (logger.isInfoEnabled()) {
logger.info(testName + " - empty database, test skipped");
}
}

}
Expand All @@ -175,15 +184,16 @@ public void testFindByLastName() {
"select lastname from person",
String.class);

// 2. verify correct handling of empty database
assertNotNull("Query should return non-null list", lastNames);

if (lastNames.size() > 0) {
assertTrue("Empty Person table.", lastNames.size() > 0);

// 2. find by last name:
// 3. find by last name:
PersonHome fixture = getPersonHome();
String lastName = lastNames.get(0);
Collection<Person> results = fixture.findByLastName(lastName);

// 3. verify
// 4. verify
assertTrue(results != null && !results.isEmpty());

for (Person person : results) {
Expand All @@ -193,6 +203,10 @@ public void testFindByLastName() {
if (logger.isInfoEnabled()) {
logger.info(testName + " verified lastname =" + lastName);
}
} else {
if (logger.isInfoEnabled()) {
logger.info(testName + " - empty database, test skipped");
}
}

}
Expand All @@ -211,15 +225,16 @@ public void testFindCompleteEmailAddress() {
"select email from person where email is not null",
String.class);

// 2. verify correct handling of empty database
assertNotNull("Query should return non-null list", emails);

if (emails.size() > 0) {
assertTrue("Empty Person table.", emails.size() > 0);

// 2. find:
// 3. find:
PersonHome fixture = getPersonHome();
String partialMatch = "Te";
Collection<String> results = fixture.findCompleteEmailAddress(partialMatch);

// 3. verify
// 4. verify
assertTrue(results != null && !results.isEmpty());

for (String anEmail : results) {
Expand All @@ -229,6 +244,10 @@ public void testFindCompleteEmailAddress() {
if (logger.isInfoEnabled()) {
logger.info(testName + " verified partialmatch size =" + results.size());
}
} else {
if (logger.isInfoEnabled()) {
logger.info(testName + " - empty database, test skipped");
}
}

}
Expand Down
Loading
Loading