[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...

[Gavin King]

  User: gavin   
  Date: 07/05/29 21:33:00

  Modified:    src/test/misc/org/jboss/seam/test  ContextTest.java
  Log:
  update test
  
  Revision  Changes    Path
  1.20      +9 -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.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ContextTest.java	31 Oct 2006 06:40:24 -0000	1.19
  +++ ContextTest.java	30 May 2007 01:33:00 -0000	1.20
  @@ -1,9 +1,7 @@
  -//$Id: ContextTest.java,v 1.19 2006/10/31 06:40:24 gavin Exp $
  +//$Id: ContextTest.java,v 1.20 2007/05/30 01:33:00 gavin Exp $
   package org.jboss.seam.test;
   
   import javax.faces.context.ExternalContext;
  -import javax.faces.context.FacesContext;
  -import javax.faces.el.VariableResolver;
   import javax.servlet.http.HttpSession;
   
   import org.jboss.seam.Component;
  @@ -19,7 +17,8 @@
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.jsf.SeamVariableResolver;
  +import org.jboss.seam.el.EL;
  +import org.jboss.seam.el.SeamELResolver;
   import org.jboss.seam.mock.MockExternalContext;
   import org.jboss.seam.mock.MockHttpServletRequest;
   import org.jboss.seam.mock.MockHttpSession;
  @@ -33,7 +32,7 @@
      @Test
      public void testContextManagement() throws Exception
      {
  -      SeamVariableResolver seamVariableResolver = new SeamVariableResolver(VARIABLE_RESOLVER);
  +      SeamELResolver seamVariableResolver = new SeamELResolver();
         org.jboss.seam.jbpm.SeamVariableResolver jbpmVariableResolver = new org.jboss.seam.jbpm.SeamVariableResolver();
         
         MockServletContext servletContext = new MockServletContext();
  @@ -95,7 +94,7 @@
         Contexts.getApplicationContext().set("zzz", "bar");
         Contexts.getConversationContext().set("xxx", "yyy");
         
  -      Object bar = seamVariableResolver.resolveVariable(null, "bar");
  +      Object bar = seamVariableResolver.getValue(EL.EL_CONTEXT, null, "bar");
         assert bar!=null;
         assert bar instanceof Bar;
         assert Contexts.getConversationContext().get("bar")==bar;
  @@ -146,10 +145,10 @@
         assert Contexts.getApplicationContext().getNames().length==7;
         assert Contexts.getSessionContext().getNames().length==3;
         
  -      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 seamVariableResolver.getValue(EL.EL_CONTEXT, null, "zzz").equals("bar");
  +      assert seamVariableResolver.getValue(EL.EL_CONTEXT, null, "xxx").equals("yyy");
  +      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("xxx").equals("yyy");
  @@ -172,11 +171,6 @@
         
      }
      
  -   private static final VariableResolver VARIABLE_RESOLVER = new VariableResolver() {
  -      @Override
  -      public Object resolveVariable(FacesContext facesContext, String name) { return null; }
  -   };
  -   
      @Test
      public void testContexts()
      {