[jboss-cvs] JBossAS SVN: r58485 - trunk/ejb3/src/test/org/jboss/ejb3/test

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

Author: scott.stark at jboss.org
Date: 2006-11-16 22:43:50 -0500 (Thu, 16 Nov 2006)
New Revision: 58485

Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestServices.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestSetup.java
Log:
Update for JBossTestCase changes

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestCase.java	2006-11-17 03:43:08 UTC (rev 58484)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestCase.java	2006-11-17 03:43:50 UTC (rev 58485)
@@ -26,6 +26,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.jboss.test.AbstractTestDelegate;
 import org.jboss.test.JBossTestCase;
 
 /**
@@ -42,20 +43,15 @@
       super(name);
    }
 
-   @Override
-   public void initDelegate()
+   /**
+    * Overriden to return CustomJNDIJBossTestServices as the test delegate.
+    */
+   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
    {
-      delegate = new CustomJNDIJBossTestServices(getClass().getName());
-      try
-      {
-         delegate.init();
-      }
-      catch (Exception e)
-      {
-         log.error("Failed to init delegate", e);
-      }
+      AbstractTestDelegate delegate = new CustomJNDIJBossTestServices(clazz);
+      return delegate;
    }
-   
+
    /**
     * Get a JBossTestSetup that does login and deployment in setUp/tearDown
     *

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestServices.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestServices.java	2006-11-17 03:43:08 UTC (rev 58484)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestServices.java	2006-11-17 03:43:50 UTC (rev 58485)
@@ -40,6 +40,10 @@
 public class CustomJNDIJBossTestServices extends JBossTestServices
 {
 
+   public CustomJNDIJBossTestServices(Class clazz)
+   {
+      super(clazz);
+   }
    public CustomJNDIJBossTestServices(String className)
    {
       super(className);

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestSetup.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestSetup.java	2006-11-17 03:43:08 UTC (rev 58484)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/CustomJNDIJBossTestSetup.java	2006-11-17 03:43:50 UTC (rev 58485)
@@ -39,12 +39,6 @@
    {
       super(test);
    }
-
-   @Override
-   protected JBossTestServices createTestServices()
-   {
-      return new CustomJNDIJBossTestServices(getClass().getName());
-   }
    
    protected CustomJNDIJBossTestServices getDelegate()
    {