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

[Gavin King]

  User: gavin   
  Date: 06/11/20 18:44:23

  Modified:    src/test/misc/org/jboss/seam/test     Bar.java EjbBean.java
                        Foo.java InitializationTest.java
  Log:
  fix tests
  
  Revision  Changes    Path
  1.5       +4 -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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Bar.java	11 Oct 2006 05:35:09 -0000	1.4
  +++ Bar.java	20 Nov 2006 23:44:23 -0000	1.5
  @@ -6,6 +6,8 @@
    */
   package org.jboss.seam.test;
   
  +import java.io.Serializable;
  +
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Begin;
   import org.jboss.seam.annotations.Conversational;
  @@ -19,12 +21,12 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   @Name("bar")
   @Scope(ScopeType.CONVERSATION)
   @Conversational(ifNotBegunOutcome="error")
  -public class Bar
  +public class Bar implements Serializable
   {
      
      @In(required=true)
  
  
  
  1.3       +3 -1      jboss-seam/src/test/misc/org/jboss/seam/test/EjbBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EjbBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/EjbBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EjbBean.java	8 May 2006 14:13:34 -0000	1.2
  +++ EjbBean.java	20 Nov 2006 23:44:23 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: EjbBean.java,v 1.2 2006/05/08 14:13:34 gavin Exp $
  +//$Id: EjbBean.java,v 1.3 2006/11/20 23:44:23 gavin Exp $
   package org.jboss.seam.test;
   
   import javax.ejb.Remove;
  @@ -6,12 +6,14 @@
   
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Destroy;
  +import org.jboss.seam.annotations.JndiName;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   
   @Stateful
   @Name("ejb")
   @Scope(ScopeType.EVENT)
  + at JndiName("x")
   public class EjbBean implements Ejb
   {
      public void foo() {}
  
  
  
  1.6       +4 -2      jboss-seam/src/test/misc/org/jboss/seam/test/Foo.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Foo.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/Foo.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Foo.java	25 Oct 2006 15:37:36 -0000	1.5
  +++ Foo.java	20 Nov 2006 23:44:23 -0000	1.6
  @@ -6,6 +6,8 @@
    */
   package org.jboss.seam.test;
   
  +import java.io.Serializable;
  +
   import javax.ejb.Remove;
   
   import org.hibernate.validator.NotNull;
  @@ -18,12 +20,12 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   @Name("foo")
   @Scope(ScopeType.SESSION)
   @SuppressWarnings("deprecation")
  -public class Foo
  +public class Foo implements Serializable
   {
      
      private String value;
  
  
  
  1.36      +7 -3      jboss-seam/src/test/misc/org/jboss/seam/test/InitializationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InitializationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/InitializationTest.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- InitializationTest.java	18 Nov 2006 00:38:23 -0000	1.35
  +++ InitializationTest.java	20 Nov 2006 23:44:23 -0000	1.36
  @@ -1,7 +1,9 @@
  -//$Id: InitializationTest.java,v 1.35 2006/11/18 00:38:23 nrichards Exp $
  +//$Id: InitializationTest.java,v 1.36 2006/11/20 23:44:23 gavin Exp $
   package org.jboss.seam.test;
   
  +import org.jboss.seam.Seam;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.core.Manager;
   import org.jboss.seam.init.Initialization;
   import org.jboss.seam.mock.MockServletContext;
   import org.testng.annotations.Test;
  @@ -9,12 +11,14 @@
   public class InitializationTest
   {
      @Test
  -   public void testEmptyInitialization()
  +   public void testInitialization()
      {
         MockServletContext servletContext = new MockServletContext();
         new Initialization(servletContext).init();
   
  -      assert servletContext.getAttributes().size()==44;
  +      assert !servletContext.getAttributes().isEmpty();
  +      assert servletContext.getAttributes().containsKey( Seam.getComponentName(Manager.class) + ".component" );
  +      assert servletContext.getAttributes().containsKey( Seam.getComponentName(Foo.class) + ".component" );
         assert !Contexts.isApplicationContextActive();
      }