merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.test / src / test / java / eu / etaxonomy / taxeditor / httpinvoker / BaseRemotingTest.java

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
index 584c2660351e5ea3ab60ff1f92a189f3cc20a0fb..84b0b8d39085d041fc0772fe777a537e296f7691 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
@@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.httpinvoker;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.util.Map;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -31,6 +32,7 @@ import eu.etaxonomy.taxeditor.remoting.source.CdmPersistentRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSourceException;
 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
+import eu.etaxonomy.taxeditor.session.CdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 import eu.etaxonomy.taxeditor.session.ISessionEventListener;
 
@@ -43,7 +45,7 @@ import eu.etaxonomy.taxeditor.session.ISessionEventListener;
  *
  */
 @Transactional(TransactionMode.DISABLED)
-@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/testRemotingApplicationContext.xml")
+@SpringApplicationContext("file:./target/classes/eu/etaxonomy/cdm/testRemotingApplicationContext.xml")
 public class BaseRemotingTest extends UnitilsJUnit4 {
     //private static final Logger logger = Logger.getLogger(BaseRemotingTest.class);
 
@@ -132,8 +134,19 @@ public class BaseRemotingTest extends UnitilsJUnit4 {
        return cdmEntitySessionManager;
     }
     
+    
+    protected static CdmEntitySession getSession(ISessionEventListener sessionOwner) {
+       Map<ISessionEventListener, CdmEntitySession> ownerSessionMap = 
+                       (Map<ISessionEventListener, CdmEntitySession>) getFieldValueViaReflection(cdmEntitySessionManager, "ownerSessionMap");
+       return ownerSessionMap.get(sessionOwner);
+    }
+    
+    protected static CdmTransientEntityCacher getActiveSession() {
+       return (CdmTransientEntityCacher) getFieldValueViaReflection(cdmEntitySessionManager, "activeSession");
+    }
+    
     protected static CdmTransientEntityCacher getCacher(ISessionEventListener sessionOwner) {
-       return (CdmTransientEntityCacher) getFieldValueViaReflection(cdmEntitySessionManager.getSession(sessionOwner), "cdmTransientEntityCacher");
+       return (CdmTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
     }
 
     @AfterClass