X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/3f06713a0ec45f5b32eb14000e5ccf1a7df621a9..9e3e31c084e4fc0a4bf7c457a67296eead921de9:/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java index e80834e80e..6474c52058 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java @@ -37,7 +37,6 @@ import eu.etaxonomy.cdm.api.service.config.IdentifiableServiceConfiguratorFactor import eu.etaxonomy.cdm.api.service.config.IdentifiableServiceConfiguratorImpl; import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator; import eu.etaxonomy.cdm.api.service.pager.Pager; -import eu.etaxonomy.cdm.common.DoubleResult; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.common.Language; @@ -66,7 +65,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.persistence.dao.common.Restriction; import eu.etaxonomy.cdm.persistence.dao.common.Restriction.Operator; -import eu.etaxonomy.cdm.persistence.dto.TaxonNameParts; import eu.etaxonomy.cdm.persistence.query.MatchMode; import eu.etaxonomy.cdm.persistence.query.OrderHint; import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; @@ -1005,7 +1003,7 @@ public class NameServiceImplTest extends CdmTransactionalIntegrationTest { public void testFindByTitleTitle_using_Configurator(){ String searchString = "*"; - IdentifiableServiceConfiguratorImpl searchConfigurator = new IdentifiableServiceConfiguratorImpl(); + IdentifiableServiceConfiguratorImpl searchConfigurator = new IdentifiableServiceConfiguratorImpl<>(); searchConfigurator = IdentifiableServiceConfiguratorFactory.getConfigurator(TaxonName.class); searchConfigurator.setTitleSearchString(searchString); @@ -1098,30 +1096,4 @@ public class NameServiceImplTest extends CdmTransactionalIntegrationTest { @Override public void createTestDataSet() throws FileNotFoundException {} - - - @Test - @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="NameServiceImplTest.testFindMatchingNames.xml") - public void testFindingMatchingNames () { - - List> matchResult = nameService.findMatchingNames("Gynxya asrerotciha", 0, 0, 10); - Assert.assertEquals(1, matchResult.size()); - - matchResult = nameService.findMatchingNames("Gynxya asrerotciha", 1, 0, 10); - Assert.assertEquals(2, matchResult.size()); - - DoubleResult gynxyaAsrerotciha = matchResult.get(0); - Assert.assertNotNull(gynxyaAsrerotciha); - Assert.assertEquals(10, (int)gynxyaAsrerotciha.getFirstResult().getTaxonNameId()); - Assert.assertEquals("Gynxya", matchResult.get(0).getFirstResult().getGenusOrUninomial()); - Assert.assertEquals("asrerotciha", matchResult.get(0).getFirstResult().getSpecificEpithet()); - Assert.assertEquals("Distance should be 0", 0, (int)gynxyaAsrerotciha.getSecondResult()); - - DoubleResult gynxyasAsrerotciha = matchResult.get(1); - Assert.assertNotNull(gynxyasAsrerotciha); - Assert.assertEquals(12, (int)gynxyasAsrerotciha.getFirstResult().getTaxonNameId()); - Assert.assertEquals("Gynxyas", matchResult.get(1).getFirstResult().getGenusOrUninomial()); - Assert.assertEquals("asrerotciha", matchResult.get(1).getFirstResult().getSpecificEpithet()); - Assert.assertEquals("Distance should be 1", 1, (int)gynxyasAsrerotciha.getSecondResult()); - } } \ No newline at end of file