[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...
Gavin King
gavin.king at jboss.com
Thu Jul 27 08:26:33 EDT 2006
User: gavin
Date: 06/07/27 08:26:33
Modified: src/test/misc/org/jboss/seam/test Bar.java
ComponentTest.java ContextTest.java
Log:
fix failing tests
Revision Changes Path
1.3 +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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Bar.java 7 Oct 2005 09:25:22 -0000 1.2
+++ Bar.java 27 Jul 2006 12:26:33 -0000 1.3
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
@Name("bar")
@Scope(ScopeType.CONVERSATION)
@@ -33,7 +33,7 @@
@In(create=true)
Foo foo;
- @Out
+ @Out(required=false)
String string;
@Begin
1.4 +6 -1 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ComponentTest.java 8 May 2006 14:13:34 -0000 1.3
+++ ComponentTest.java 27 Jul 2006 12:26:33 -0000 1.4
@@ -1,8 +1,9 @@
-//$Id: ComponentTest.java,v 1.3 2006/05/08 14:13:34 gavin Exp $
+//$Id: ComponentTest.java,v 1.4 2006/07/27 12:26:33 gavin Exp $
package org.jboss.seam.test;
import org.jboss.seam.Component;
import org.jboss.seam.ComponentType;
+import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
import org.jboss.seam.core.Manager;
@@ -22,6 +23,10 @@
assert Seam.getComponentName(Foo.class).equals("foo");
assert Seam.getComponentType(Foo.class)==ComponentType.JAVA_BEAN;
assert Seam.getComponentScope(Foo.class)==ScopeType.SESSION;
+ assert Seam.getBeanClass(Foo.class)==Foo.class;
+ assert Seam.getEjbName(EjbBean.class).equals("EjbBean");
+ assert Seam.getEjbName(Foo.class)==null;
+ assert Seam.getInterceptionType(Foo.class)==InterceptionType.ALWAYS;
}
@Test
1.17 +26 -19 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ContextTest.java 17 Jun 2006 20:08:03 -0000 1.16
+++ ContextTest.java 27 Jul 2006 12:26:33 -0000 1.17
@@ -1,4 +1,4 @@
-//$Id: ContextTest.java,v 1.16 2006/06/17 20:08:03 gavin Exp $
+//$Id: ContextTest.java,v 1.17 2006/07/27 12:26:33 gavin Exp $
package org.jboss.seam.test;
import javax.faces.context.ExternalContext;
@@ -9,12 +9,11 @@
import org.jboss.seam.Component;
import org.jboss.seam.Seam;
import org.jboss.seam.contexts.Context;
+import org.jboss.seam.contexts.ContextAdaptor;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.MapContext;
import org.jboss.seam.contexts.FacesApplicationContext;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.contexts.ServerConversationContext;
-import org.jboss.seam.contexts.ContextAdaptor;
import org.jboss.seam.contexts.WebRequestContext;
import org.jboss.seam.contexts.WebSessionContext;
import org.jboss.seam.core.Init;
@@ -49,6 +48,11 @@
Seam.getComponentName(Bar.class) + ".component",
new Component(Bar.class)
);
+ appContext.set(
+ Seam.getComponentName(Foo.class) + ".component",
+ new Component(Foo.class)
+ );
+ appContext.set("otherFoo", new Foo());
assert !Contexts.isEventContextActive();
assert !Contexts.isSessionContextActive();
@@ -81,14 +85,17 @@
assert Contexts.getConversationContext() instanceof ServerConversationContext;
assert Contexts.getApplicationContext() instanceof FacesApplicationContext;
- Contexts.getSessionContext().set("foo", "bar");
- Contexts.getApplicationContext().set("foo", "bar");
+ Contexts.getSessionContext().set("zzz", "bar");
+ Contexts.getApplicationContext().set("zzz", "bar");
Contexts.getConversationContext().set("xxx", "yyy");
Object bar = seamVariableResolver.resolveVariable(null, "bar");
assert bar!=null;
assert bar instanceof Bar;
assert Contexts.getConversationContext().get("bar")==bar;
+ Object foo = Contexts.getSessionContext().get("foo");
+ assert foo!=null;
+ assert foo instanceof Foo;
Lifecycle.endRequest(externalContext);
@@ -96,8 +103,8 @@
assert !Contexts.isSessionContextActive();
assert !Contexts.isConversationContextActive();
assert !Contexts.isApplicationContextActive();
- assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==3;
- assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==4;
+ assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==4;
+ assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==6;
Lifecycle.beginRequest(externalContext);
@@ -123,22 +130,25 @@
assert Contexts.getConversationContext() instanceof ServerConversationContext;
assert Contexts.getApplicationContext() instanceof FacesApplicationContext;
- assert Contexts.getSessionContext().get("foo").equals("bar");
- assert Contexts.getApplicationContext().get("foo").equals("bar");
+ assert Contexts.getSessionContext().get("zzz").equals("bar");
+ assert Contexts.getApplicationContext().get("zzz").equals("bar");
assert Contexts.getConversationContext().get("xxx").equals("yyy");
assert Contexts.getConversationContext().get("bar")==bar;
+ assert Contexts.getSessionContext().get("foo")==foo;
assert Contexts.getConversationContext().getNames().length==2;
- assert Contexts.getApplicationContext().getNames().length==4;
- assert Contexts.getSessionContext().getNames().length==1;
+ assert Contexts.getApplicationContext().getNames().length==6;
+ assert Contexts.getSessionContext().getNames().length==2;
- assert seamVariableResolver.resolveVariable(null, "foo").equals("bar");
+ assert seamVariableResolver.resolveVariable(null, "zzz").equals("bar");
assert seamVariableResolver.resolveVariable(null, "xxx").equals("yyy");
assert seamVariableResolver.resolveVariable(null, "bar")==bar;
+ assert seamVariableResolver.resolveVariable(null, "foo")==foo;
- assert jbpmVariableResolver.resolveVariable("foo").equals("bar");
+ assert jbpmVariableResolver.resolveVariable("zzz").equals("bar");
assert jbpmVariableResolver.resolveVariable("xxx").equals("yyy");
assert jbpmVariableResolver.resolveVariable("bar")==bar;
+ assert jbpmVariableResolver.resolveVariable("foo")==foo;
Manager.instance().setLongRunningConversation(false);
Lifecycle.endRequest(externalContext);
@@ -147,16 +157,13 @@
assert !Contexts.isSessionContextActive();
assert !Contexts.isConversationContextActive();
assert !Contexts.isApplicationContextActive();
- assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==1;
- assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==4;
+ assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==2;
+ assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==6;
Lifecycle.endSession( servletContext, new ServletSessionImpl( (HttpSession) externalContext.getSession(true) ) );
- //assert session.getAttributes().size()==0;
-
Lifecycle.endApplication(servletContext);
- //assert servletContext.getAttributes().size()==0;
}
private static final VariableResolver VARIABLE_RESOLVER = new VariableResolver() {
More information about the jboss-cvs-commits
mailing list