[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...
Gavin King
gavin.king at jboss.com
Tue Jun 19 20:31:03 EDT 2007
User: gavin
Date: 07/06/19 20:31:03
Modified: src/test/misc/org/jboss/seam/test Bar.java
ComponentTest.java ContextTest.java
InterceptorTest.java PhaseListenerTest.java
Log:
fix tests
Revision Changes Path
1.7 +2 -2 jboss-seam/src/test/misc/org/jboss/seam/test/Bar.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Bar.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/Bar.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Bar.java 21 Dec 2006 02:38:29 -0000 1.6
+++ Bar.java 20 Jun 2007 00:31:03 -0000 1.7
@@ -21,11 +21,10 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
- * @version $Revision: 1.6 $
*/
@Name("bar")
@Scope(ScopeType.CONVERSATION)
- at Conversational(ifNotBegunOutcome="error")
+ at Conversational
public class Bar implements Serializable
{
private static final long serialVersionUID = -5325217160542604204L;
@@ -47,6 +46,7 @@
{
return "begun";
}
+
public String foo()
{
string = "out";
1.8 +5 -5 jboss-seam/src/test/misc/org/jboss/seam/test/ComponentTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ComponentTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/ComponentTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ComponentTest.java 11 Feb 2007 19:10:26 -0000 1.7
+++ ComponentTest.java 20 Jun 2007 00:31:03 -0000 1.8
@@ -1,4 +1,4 @@
-//$Id: ComponentTest.java,v 1.7 2007/02/11 19:10:26 gavin Exp $
+//$Id: ComponentTest.java,v 1.8 2007/06/20 00:31:03 gavin Exp $
package org.jboss.seam.test;
import org.jboss.seam.Component;
@@ -7,8 +7,8 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.ManagedHibernateSession;
-import org.jboss.seam.core.ManagedPersistenceContext;
+import org.jboss.seam.persistence.ManagedHibernateSession;
+import org.jboss.seam.persistence.ManagedPersistenceContext;
import org.jboss.seam.core.Init;
import org.testng.annotations.Test;
@@ -69,10 +69,10 @@
assert c.getBeanClass()==EjbBean.class;
assert c.getType()==ComponentType.STATEFUL_SESSION_BEAN;
assert c.getScope()==ScopeType.EVENT;
- assert c.hasDestroyMethod();
+ assert !c.hasDestroyMethod();
assert !c.hasCreateMethod();
assert c.getCreateMethod()==null;
- assert c.getDestroyMethod()!=null;
+ assert c.getDestroyMethod()==null;
assert c.getInAttributes().size()==0;
assert c.getUnwrapMethod()==null;
assert c.getOutAttributes().size()==0;
1.27 +7 -5 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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ContextTest.java 14 Jun 2007 16:29:04 -0000 1.26
+++ ContextTest.java 20 Jun 2007 00:31:03 -0000 1.27
@@ -1,4 +1,4 @@
-//$Id: ContextTest.java,v 1.26 2007/06/14 16:29:04 gavin Exp $
+//$Id: ContextTest.java,v 1.27 2007/06/20 00:31:03 gavin Exp $
package org.jboss.seam.test;
import java.util.Map;
@@ -18,7 +18,6 @@
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.ServletContexts;
import org.jboss.seam.core.ServletSession;
import org.jboss.seam.el.EL;
import org.jboss.seam.el.SeamELResolver;
@@ -28,6 +27,8 @@
import org.jboss.seam.mock.MockServletContext;
import org.jboss.seam.servlet.ServletRequestMap;
import org.jboss.seam.servlet.ServletRequestSessionMap;
+import org.jboss.seam.web.Parameters;
+import org.jboss.seam.web.ServletContexts;
import org.testng.annotations.Test;
public class ContextTest
@@ -51,6 +52,7 @@
installComponent(appContext, Manager.class);
installComponent(appContext, ServletSession.class);
installComponent(appContext, ServletContexts.class);
+ installComponent(appContext, Parameters.class);
appContext.set( Seam.getComponentName(Init.class), new Init() );
installComponent(appContext, Bar.class);
@@ -107,7 +109,7 @@
assert !Contexts.isConversationContextActive();
assert !Contexts.isApplicationContextActive();
assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==4;
- assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==9;
+ assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==10;
Lifecycle.beginRequest(externalContext);
@@ -140,7 +142,7 @@
assert Contexts.getSessionContext().get("foo")==foo;
assert Contexts.getConversationContext().getNames().length==2;
- assert Contexts.getApplicationContext().getNames().length==9;
+ assert Contexts.getApplicationContext().getNames().length==10;
assert Contexts.getSessionContext().getNames().length==2;
assert seamVariableResolver.getValue(EL.EL_CONTEXT, null, "zzz").equals("bar");
@@ -161,7 +163,7 @@
assert !Contexts.isConversationContextActive();
assert !Contexts.isApplicationContextActive();
assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==2;
- assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==9;
+ assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==10;
Lifecycle.endSession( servletContext, new ServletRequestSessionMap( (HttpServletRequest) externalContext.getRequest() ) );
1.33 +31 -20 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.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- InterceptorTest.java 10 Jun 2007 19:40:28 -0000 1.32
+++ InterceptorTest.java 20 Jun 2007 00:31:03 -0000 1.33
@@ -1,4 +1,4 @@
-//$Id: InterceptorTest.java,v 1.32 2007/06/10 19:40:28 gavin Exp $
+//$Id: InterceptorTest.java,v 1.33 2007/06/20 00:31:03 gavin Exp $
package org.jboss.seam.test;
import java.lang.reflect.Method;
@@ -8,6 +8,7 @@
import javax.faces.event.PhaseId;
import org.jboss.seam.Component;
+import org.jboss.seam.NoConversationException;
import org.jboss.seam.RequiredException;
import org.jboss.seam.Seam;
import org.jboss.seam.contexts.ApplicationContext;
@@ -16,11 +17,10 @@
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Events;
-import org.jboss.seam.core.FacesMessages;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Interpolator;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.PersistenceContexts;
+import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.interceptors.BijectionInterceptor;
import org.jboss.seam.interceptors.ConversationInterceptor;
import org.jboss.seam.interceptors.ConversationalInterceptor;
@@ -30,6 +30,7 @@
import org.jboss.seam.mock.MockExternalContext;
import org.jboss.seam.mock.MockFacesContext;
import org.jboss.seam.mock.MockServletContext;
+import org.jboss.seam.persistence.PersistenceContexts;
import org.testng.annotations.Test;
public class InterceptorTest
@@ -523,6 +524,9 @@
assert !Manager.instance().isLongRunningConversation();
+ try
+ {
+
String result = (String) ci.aroundInvoke( new MockInvocationContext() {
@Override
public Method getMethod()
@@ -537,10 +541,17 @@
}
});
- //assert !Manager.instance().isLongRunningConversation();
- assert "error".equals(result);
+ assert false;
- result = (String) ci.aroundInvoke( new MockInvocationContext() {
+ }
+ catch (Exception e)
+ {
+ assert e instanceof NoConversationException;
+ }
+
+ assert !Manager.instance().isLongRunningConversation();
+
+ String result = (String) ci.aroundInvoke( new MockInvocationContext() {
@Override
public Method getMethod()
{
@@ -554,7 +565,7 @@
});
Manager.instance().initializeTemporaryConversation();
- Manager.instance().beginConversation("bar");
+ Manager.instance().beginConversation();
//assert Manager.instance().isLongRunningConversation();
assert "begun".equals(result);
1.38 +8 -6 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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- PhaseListenerTest.java 15 Jun 2007 17:23:59 -0000 1.37
+++ PhaseListenerTest.java 20 Jun 2007 00:31:03 -0000 1.38
@@ -1,4 +1,4 @@
-//$Id: PhaseListenerTest.java,v 1.37 2007/06/15 17:23:59 gavin Exp $
+//$Id: PhaseListenerTest.java,v 1.38 2007/06/20 00:31:03 gavin Exp $
package org.jboss.seam.test;
import java.util.ArrayList;
@@ -21,19 +21,20 @@
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.ConversationPropagation;
import org.jboss.seam.core.Events;
-import org.jboss.seam.core.FacesMessages;
-import org.jboss.seam.core.FacesPage;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.Pages;
import org.jboss.seam.core.ServletSession;
-import org.jboss.seam.core.Validation;
+import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.faces.FacesPage;
+import org.jboss.seam.faces.Parameters;
+import org.jboss.seam.faces.Validation;
import org.jboss.seam.jsf.SeamPhaseListener;
import org.jboss.seam.jsf.SeamStateManager;
import org.jboss.seam.mock.MockApplication;
import org.jboss.seam.mock.MockExternalContext;
import org.jboss.seam.mock.MockFacesContext;
import org.jboss.seam.mock.MockLifecycle;
+import org.jboss.seam.navigation.Pages;
import org.jboss.seam.servlet.ServletRequestSessionMap;
import org.testng.annotations.Test;
@@ -51,6 +52,7 @@
installComponent(appContext, FacesMessages.class);
installComponent(appContext, Pages.class);
installComponent(appContext, Events.class);
+ installComponent(appContext, Parameters.class);
installComponent(appContext, Validation.class);
installComponent(appContext, ServletSession.class);
installComponent(appContext, ConversationPropagation.class);
@@ -239,7 +241,7 @@
phases.beforePhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) );
- Manager.instance().beginConversation(null);
+ Manager.instance().beginConversation();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) );
More information about the jboss-cvs-commits
mailing list