From: Katja Luther Date: Tue, 24 May 2016 12:57:45 +0000 (+0200) Subject: minor X-Git-Tag: 4.1.0^2~45 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a41769e525995a99553498ae34c1047d185e48fa minor --- diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 997533d61..5f279596e 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,251 +1,251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java index b208a9964..a3d69ae94 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java @@ -10,7 +10,10 @@ package eu.etaxonomy.taxeditor.session; import java.util.ArrayList; +<<<<<<< Updated upstream import java.util.HashSet; +======= +>>>>>>> Stashed changes import java.util.Iterator; import java.util.List; import java.util.Map; @@ -25,7 +28,10 @@ import org.junit.Test; import org.unitils.dbunit.annotation.DataSet; import eu.etaxonomy.cdm.api.application.CdmApplicationState; +<<<<<<< Updated upstream import eu.etaxonomy.cdm.api.service.DeleteResult; +======= +>>>>>>> Stashed changes import eu.etaxonomy.cdm.api.service.ICommonService; import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService; import eu.etaxonomy.cdm.api.service.IPolytomousKeyService; @@ -33,7 +39,10 @@ import eu.etaxonomy.cdm.api.service.ITaxonService; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.api.service.IUserService; import eu.etaxonomy.cdm.api.service.IVocabularyService; +<<<<<<< Updated upstream import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; +======= +>>>>>>> Stashed changes import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.common.CdmBase; @@ -344,6 +353,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { PolytomousKeyNode rootNode = pKey.getRoot(); + PolytomousKeyNode childNode = rootNode.getChildAt(0); PolytomousKey subKey = HibernateProxyHelper.deproxy( childNode.getSubkey(), PolytomousKey.class);; @@ -369,6 +379,10 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { if (!result.isOk()){ Assert.fail(); } + + + + // retrieving subkey shows its null subKey = CdmBase.deproxy(polytomousKeyService.find(subKeyUuid),PolytomousKey.class); Assert.assertNull(subKey);