[jboss-cvs] JBossAS SVN: r102770 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/common and 1 other directories.

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

Author: wolfc
Date: 2010-03-23 06:20:57 -0400 (Tue, 23 Mar 2010)
New Revision: 102770

Modified:
   projects/ejb3/trunk/testsuite/pom.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/common/EJB3TestCase.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
Log:
EJBTHREE-2057: apply proposed fix to interceptors2

Modified: projects/ejb3/trunk/testsuite/pom.xml
===================================================================
--- projects/ejb3/trunk/testsuite/pom.xml	2010-03-23 10:14:39 UTC (rev 102769)
+++ projects/ejb3/trunk/testsuite/pom.xml	2010-03-23 10:20:57 UTC (rev 102770)
@@ -296,6 +296,7 @@
     <dependency>
       <groupId>org.jboss.test</groupId>
       <artifactId>jboss-test</artifactId>
+      <version>1.1.7.CR1</version>
       <scope>test</scope>
     </dependency>
 

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/common/EJB3TestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/common/EJB3TestCase.java	2010-03-23 10:14:39 UTC (rev 102769)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/common/EJB3TestCase.java	2010-03-23 10:20:57 UTC (rev 102770)
@@ -21,13 +21,13 @@
  */
 package org.jboss.ejb3.test.common;
 
-import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossJMSTestCase;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public abstract class EJB3TestCase extends JBossTestCase
+public abstract class EJB3TestCase extends JBossJMSTestCase
 {
    protected EJB3TestCase(String name)
    {

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2010-03-23 10:14:39 UTC (rev 102769)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2010-03-23 10:20:57 UTC (rev 102770)
@@ -21,14 +21,8 @@
  */ 
 package org.jboss.ejb3.test.interceptors2.unit;
 
-import java.util.ArrayList;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
+import junit.extensions.TestSetup;
 import junit.framework.Test;
-
 import org.jboss.ejb3.mdb.ProducerManager;
 import org.jboss.ejb3.mdb.ProducerObject;
 import org.jboss.ejb3.test.common.EJB3TestCase;
@@ -62,6 +56,11 @@
 import org.jboss.ejb3.test.interceptors2.XMLOnlySLSB;
 import org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote;
 
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import java.util.ArrayList;
+
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -771,7 +770,22 @@
    
    public static Test suite() throws Exception
    {
-      return getDeploySetup(InterceptorsTestCase.class, "interceptors2test-service.xml, interceptors2-test.jar");
+      return new TestSetup(getDeploySetup(InterceptorsTestCase.class, "interceptors2-test.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("mixedqueue");
+            deployQueue("defaultonlyqueue");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("defaultonlyqueue");
+            undeployQueue("mixedqueue");
+         }
+      };
    }
 
 }
\ No newline at end of file