From 259c70d2e1056c0a1fe103a9a93bfaf376b89555 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 2 Nov 2021 18:28:52 +0100 Subject: [PATCH] ref #9825 fix failing vocDto test --- .../term/TermVocabularyDaoImplTest.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImplTest.java index b7716aaa2b..8a49d3c3cf 100644 --- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImplTest.java +++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImplTest.java @@ -36,14 +36,14 @@ import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.cdm.persistence.dao.term.ITermVocabularyDao; import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto; -import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest; +import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy; /** * @author a.babadshanjan * @since 10.02.2009 */ -public class TermVocabularyDaoImplTest extends CdmIntegrationTest { +public class TermVocabularyDaoImplTest extends CdmTransactionalIntegrationTest { @SuppressWarnings("unused") private static Logger logger = Logger.getLogger(TermVocabularyDaoImplTest.class); @@ -170,19 +170,25 @@ public class TermVocabularyDaoImplTest extends CdmIntegrationTest { } @Test + @DataSets({ + @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml"), + @DataSet("/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml")} + ) public void testFindVocabularyDtoByTermTypes(){ Set termTypes = new HashSet<>(); termTypes.add(TermType.NamedArea); - List vocDto = dao.findVocabularyDtoByTermTypes(termTypes, true); - Assert.assertEquals(4, vocDto.size()); + List vocDtos = dao.findVocabularyDtoByTermTypes(termTypes, true); + Assert.assertEquals(4, vocDtos.size()); //#9825 test deduplication @SuppressWarnings("unchecked") TermVocabulary continentVoc = dao.findByUuid(NamedArea.uuidContinentVocabulary); continentVoc.addRepresentation(Representation.NewInstance("Kontinente", "Kontinente", "Kont.", Language.GERMAN())); - dao.flush(); - vocDto = dao.findVocabularyDtoByTermTypes(termTypes, true); - Assert.assertEquals("Deduplication for representations does not work", 4, vocDto.size()); +// dao.flush(); + vocDtos = dao.findVocabularyDtoByTermTypes(termTypes, true); + Assert.assertEquals("Deduplication for representations does not work", 4, vocDtos.size()); + int repSize = vocDtos.stream().filter(voc->voc.getUuid().equals(NamedArea.uuidContinentVocabulary)).findFirst().get().getRepresentations().size(); + Assert.assertEquals("There should be 2 representations for continent vocabulary", 2, repSize); } @Override -- 2.34.1