From a8cb9960368eda5b54cc7f72412f9f61ab542cd6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 22 Mar 2024 12:43:00 +0100 Subject: [PATCH] cleanup --- .../cdm/api/service/portal/PortalDtoFactLoader_Old.java | 2 +- .../etaxonomy/cdm/api/service/portal/PortalDtoLoaderTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoFactLoader_Old.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoFactLoader_Old.java index cc4f10ce9c..0b2eb100f6 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoFactLoader_Old.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoFactLoader_Old.java @@ -436,7 +436,7 @@ public class PortalDtoFactLoader_Old extends PortalDtoLoaderBase { TermTree areaTree = repository.getTermTreeService().find(areaTreeUuid); UUID statusTreeUuid = distributionConfig.getAreaTree(); @SuppressWarnings("unchecked") - TermTree statusTree = repository.getTermTreeService().find(areaTreeUuid); + TermTree statusTree = repository.getTermTreeService().find(statusTreeUuid); DistributionInfoDto dto = new DistributionInfoBuilder(LocaleContext.getLanguages(), repository.getCommonService()) .build(distributionConfig, distributions, areaTree, statusTree, distributionStatusColors, diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoaderTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoaderTest.java index 6d5fce6f67..a0ccd47476 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoaderTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoaderTest.java @@ -89,7 +89,7 @@ public class PortalDtoLoaderTest extends CdmTransactionalIntegrationTest { String mapUriParamsStart = did.getMapUriParams().substring(0, 50); String mapUriParamsEnd = did.getMapUriParams().replace(mapUriParamsStart, ""); Assert.assertEquals("as=a:,,0.1,|b:,,0.1,&ad=country_earth%3Agmi_cntry:", mapUriParamsStart); - Assert.assertTrue("End does not match, but is: " + mapUriParamsEnd, mapUriParamsEnd.matches("a:(FRA|DEU)\\|b:DEU&title=[ab]:present\\|[ab]:introduced")); + Assert.assertTrue("End does not match, but is: " + mapUriParamsEnd, mapUriParamsEnd.matches("a:(FRA|DEU)\\|b:(FRA|DEU)&title=[ab]:present\\|[ab]:introduced")); DistributionTreeDto tree = (DistributionTreeDto)did.getTree(); Assert.assertEquals("Tree:2", new DistributionInfoBuilderTest().tree2String(tree)); } @@ -127,7 +127,7 @@ public class PortalDtoLoaderTest extends CdmTransactionalIntegrationTest { //import Reference importRef = ReferenceFactory.newDatabase(); importRef.setTitle("French distribution import"); //should not be shown in output - franceDist.addImportSource("7777", "Distribution", franceRef, "99"); + franceDist.addImportSource("7777", "Distribution", importRef, "99"); } @Override -- 2.34.1