Skip to content

Add database empty checks to TaxonLabelServiceImplTest to prevent failures on unpopulated databases #313

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 3 commits into from
Dec 21, 2025
Merged

Add database empty checks to TaxonLabelServiceImplTest to prevent failures on unpopulated databases #313

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e05ab8
Initial plan
Copilot Dec 21, 2025
8201c38
Add database empty checks to prevent test failures when database is n…
Copilot Dec 21, 2025
35d4d1f
Remove redundant assertions and improve code readability
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
65 changes: 62 additions & 3 deletions treebase-core/src/test/java/org/cipres/treebase/service/taxon/TaxonLabelServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ public void testFindTreesByTaxon() {
*/
public void testFindMatricesByTaxon() {
Taxon hSap = findHSapTaxon();

// Skip test if database is empty
if (hSap == null) {
logger.info("SKIPPED: testFindMatricesByTaxon - No Taxon data found in database (Homo sapiens). Test requires populated database.");
return;
}

Collection<Matrix> matrices = getFixture().findMatrices(hSap);
logger.info("Query finished; results = " + matrices.size() + " studies");

Expand Down Expand Up @@ -169,10 +176,14 @@ public void testCreateFromUBIOService() throws Exception {
aLabel.setTaxonLabel(desc);

TaxonVariant variant = getFixture().createFromUBIOService(aLabel);
logger.info("variant full name =" + variant.getFullName());

assertTrue("variant.", variant != null);
// Skip test if variant couldn't be created (e.g., external service unavailable)
if (variant == null) {
logger.info("SKIPPED: testCreateFromUBIOService - Unable to create TaxonVariant from UBIO service. External service may be unavailable.");
return;
}

logger.info("variant full name =" + variant.getFullName());

// 3. verify
if (logger.isInfoEnabled()) {
Expand All @@ -193,6 +204,13 @@ public void testExpandTaxonVariant() {
tlsOneEolphus.add(tl);
}
}

// Skip test if database is empty
if (tlsOneEolphus.size() < 1) {
logger.info("SKIPPED: testExpandTaxonVariant - No TaxonLabel data found in database (Eolophus roseicapillus). Test requires populated database.");
return;
}

assertTrue(tlsOneEolphus.size()>=1);
TaxonLabel tlEolphus = tlsOneEolphus.iterator().next();

Expand Down Expand Up @@ -222,6 +240,13 @@ public void testExpandTaxonVariantSet() {
tlsOneEolphus.add(tl);
}
}

// Skip test if database is empty
if (tlsOneEolphus.size() < 1) {
logger.info("SKIPPED: testExpandTaxonVariantSet - No TaxonLabel data found in database (Eolophus roseicapillus). Test requires populated database.");
return;
}

assertTrue(tlsOneEolphus.size()>=1);
TaxonLabel tlEolphus = tlsOneEolphus.iterator().next();

Expand All @@ -231,6 +256,13 @@ public void testExpandTaxonVariantSet() {
tlsOneCacatua.add(tl);
}
}

// Skip test if database is empty
if (tlsOneCacatua.size() < 1) {
logger.info("SKIPPED: testExpandTaxonVariantSet - No TaxonLabel data found in database (Cacatua tenuirostris). Test requires populated database.");
return;
}

assertTrue(tlsOneCacatua.size()>=1);
TaxonLabel tlCacatua = tlsOneCacatua.iterator().next();

Expand Down Expand Up @@ -301,12 +333,26 @@ public void testFindTaxonVariantWithSubstring() {
}
}
}

// Skip test if database is empty
if (trivialCI && trivialCS) {
logger.info("SKIPPED: testFindTaxonVariantWithSubstring - No TaxonVariant data found in database. Test requires populated database.");
return;
}

assertFalse(trivialCI);
assertFalse(trivialCS);
}

public void testFindByTaxonVariant() {
Collection<TaxonVariant> tests = getFixture().findTaxonVariantWithSubstring("Ilex", true); // Holly

// Skip test if database is empty
if (tests.isEmpty()) {
logger.info("SKIPPED: testFindByTaxonVariant - No TaxonVariant data found in database (Ilex). Test requires populated database.");
return;
}

assertFalse(tests.isEmpty());
int nontrivial = 0;
int interesting = 0;
Expand All @@ -325,6 +371,13 @@ public void testFindByTaxonVariant() {
}
logger.info("nontrivial tests: " + nontrivial +
";interesting tests: " + interesting);

// Skip test if no interesting data found
if (nontrivial == 0 || interesting == 0) {
logger.info("SKIPPED: testFindByTaxonVariant - Insufficient data in database to complete test. Test requires populated database.");
return;
}

assertTrue(nontrivial > 0);
assertTrue(interesting > 0);

Expand All @@ -337,7 +390,13 @@ public void testFindTaxonLabelSets() {

public void testFindTaxonVariantByFullName() {
Collection<TaxonVariant> tvSet = getFixture().findTaxonVariantByFullName("Homo sapiens");
assertFalse(tvSet.size() == 0);

// Skip test if database is empty
if (tvSet.isEmpty()) {
logger.info("SKIPPED: testFindTaxonVariantByFullName - No TaxonVariant data found in database (Homo sapiens). Test requires populated database.");
return;
}

for (TaxonVariant tv : tvSet) {
assertEquals("Homo sapiens", tv.getFullName());
}
Expand Down