[JBoss-dev] CVS update: jbosstest/src/main/org/jboss/test/cts/test AllJUnitTests.java Main.java

[Scott M Stark]

  User: starksm 
  Date: 01/07/08 18:06:03

  Modified:    src/main/org/jboss/test/cts/test Tag: Branch_2_4
                        AllJUnitTests.java Main.java
  Log:
  Merge latest changes from main to the 2.4 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.1  +8 -5      jbosstest/src/main/org/jboss/test/cts/test/AllJUnitTests.java
  
  Index: AllJUnitTests.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/cts/test/AllJUnitTests.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- AllJUnitTests.java        2001/04/29 08:04:59     1.12
  +++ AllJUnitTests.java        2001/07/09 01:06:03     1.12.2.1
  @@ -1,11 +1,10 @@
   package org.jboss.test.cts.test;
   
  -
  -
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  +import org.jboss.test.util.Deploy;
   
   /**
    * Class AllJUnitTests
  @@ -43,11 +42,12 @@
      public static Test suite ()
      {
         TestSuite suite = new TestSuite();
  -
  +      String filename = "../deploy/cts.jar";
  +      
         try
         {
  -       System.out.println("Deploying");
  -       new org.jboss.jmx.client.Deployer().deploy("../deploy/cts.jar");
  +            System.out.println("Deploying...");
  +            Deploy.deploy(filename);
         }
         catch (Exception ex)
         {
  @@ -83,6 +83,9 @@
         // 03/01/2001
         suite.addTest(new BmpTest("testContainerObjects"));
   
  +      // add a test case to undeploy our support applications
  +      suite.addTest(new Deploy.Undeployer(filename));
  +      
         return suite;
      }
   }
  
  
  
  1.3.2.1   +25 -2     jbosstest/src/main/org/jboss/test/cts/test/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/cts/test/Main.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- Main.java 2001/01/05 01:24:11     1.3
  +++ Main.java 2001/07/09 01:06:03     1.3.2.1
  @@ -10,12 +10,14 @@
   import javax.management.*;
   import org.jboss.test.cts.interfaces.*;
   
  +import junit.framework.*;
  +import org.jboss.test.util.Deploy;
   
   /**
    *
    *   @see <related>
  - *   @author $Author: peter $
  - *   @version $Revision: 1.3 $
  + *   @author $Author: starksm $
  + *   @version $Revision: 1.3.2.1 $
    */
   
   public class Main
  @@ -300,6 +302,27 @@
   
         deployed = true;
      }
  +
  +    public static Test suite() {
  +        TestSuite suite = new TestSuite();
  +     
  +        try {
  +            String filename = "../deploy/cts.jar";
  +            System.out.println("Deploying...");
  +            Deploy.deploy(filename);
  +
  +            suite.addTest(new TestSuite(Main.class));
  +
  +            // add a test case to undeploy our support applications
  +            suite.addTest(new Deploy.Undeployer(filename));
  +        }
  +        catch (Throwable t) {
  +            t.printStackTrace();
  +            System.exit(0);
  +        }
  +
  +        return suite;
  +    }
   }
   
   
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development