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

[Gavin King]

  User: gavin   
  Date: 07/06/20 18:12:58

  Modified:    src/test/misc/org/jboss/seam/test    ContextTest.java
                        DependencyTest.java PhaseListenerTest.java
  Log:
  move the Session API
  
  Revision  Changes    Path
  1.29      +3 -3      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.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- ContextTest.java	20 Jun 2007 08:23:20 -0000	1.28
  +++ ContextTest.java	20 Jun 2007 22:12:58 -0000	1.29
  @@ -1,4 +1,4 @@
  -//$Id: ContextTest.java,v 1.28 2007/06/20 08:23:20 gavin Exp $
  +//$Id: ContextTest.java,v 1.29 2007/06/20 22:12:58 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.Map;
  @@ -19,7 +19,6 @@
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.el.EL;
   import org.jboss.seam.el.SeamELResolver;
   import org.jboss.seam.mock.MockExternalContext;
  @@ -30,6 +29,7 @@
   import org.jboss.seam.servlet.ServletRequestSessionMap;
   import org.jboss.seam.web.Parameters;
   import org.jboss.seam.web.ServletContexts;
  +import org.jboss.seam.web.Session;
   import org.testng.annotations.Test;
   
   public class ContextTest
  @@ -52,7 +52,7 @@
         //appContext.set( Seam.getComponentName(Init.class), new Init() );
         installComponent(appContext, ConversationEntries.class);
         installComponent(appContext, Manager.class);
  -      installComponent(appContext, ServletSession.class);
  +      installComponent(appContext, Session.class);
         installComponent(appContext, ServletContexts.class);
         installComponent(appContext, Parameters.class);
         appContext.set( Seam.getComponentName(Init.class), new Init() );
  
  
  
  1.2       +4 -1      jboss-seam/src/test/misc/org/jboss/seam/test/DependencyTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DependencyTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/DependencyTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DependencyTest.java	10 Mar 2007 05:50:41 -0000	1.1
  +++ DependencyTest.java	20 Jun 2007 22:12:58 -0000	1.2
  @@ -1,6 +1,9 @@
   package org.jboss.seam.test;
   
  -import java.util.*;
  +import java.util.HashMap;
  +import java.util.Map;
  +import java.util.Set;
  +import java.util.TreeSet;
   
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Install;
  
  
  
  1.41      +3 -3      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.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- PhaseListenerTest.java	20 Jun 2007 00:38:24 -0000	1.40
  +++ PhaseListenerTest.java	20 Jun 2007 22:12:58 -0000	1.41
  @@ -1,4 +1,4 @@
  -//$Id: PhaseListenerTest.java,v 1.40 2007/06/20 00:38:24 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.41 2007/06/20 22:12:58 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.ArrayList;
  @@ -23,7 +23,6 @@
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.faces.FacesManager;
   import org.jboss.seam.faces.FacesMessages;
   import org.jboss.seam.faces.FacesPage;
  @@ -36,6 +35,7 @@
   import org.jboss.seam.mock.MockLifecycle;
   import org.jboss.seam.navigation.Pages;
   import org.jboss.seam.servlet.ServletRequestSessionMap;
  +import org.jboss.seam.web.Session;
   import org.testng.annotations.Test;
   
   public class PhaseListenerTest
  @@ -53,7 +53,7 @@
         installComponent(appContext, Pages.class);
         installComponent(appContext, Events.class);
         installComponent(appContext, Validation.class);
  -      installComponent(appContext, ServletSession.class);
  +      installComponent(appContext, Session.class);
         installComponent(appContext, ConversationPropagation.class);
      }