[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Peter Muir]

  User: pmuir   
  Date: 08/01/08 15:43:08

  Modified:    src/main/org/jboss/seam/mock   SeamTest.java
                        BaseSeamTest.java
  Log:
  Revert back to original per class boot behaviour by default
  
  Revision  Changes    Path
  1.79      +2 -35     jboss-seam/src/main/org/jboss/seam/mock/SeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/SeamTest.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -b -r1.78 -r1.79
  --- SeamTest.java	8 Jan 2008 19:09:18 -0000	1.78
  +++ SeamTest.java	8 Jan 2008 20:43:08 -0000	1.79
  @@ -8,12 +8,8 @@
   
   import org.testng.annotations.AfterClass;
   import org.testng.annotations.AfterMethod;
  -import org.testng.annotations.AfterSuite;
  -import org.testng.annotations.AfterTest;
   import org.testng.annotations.BeforeClass;
   import org.testng.annotations.BeforeMethod;
  -import org.testng.annotations.BeforeSuite;
  -import org.testng.annotations.BeforeTest;
   
   /**
    * Provides BaseSeamTest functionality for TestNG integration tests.
  @@ -21,7 +17,6 @@
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Mike Youngstrom
  - * @author Pete Muir
    */
   public class SeamTest extends BaseSeamTest
   {
  @@ -41,47 +36,19 @@
      }
   
      @Override
  -   @Deprecated
  +   @BeforeClass
      public void init() throws Exception
      {
         super.init();
      }
   
      @Override
  -   @Deprecated
  +   @AfterClass
      public void cleanup() throws Exception
      {
         super.cleanup();
      }
      
  -   @Override
  -   @BeforeSuite
  -   public void startSeam() throws Exception
  -   {
  -      super.startSeam();
  -   }
  -   
  -   @Override
  -   @AfterSuite
  -   public void stopSeam() throws Exception
  -   {
  -      super.stopSeam();
  -   }
  -   
  -   @Override
  -   @BeforeClass
  -   public void setupClass() throws Exception
  -   {
  -      super.setupClass();
  -   }
  -   
  -   @Override
  -   @AfterClass
  -   protected void cleanupClass() throws Exception
  -   {
  -      super.cleanupClass();
  -   }
  -
      /**
       * A pass through to BaseSeamTest.FacesRequest. 
       * 
  
  
  
  1.39      +0 -2      jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BaseSeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- BaseSeamTest.java	8 Jan 2008 19:05:48 -0000	1.38
  +++ BaseSeamTest.java	8 Jan 2008 20:43:08 -0000	1.39
  @@ -918,7 +918,6 @@
         session = null;
      }
   
  -   @Deprecated
      public void init() throws Exception
      {
         startSeam();
  @@ -981,7 +980,6 @@
         conversationViewRootAttributes = null;
      }
   
  -   @Deprecated
      public void cleanup() throws Exception
      {
         cleanupClass();