From f83def503742b78eb6581080e33b7cae51425947 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 24 Nov 2016 12:00:27 +0100 Subject: [PATCH] ref #6199 test for reading excluded, unplaced and excludedNote --- .../etaxonomy/cdm/model/taxon/TaxonNode.java | 4 +-- .../taxon/TaxonNodeDaoHibernateImplTest.java | 35 ++++++++++++++++--- .../taxon/TaxonNodeDaoHibernateImplTest.xml | 8 +++-- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java index 2c7f2d46ec..52d469051c 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java @@ -327,7 +327,7 @@ public class TaxonNode extends AnnotatableEntity implements ITaxonTreeNode, ITre this.parent = parent; } - //Excluded Note + // *************** Excluded Note *************** /** * Returns the {@link MultilanguageText multi-language text} to add a note to the @@ -367,7 +367,7 @@ public class TaxonNode extends AnnotatableEntity implements ITaxonTreeNode, ITre * @see #putExcludedNote(String, Language) */ public void putExcludedNote(LanguageString excludedNote){ - this.excludedNote.put(excludedNote.getLanguage(),excludedNote); + this.excludedNote.put(excludedNote.getLanguage(), excludedNote); } /** * Creates a {@link LanguageString language string} based on the given text string diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java index 928064f5ce..149ea1a858 100644 --- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java +++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertNull; import java.io.FileNotFoundException; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.UUID; -import javassist.util.proxy.Proxy; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -31,6 +32,8 @@ import org.unitils.spring.annotation.SpringBeanByType; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.common.DefinedTerm; +import eu.etaxonomy.cdm.model.common.Language; +import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.name.BotanicalName; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.taxon.Classification; @@ -44,6 +47,7 @@ import eu.etaxonomy.cdm.persistence.dao.taxon.IClassificationDao; import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao; import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonNodeDao; import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; +import javassist.util.proxy.Proxy; public class TaxonNodeDaoHibernateImplTest extends CdmTransactionalIntegrationTest { @@ -265,10 +269,31 @@ public class TaxonNodeDaoHibernateImplTest extends CdmTransactionalIntegrationTe Assert.assertNotSame(rel, newRel); } + //see comment 7 in #6199 + @Test + @DataSet + public void testPersistExcludedInfos(){ + //test read + TaxonNode excludedNode = taxonNodeDao.load(UUID.fromString("4f73adcc-a535-4fbe-a97a-c05ee8b12191")); + Assert.assertTrue("Node should be excluded", excludedNode.isExcluded()); + TaxonNode unplacedNode = taxonNodeDao.load(UUID.fromString("20c8f083-5870-4cbd-bf56-c5b2b98ab6a7")); + Assert.assertTrue("Node should be unplaced", unplacedNode.isUnplaced()); + TaxonNode notSpecialNode = taxonNodeDao.load(UUID.fromString("770239f6-4fa8-496b-8738-fe8f7b2ad519")); + Assert.assertFalse("Node should be neither excluded nor unplaced", notSpecialNode.isUnplaced() || notSpecialNode.isExcluded()); + + //read excluded node + Map map = excludedNode.getExcludedNote(); + Assert.assertEquals(2, map.size()); + Set langIds = new HashSet<>(); + for (Language lang : map.keySet()){ + langIds.add(lang.getId()); + } + Assert.assertTrue("Excluded note must contain text for language id = 1", langIds.contains(1)); + Assert.assertTrue("", langIds.contains(2)); + } + @Override - public void createTestDataSet() throws FileNotFoundException { - // TODO Auto-generated method stub - } + public void createTestDataSet() throws FileNotFoundException {} } diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml index 5c67b066a6..b1293e74c9 100644 --- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml +++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml @@ -1,6 +1,8 @@ + + @@ -34,9 +36,11 @@ - + - + + + -- 2.34.1