[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 04:23:20 EDT 2007
User: gavin
Date: 07/06/20 04:23:20
Modified: src/test/misc/org/jboss/seam/test ContextTest.java
InitializationTest.java InterceptorTest.java
PageflowTest.java RemotingTest.java
Log:
split up Lifecycle, much better
Revision Changes Path
1.28 +18 -15 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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ContextTest.java 20 Jun 2007 00:31:03 -0000 1.27
+++ ContextTest.java 20 Jun 2007 08:23:20 -0000 1.28
@@ -1,4 +1,4 @@
-//$Id: ContextTest.java,v 1.27 2007/06/20 00:31:03 gavin Exp $
+//$Id: ContextTest.java,v 1.28 2007/06/20 08:23:20 gavin Exp $
package org.jboss.seam.test;
import java.util.Map;
@@ -12,8 +12,9 @@
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.EventContext;
-import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.contexts.FacesLifecycle;
import org.jboss.seam.contexts.ServerConversationContext;
+import org.jboss.seam.contexts.ServletLifecycle;
import org.jboss.seam.contexts.SessionContext;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Init;
@@ -42,9 +43,10 @@
public void testContextManagement() throws Exception
{
SeamELResolver seamVariableResolver = new SeamELResolver();
- org.jboss.seam.jbpm.SeamVariableResolver jbpmVariableResolver = new org.jboss.seam.jbpm.SeamVariableResolver();
+ //org.jboss.seam.bpm.SeamVariableResolver jbpmVariableResolver = new org.jboss.seam.bpm.SeamVariableResolver();
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
MockExternalContext externalContext = new MockExternalContext(servletContext);
Context appContext = new ApplicationContext( externalContext.getApplicationMap() );
//appContext.set( Seam.getComponentName(Init.class), new Init() );
@@ -64,7 +66,7 @@
assert !Contexts.isConversationContextActive();
assert !Contexts.isApplicationContextActive();
- Lifecycle.beginRequest(externalContext);
+ FacesLifecycle.beginRequest(externalContext);
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
@@ -72,7 +74,7 @@
assert Contexts.isApplicationContextActive();
Manager.instance().setCurrentConversationId("3");
- Lifecycle.resumeConversation(externalContext);
+ FacesLifecycle.resumeConversation(externalContext);
Manager.instance().setLongRunningConversation(true);
assert Contexts.isEventContextActive();
@@ -102,7 +104,7 @@
assert foo!=null;
assert foo instanceof Foo;
- Lifecycle.endRequest(externalContext);
+ FacesLifecycle.endRequest(externalContext);
assert !Contexts.isEventContextActive();
assert !Contexts.isSessionContextActive();
@@ -111,7 +113,7 @@
assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==4;
assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==10;
- Lifecycle.beginRequest(externalContext);
+ FacesLifecycle.beginRequest(externalContext);
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
@@ -119,7 +121,7 @@
assert Contexts.isApplicationContextActive();
Manager.instance().setCurrentConversationId("3");
- Lifecycle.resumeConversation(externalContext);
+ FacesLifecycle.resumeConversation(externalContext);
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
@@ -150,13 +152,13 @@
assert seamVariableResolver.getValue(EL.EL_CONTEXT, null, "bar")==bar;
assert seamVariableResolver.getValue(EL.EL_CONTEXT, null, "foo")==foo;
- assert jbpmVariableResolver.resolveVariable("zzz").equals("bar");
+ /*assert jbpmVariableResolver.resolveVariable("zzz").equals("bar");
assert jbpmVariableResolver.resolveVariable("xxx").equals("yyy");
assert jbpmVariableResolver.resolveVariable("bar")==bar;
- assert jbpmVariableResolver.resolveVariable("foo")==foo;
+ assert jbpmVariableResolver.resolveVariable("foo")==foo;*/
Manager.instance().setLongRunningConversation(false);
- Lifecycle.endRequest(externalContext);
+ FacesLifecycle.endRequest(externalContext);
assert !Contexts.isEventContextActive();
assert !Contexts.isSessionContextActive();
@@ -165,9 +167,9 @@
assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==2;
assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==10;
- Lifecycle.endSession( servletContext, new ServletRequestSessionMap( (HttpServletRequest) externalContext.getRequest() ) );
+ ServletLifecycle.endSession( ( (HttpServletRequest) externalContext.getRequest() ).getSession() );
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
@@ -175,6 +177,7 @@
public void testContexts()
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
MockHttpSession session = new MockHttpSession(servletContext);
MockHttpServletRequest request = new MockHttpServletRequest(session);
ExternalContext externalContext = new MockExternalContext(servletContext, request);
@@ -184,7 +187,7 @@
installComponent(appContext, ConversationEntries.class);
installComponent(appContext, Manager.class);
appContext.set( Seam.getComponentName(Init.class), new Init() );
- Lifecycle.beginRequest(externalContext);
+ FacesLifecycle.beginRequest(externalContext);
Manager.instance().setLongRunningConversation(true);
testContext( new ApplicationContext( externalContext.getApplicationMap() ) );
testContext( new SessionContext(sessionAdaptor) );
@@ -196,7 +199,7 @@
testIsolation( new ServerConversationContext(sessionAdaptor, "1"), new ServerConversationContext(sessionAdaptor, "2") );
// testIsolation( new WebSessionContext(externalContext), new WebSessionContext( new MockExternalContext()) );
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
private void testEquivalence(Context ctx, Context cty)
1.37 +3 -1 jboss-seam/src/test/misc/org/jboss/seam/test/InitializationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InitializationTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/InitializationTest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- InitializationTest.java 20 Nov 2006 23:44:23 -0000 1.36
+++ InitializationTest.java 20 Jun 2007 08:23:20 -0000 1.37
@@ -1,8 +1,9 @@
-//$Id: InitializationTest.java,v 1.36 2006/11/20 23:44:23 gavin Exp $
+//$Id: InitializationTest.java,v 1.37 2007/06/20 08:23:20 gavin Exp $
package org.jboss.seam.test;
import org.jboss.seam.Seam;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.contexts.ServletLifecycle;
import org.jboss.seam.core.Manager;
import org.jboss.seam.init.Initialization;
import org.jboss.seam.mock.MockServletContext;
@@ -14,6 +15,7 @@
public void testInitialization()
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
new Initialization(servletContext).init();
assert !servletContext.getAttributes().isEmpty();
1.34 +25 -19 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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- InterceptorTest.java 20 Jun 2007 00:31:03 -0000 1.33
+++ InterceptorTest.java 20 Jun 2007 08:23:20 -0000 1.34
@@ -1,4 +1,4 @@
-//$Id: InterceptorTest.java,v 1.33 2007/06/20 00:31:03 gavin Exp $
+//$Id: InterceptorTest.java,v 1.34 2007/06/20 08:23:20 gavin Exp $
package org.jboss.seam.test;
import java.lang.reflect.Method;
@@ -14,7 +14,8 @@
import org.jboss.seam.contexts.ApplicationContext;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.contexts.FacesLifecycle;
+import org.jboss.seam.contexts.ServletLifecycle;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Init;
@@ -40,6 +41,7 @@
public void testBijectionInterceptor() throws Exception
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
MockExternalContext externalContext = new MockExternalContext(servletContext);
Context appContext = new ApplicationContext( externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
@@ -60,10 +62,10 @@
new Component(Factory.class, appContext)
);
- Lifecycle.beginRequest( externalContext );
+ FacesLifecycle.beginRequest(externalContext);
Manager.instance().setCurrentConversationId("1");
- Lifecycle.resumeConversation( externalContext );
- Lifecycle.setPhaseId(PhaseId.RENDER_RESPONSE);
+ FacesLifecycle.resumeConversation(externalContext);
+ FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE);
final Bar bar = new Bar();
final Foo foo = new Foo();
@@ -231,13 +233,14 @@
assert "success".equals(result);
assert Contexts.getConversationContext().get("name").equals("Gavin King");
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
@Test
public void testConversationInterceptor() throws Exception
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
MockExternalContext externalContext = new MockExternalContext(servletContext);
Context appContext = new ApplicationContext( externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
@@ -253,9 +256,9 @@
Seam.getComponentName(Manager.class) + ".component",
new Component(Manager.class, appContext)
);
- Lifecycle.beginRequest( externalContext );
+ FacesLifecycle.beginRequest( externalContext );
Manager.instance().setCurrentConversationId("1");
- Lifecycle.resumeConversation(externalContext);
+ FacesLifecycle.resumeConversation(externalContext);
ConversationInterceptor ci = new ConversationInterceptor();
ci.setComponent( new Component(Foo.class, appContext) );
@@ -488,13 +491,14 @@
assert !Manager.instance().isLongRunningConversation();
assert "success".equals(result);
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
@Test
public void testConversationalInterceptor() throws Exception
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
MockExternalContext externalContext = new MockExternalContext(servletContext);
Context appContext = new ApplicationContext( externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
@@ -514,10 +518,10 @@
Seam.getComponentName(Events.class) + ".component",
new Component(Events.class, appContext)
);
- Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
- Lifecycle.beginRequest( externalContext );
+ FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ FacesLifecycle.beginRequest( externalContext );
Manager.instance().setCurrentConversationId("1");
- Lifecycle.resumeConversation(externalContext);
+ FacesLifecycle.resumeConversation(externalContext);
ConversationalInterceptor ci = new ConversationalInterceptor();
ci.setComponent( new Component(Bar.class, appContext) );
@@ -604,7 +608,7 @@
//assert !Manager.instance().isLongRunningConversation();
assert "ended".equals(result);
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
@@ -612,6 +616,7 @@
public void testValidationInterceptor() throws Exception
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
ExternalContext externalContext = new MockExternalContext(servletContext);
new MockFacesContext( externalContext, new MockApplication() ).setCurrent().createViewRoot();
@@ -633,10 +638,10 @@
Seam.getComponentName(Interpolator.class) + ".component",
new Component(Interpolator.class, appContext)
);
- Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
- Lifecycle.beginRequest(externalContext);
+ FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ FacesLifecycle.beginRequest(externalContext);
Manager.instance().setCurrentConversationId("1");
- Lifecycle.resumeConversation(externalContext);
+ FacesLifecycle.resumeConversation(externalContext);
ValidationInterceptor vi = new ValidationInterceptor();
vi.setComponent( new Component(Foo.class, appContext) );
@@ -715,13 +720,14 @@
assert "bar".equals(result);
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
@Test
public void testRemoveInterceptor() throws Exception
{
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
MockExternalContext externalContext = new MockExternalContext(servletContext);
Context appContext = new ApplicationContext( externalContext.getApplicationMap() );
appContext.set( Seam.getComponentName(Init.class), new Init() );
@@ -734,7 +740,7 @@
new Component(Manager.class, appContext)
);
- Lifecycle.beginRequest( externalContext );
+ FacesLifecycle.beginRequest( externalContext );
Contexts.getSessionContext().set( "foo", new Foo() );
RemoveInterceptor ri = new RemoveInterceptor();
@@ -760,7 +766,7 @@
assert !Contexts.getSessionContext().isSet("foo");
- Lifecycle.endApplication(servletContext);
+ ServletLifecycle.endApplication();
}
static Method getMethod(String name)
1.5 +5 -5 jboss-seam/src/test/misc/org/jboss/seam/test/PageflowTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PageflowTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/PageflowTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PageflowTest.java 17 Dec 2006 15:32:30 -0000 1.4
+++ PageflowTest.java 20 Jun 2007 08:23:20 -0000 1.5
@@ -2,9 +2,8 @@
import java.io.StringReader;
+import org.jboss.seam.bpm.PageflowParser;
import org.jboss.seam.pageflow.Page;
-import org.jboss.seam.pageflow.PageflowHelper;
-import org.jboss.seam.pageflow.PageflowParser;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
@@ -13,9 +12,10 @@
import org.jbpm.graph.node.StartState;
import org.testng.annotations.Test;
-public class PageflowTest {
+public class PageflowTest
+{
- JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
+ /*JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
"<jbpm-configuration />"
);
@@ -103,6 +103,6 @@
assert start.equals(token.getNode());
pageflowInstance.signal();
- }
+ }*/
}
1.10 +2 -1 jboss-seam/src/test/misc/org/jboss/seam/test/RemotingTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemotingTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/RemotingTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- RemotingTest.java 21 Dec 2006 02:38:29 -0000 1.9
+++ RemotingTest.java 20 Jun 2007 08:23:20 -0000 1.10
@@ -31,6 +31,7 @@
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.contexts.ServletLifecycle;
import org.jboss.seam.init.Initialization;
import org.jboss.seam.mock.MockServletContext;
import org.jboss.seam.remoting.CallContext;
@@ -724,8 +725,8 @@
{
// Initialize Seam
MockServletContext servletContext = new MockServletContext();
+ ServletLifecycle.beginApplication(servletContext);
new Initialization(servletContext).init();
- Lifecycle.setServletContext(servletContext);
try
{
More information about the jboss-cvs-commits
mailing list