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

[Gavin King]

  User: gavin   
  Date: 06/11/09 00:47:49

  Modified:    src/test/misc/org/jboss/seam/test  PhaseListenerTest.java
  Log:
  fix JBSEAM-452 and unit test
  
  Revision  Changes    Path
  1.26      +11 -5     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.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- PhaseListenerTest.java	3 Nov 2006 22:47:26 -0000	1.25
  +++ PhaseListenerTest.java	9 Nov 2006 05:47:49 -0000	1.26
  @@ -1,4 +1,4 @@
  -//$Id: PhaseListenerTest.java,v 1.25 2006/11/03 22:47:26 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.26 2006/11/09 05:47:49 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.ArrayList;
  @@ -11,6 +11,7 @@
   import javax.servlet.http.HttpSession;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
  @@ -102,7 +103,7 @@
         phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
         
         assert facesContext.getViewRoot().getAttributes().size()==1;
  -      assert ( (FacesPage) getPageMap(facesContext).get( Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
  +      assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
         assert Contexts.isEventContextActive();
         assert Contexts.isSessionContextActive();
         assert Contexts.isApplicationContextActive();
  @@ -118,12 +119,17 @@
         assert !Contexts.isConversationContextActive();
      }
   
  +   private String getPrefix()
  +   {
  +      return ScopeType.PAGE.getPrefix() + '$';
  +   }
  +
      @Test
      public void testSeamPhaseListenerLongRunning()
      {
         MockFacesContext facesContext = createFacesContext();
         
  -      getPageMap(facesContext).put( Seam.getComponentName(FacesPage.class), new FacesPage() { public String getConversationId() { return "2"; } });
  +      getPageMap(facesContext).put( getPrefix() + Seam.getComponentName(FacesPage.class), new FacesPage() { public String getConversationId() { return "2"; } });
         
         List<String> conversationIdStack = new ArrayList<String>();
         conversationIdStack.add("2");
  @@ -177,7 +183,7 @@
         
         phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
         
  -      assert ( (FacesPage) getPageMap(facesContext).get( Seam.getComponentName(FacesPage.class) ) ).getConversationId().equals("2");
  +      assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId().equals("2");
   
         assert !Contexts.isEventContextActive();
         assert !Contexts.isSessionContextActive();
  @@ -316,7 +322,7 @@
         phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
         
         assert facesContext.getViewRoot().getAttributes().size()==1;
  -      assert ( (FacesPage) getPageMap(facesContext).get( Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
  +      assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
         assert Contexts.isEventContextActive();
         assert Contexts.isSessionContextActive();
         assert Contexts.isApplicationContextActive();