Remove manual session creation and re-enable failing tests

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
index 9c59b3cbb3ecf5aa94cd5d2633af05b1e47711a2..08bebc458be26bcc03d06e256882ec3109ea960f 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
@@ -28,14 +28,14 @@ public abstract class RemotingSessionAwareTest extends BaseRemotingTest {
 
     protected CdmTransientEntityCacher cacher;
     protected MockSessionOwner sessionOwner;
-    protected ICdmEntitySession cdmEntitySession;
+
 
     @Before
     public void initializeSession() {
 
         sessionOwner = new MockSessionOwner();
         logger.info("created mock session owner : " + sessionOwner);
-        cdmEntitySession = cdmEntitySessionManager.newSession(sessionOwner, true);
+        ICdmEntitySession cdmEntitySession = cdmEntitySessionManager.newSession(sessionOwner, true);
         sessionOwner.setCdmEntitySession(cdmEntitySession);
         cacher = getCacher(sessionOwner);
     }

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
index ccd5bfbb4836a12829ac800c771d2f5185c284d7..5f32c05c59d5666718b9af7c2cee8d27aee6b9f1 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
@@ -131,8 +131,6 @@ public class TaxonNameEditorTest extends BaseOperationTest {
         TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
         rootEntities.add(taxonNode);
 
-        cdmEntitySession = cdmEntitySessionManager.newSession(sessionOwner, true);
-
         UUID taxonUuid = UUID.fromString("9763e5f0-6cd4-4d96-b8a4-4420854f7727");
         Taxon taxon = (Taxon)taxonService.load(taxonUuid);
         TaxonNameBase taxonName = taxon.getName();

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 a9d9c6aa9ec439a4bb74da12239a991a9a7187e1..6f0a91fb2f384c65969f27a711b67702705a5fd9 100644 (file)
--- 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
@@ -19,7 +19,6 @@ import org.apache.log4j.Logger;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.unitils.dbunit.annotation.DataSet;
 
@@ -151,7 +150,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         Assert.assertEquals(rootNode.getChildAt(1).getChildAt(0).getChildAt(0).getTaxon().getTitleCache(), "Achillea arabica Kotschy sec. Cyprus");
     }
 
-    @Ignore
+
     @Test
     public void savePolytomousKeyNodeData() {
         PolytomousKey pkey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
@@ -214,7 +213,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
 
     }
 
-    @Ignore
+
     @Test
     public void savePolytomousKeyNodeDataWithSameSubKey() {
 
@@ -264,9 +263,10 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
 
-    @Ignore
+
     @Test
     public void savePolytomousKeyNodeDataWithSameLanguageInLabel() {
+
         PolytomousKey pkey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
         PolytomousKeyNode pkeynode = pkey.getRoot();
 
@@ -323,7 +323,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
 
     }
 
-    @Ignore
+
     @Test
     public void deleteSubKeyInPolytomousNode() {
         PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);