[jboss-cvs] JBossAS SVN: r58111 - projects/test/trunk/test/src/main/org/jboss/test

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-11-04 03:35:51 -0500 (Sat, 04 Nov 2006)
New Revision: 58111

Modified:
   projects/test/trunk/test/src/main/org/jboss/test/JBossTestCase.java
   projects/test/trunk/test/src/main/org/jboss/test/JBossTestServices.java
   projects/test/trunk/test/src/main/org/jboss/test/JBossTestSetup.java
Log:
Have JBossTestCase extend BaseTestCase and remove the explicit log4j usage

Modified: projects/test/trunk/test/src/main/org/jboss/test/JBossTestCase.java
===================================================================
--- projects/test/trunk/test/src/main/org/jboss/test/JBossTestCase.java	2006-11-04 08:34:21 UTC (rev 58110)
+++ projects/test/trunk/test/src/main/org/jboss/test/JBossTestCase.java	2006-11-04 08:35:51 UTC (rev 58111)
@@ -31,14 +31,11 @@
 import javax.naming.InitialContext;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.Logger;
-
 /**
  * This is the standard base test case for jboss junit test cases. It supplies
- * access to log4j logging, the jboss jmx server, jndi, and a method for
+ * access to jboss logging, the jboss jmx server, jndi, and a method for
  * deploying ejb packages. You may supply the name of the machine the jboss
  * server is on with the system property jbosstest.server.name (default
  * getInetAddress().getLocalHost().getHostName()) and the directory for
@@ -50,9 +47,8 @@
  * @version $Revision$
  */
 public class JBossTestCase
-   extends TestCase
+   extends BaseTestCase
 {
-   protected Logger log;
 
    /**
     *  Saved exception from deployment.
@@ -72,7 +68,6 @@
    public JBossTestCase(String name)
    {
       super(name);
-      log = Logger.getLogger(getClass());
       initDelegate();
    }
 
@@ -143,16 +138,6 @@
    }
 
    /**
-    * Gets the Log attribute of the JBossTestCase object
-    *
-    * @return   The Log value
-    */
-   protected Logger getLog()
-   {
-      return log;
-   }
-
-   /**
     * Gets the DeployerName attribute of the JBossTestCase object
     *
     * @return                                  The DeployerName value

Modified: projects/test/trunk/test/src/main/org/jboss/test/JBossTestServices.java
===================================================================
--- projects/test/trunk/test/src/main/org/jboss/test/JBossTestServices.java	2006-11-04 08:34:21 UTC (rev 58110)
+++ projects/test/trunk/test/src/main/org/jboss/test/JBossTestServices.java	2006-11-04 08:35:51 UTC (rev 58111)
@@ -34,12 +34,12 @@
 import javax.naming.InitialContext;
 import javax.security.auth.login.LoginContext;
 
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
 import org.jboss.test.util.AppCallbackHandler;
 
 /**
  * This is provides services for jboss junit test cases and TestSetups. It supplies
- * access to log4j logging, the jboss jmx server, jndi, and a method for
+ * access to jboss logging, the jboss jmx server, jndi, and a method for
  * deploying ejb packages. You may supply the JNDI name under which the
  * RMIAdaptor interface is located via the system property jbosstest.server.name
  * default (jmx/rmi/RMIAdaptor) and the directory for deployable packages with
@@ -66,7 +66,7 @@
 
    // Attributes ----------------------------------------------------
    protected MBeanServerConnection server;
-   protected Category log;
+   protected Logger log;
    protected InitialContext initialContext;
    protected Hashtable jndiEnv;
    protected LoginContext lc;
@@ -78,7 +78,7 @@
     */
    public JBossTestServices(String className)
    {
-      log = Category.getInstance(className);
+      log = Logger.getLogger(className);
       log.debug("JBossTestServices(), className=" + className);
    }
    
@@ -145,7 +145,7 @@
     *
     * @return   The Log value
     */
-   Category getLog()
+   Logger getLog()
    {
       return log;
    }

Modified: projects/test/trunk/test/src/main/org/jboss/test/JBossTestSetup.java
===================================================================
--- projects/test/trunk/test/src/main/org/jboss/test/JBossTestSetup.java	2006-11-04 08:34:21 UTC (rev 58110)
+++ projects/test/trunk/test/src/main/org/jboss/test/JBossTestSetup.java	2006-11-04 08:35:51 UTC (rev 58111)
@@ -32,12 +32,12 @@
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
 
 /**
  * This is a TestSetup class for jboss junit test cases that provides the
  * jboss test services. It supplies
- * access to log4j logging, the jboss jmx server, jndi, and a method for
+ * access to jboss logging, the jboss jmx server, jndi, and a method for
  * deploying ejb packages. You may supply the name of the machine the jboss
  * server is on with the system property jbosstest.server.name (default
  * getInetAddress().getLocalHost().getHostName()) and the directory for
@@ -101,7 +101,7 @@
     *
     * @return   The Log value
     */
-   protected Category getLog()
+   protected Logger getLog()
    {
       return delegate.getLog();
    }