[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...
Gavin King
gavin.king at jboss.com
Sun Jun 10 15:26:00 EDT 2007
User: gavin
Date: 07/06/10 15:26:00
Modified: src/test/misc/org/jboss/seam/test ContextTest.java
InterceptorTest.java PhaseListenerTest.java
Log:
major refactor of contexts impl
JBSEAM-953
Revision Changes Path
1.23 +25 -24 jboss-seam/src/test/misc/org/jboss/seam/test/ContextTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContextTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/ContextTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ContextTest.java 8 Jun 2007 19:23:07 -0000 1.22
+++ ContextTest.java 10 Jun 2007 19:26:00 -0000 1.23
@@ -1,19 +1,20 @@
-//$Id: ContextTest.java,v 1.22 2007/06/08 19:23:07 gavin Exp $
+//$Id: ContextTest.java,v 1.23 2007/06/10 19:26:00 gavin Exp $
package org.jboss.seam.test;
+import java.util.Map;
+
import javax.faces.context.ExternalContext;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
import org.jboss.seam.Component;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
+import org.jboss.seam.contexts.BasicContext;
import org.jboss.seam.contexts.Context;
-import org.jboss.seam.contexts.ContextAdaptor;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.FacesApplicationContext;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.contexts.ServerConversationContext;
-import org.jboss.seam.contexts.WebRequestContext;
-import org.jboss.seam.contexts.WebSessionContext;
+import org.jboss.seam.contexts.SessionContext;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Manager;
@@ -24,8 +25,8 @@
import org.jboss.seam.mock.MockHttpServletRequest;
import org.jboss.seam.mock.MockHttpSession;
import org.jboss.seam.mock.MockServletContext;
-import org.jboss.seam.servlet.ServletRequestImpl;
-import org.jboss.seam.servlet.ServletSessionImpl;
+import org.jboss.seam.servlet.ServletRequestMap;
+import org.jboss.seam.servlet.ServletRequestSessionMap;
import org.testng.annotations.Test;
public class ContextTest
@@ -43,7 +44,7 @@
MockServletContext servletContext = new MockServletContext();
MockExternalContext externalContext = new MockExternalContext(servletContext);
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
//appContext.set( Seam.getComponentName(Init.class), new Init() );
installComponent(appContext, ConversationEntries.class);
installComponent(appContext, Manager.class);
@@ -80,10 +81,10 @@
assert Contexts.getSessionContext()!=null;
assert Contexts.getConversationContext()!=null;
assert Contexts.getApplicationContext()!=null;
- assert Contexts.getEventContext() instanceof WebRequestContext;
- assert Contexts.getSessionContext() instanceof WebSessionContext;
+ assert Contexts.getEventContext() instanceof BasicContext;
+ assert Contexts.getSessionContext() instanceof SessionContext;
assert Contexts.getConversationContext() instanceof ServerConversationContext;
- assert Contexts.getApplicationContext() instanceof FacesApplicationContext;
+ assert Contexts.getApplicationContext() instanceof BasicContext;
Contexts.getSessionContext().set("zzz", "bar");
Contexts.getApplicationContext().set("zzz", "bar");
@@ -125,10 +126,10 @@
assert Contexts.getSessionContext()!=null;
assert Contexts.getConversationContext()!=null;
assert Contexts.getApplicationContext()!=null;
- assert Contexts.getEventContext() instanceof WebRequestContext;
- assert Contexts.getSessionContext() instanceof WebSessionContext;
+ assert Contexts.getEventContext() instanceof BasicContext;
+ assert Contexts.getSessionContext() instanceof SessionContext;
assert Contexts.getConversationContext() instanceof ServerConversationContext;
- assert Contexts.getApplicationContext() instanceof FacesApplicationContext;
+ assert Contexts.getApplicationContext() instanceof BasicContext;
assert Contexts.getSessionContext().get("zzz").equals("bar");
assert Contexts.getApplicationContext().get("zzz").equals("bar");
@@ -160,7 +161,7 @@
assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==4;
assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==8;
- Lifecycle.endSession( servletContext, new ServletSessionImpl( (HttpSession) externalContext.getSession(true) ) );
+ Lifecycle.endSession( servletContext, new ServletRequestSessionMap( (HttpServletRequest) externalContext.getRequest() ) );
Lifecycle.endApplication(servletContext);
@@ -173,21 +174,21 @@
MockHttpSession session = new MockHttpSession(servletContext);
MockHttpServletRequest request = new MockHttpServletRequest(session);
ExternalContext externalContext = new MockExternalContext(servletContext, request);
- ContextAdaptor sessionAdaptor = new ServletSessionImpl(session);
- ContextAdaptor requestAdaptor = new ServletRequestImpl(request);
- Context appContext = new FacesApplicationContext(externalContext);
+ Map sessionAdaptor = new ServletRequestSessionMap(request);
+ Map requestAdaptor = new ServletRequestMap(request);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
installComponent(appContext, ConversationEntries.class);
installComponent(appContext, Manager.class);
appContext.set( Seam.getComponentName(Init.class), new Init() );
Lifecycle.beginRequest(externalContext);
Manager.instance().setLongRunningConversation(true);
- testContext( new FacesApplicationContext(externalContext) );
- testContext( new WebSessionContext(sessionAdaptor) );
- testContext( new WebRequestContext(requestAdaptor) );
+ testContext( new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() ) );
+ testContext( new SessionContext(sessionAdaptor) );
+ testContext( new BasicContext(ScopeType.EVENT, requestAdaptor) );
testContext( new ServerConversationContext(sessionAdaptor, "1") );
testEquivalence( new ServerConversationContext(sessionAdaptor, "1"), new ServerConversationContext(sessionAdaptor, "1") );
- testEquivalence( new WebSessionContext(sessionAdaptor), new WebSessionContext(sessionAdaptor) );
- testEquivalence( new FacesApplicationContext(externalContext), new FacesApplicationContext(externalContext) );
+ testEquivalence( new SessionContext(sessionAdaptor), new SessionContext(sessionAdaptor) );
+ testEquivalence( new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() ),new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() ) );
testIsolation( new ServerConversationContext(sessionAdaptor, "1"), new ServerConversationContext(sessionAdaptor, "2") );
// testIsolation( new WebSessionContext(externalContext), new WebSessionContext( new MockExternalContext()) );
1.31 +8 -7 jboss-seam/src/test/misc/org/jboss/seam/test/InterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/InterceptorTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- InterceptorTest.java 13 Feb 2007 07:10:52 -0000 1.30
+++ InterceptorTest.java 10 Jun 2007 19:26:00 -0000 1.31
@@ -1,4 +1,4 @@
-//$Id: InterceptorTest.java,v 1.30 2007/02/13 07:10:52 gavin Exp $
+//$Id: InterceptorTest.java,v 1.31 2007/06/10 19:26:00 gavin Exp $
package org.jboss.seam.test;
import java.lang.reflect.Method;
@@ -9,10 +9,11 @@
import org.jboss.seam.Component;
import org.jboss.seam.RequiredException;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
+import org.jboss.seam.contexts.BasicContext;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.FacesApplicationContext;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Events;
@@ -40,7 +41,7 @@
{
MockServletContext servletContext = new MockServletContext();
MockExternalContext externalContext = new MockExternalContext(servletContext);
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext =new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
appContext.set(
Seam.getComponentName(ConversationEntries.class) + ".component",
@@ -238,7 +239,7 @@
{
MockServletContext servletContext = new MockServletContext();
MockExternalContext externalContext = new MockExternalContext(servletContext);
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
appContext.set(
Seam.getComponentName(ConversationEntries.class) + ".component",
@@ -495,7 +496,7 @@
{
MockServletContext servletContext = new MockServletContext();
MockExternalContext externalContext = new MockExternalContext(servletContext);
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
appContext.set(
Seam.getComponentName(ConversationEntries.class) + ".component",
@@ -604,7 +605,7 @@
ExternalContext externalContext = new MockExternalContext(servletContext);
new MockFacesContext( externalContext, new MockApplication() ).setCurrent().createViewRoot();
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
appContext.set(
Seam.getComponentName(ConversationEntries.class) + ".component",
@@ -712,7 +713,7 @@
{
MockServletContext servletContext = new MockServletContext();
MockExternalContext externalContext = new MockExternalContext(servletContext);
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
appContext.set(
Seam.getComponentName(ConversationEntries.class) + ".component",
1.33 +7 -7 jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PhaseListenerTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- PhaseListenerTest.java 4 Jun 2007 17:24:42 -0000 1.32
+++ PhaseListenerTest.java 10 Jun 2007 19:26:00 -0000 1.33
@@ -1,4 +1,4 @@
-//$Id: PhaseListenerTest.java,v 1.32 2007/06/04 17:24:42 gavin Exp $
+//$Id: PhaseListenerTest.java,v 1.33 2007/06/10 19:26:00 gavin Exp $
package org.jboss.seam.test;
import java.util.ArrayList;
@@ -8,15 +8,15 @@
import javax.faces.context.ExternalContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
+import org.jboss.seam.contexts.BasicContext;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.FacesApplicationContext;
-import org.jboss.seam.contexts.WebSessionContext;
+import org.jboss.seam.contexts.SessionContext;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Events;
@@ -34,7 +34,7 @@
import org.jboss.seam.mock.MockExternalContext;
import org.jboss.seam.mock.MockFacesContext;
import org.jboss.seam.mock.MockLifecycle;
-import org.jboss.seam.servlet.ServletSessionImpl;
+import org.jboss.seam.servlet.ServletRequestSessionMap;
import org.testng.annotations.Test;
public class PhaseListenerTest
@@ -65,7 +65,7 @@
facesContext.setCurrent().createViewRoot();
facesContext.getApplication().setStateManager( new SeamStateManager( facesContext.getApplication().getStateManager() ) );
- Context appContext = new FacesApplicationContext(externalContext);
+ Context appContext = new BasicContext( ScopeType.APPLICATION, externalContext.getApplicationMap() );
installComponents(appContext);
return facesContext;
}
@@ -142,7 +142,7 @@
conversationIdStack.add("2");
ConversationEntries entries = new ConversationEntries();
entries.createConversationEntry("2", conversationIdStack);
- WebSessionContext sessionContext = new WebSessionContext( new ServletSessionImpl( (HttpSession) facesContext.getExternalContext().getSession(true) ) );
+ SessionContext sessionContext = new SessionContext( new ServletRequestSessionMap( (HttpServletRequest) facesContext.getExternalContext().getRequest() ) );
sessionContext.set( Seam.getComponentName(ConversationEntries.class), entries );
AbstractSeamPhaseListener phases = new SeamPhaseListener();
More information about the jboss-cvs-commits
mailing list