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

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

Author: jaikiran
Date: 2010-03-30 11:22:09 -0400 (Tue, 30 Mar 2010)
New Revision: 103269

Removed:
   projects/ejb3/trunk/testsuite/src/test/resources/test/enventry/enventrytest-service.xml
Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
Log:
EJBTHREE-2057 Fixed the enventry testcase to take care of the HornetQ integration changes

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2010-03-30 14:49:16 UTC (rev 103268)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2010-03-30 15:22:09 UTC (rev 103269)
@@ -1695,11 +1695,6 @@
          </fileset>
       </jar>
       
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/enventry">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
    </target>
 
    <!--target name="loginmodule"

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java	2010-03-30 14:49:16 UTC (rev 103268)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java	2010-03-30 15:22:09 UTC (rev 103269)
@@ -32,15 +32,17 @@
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.jboss.ejb3.test.enventry.TestEnvEntry;
-import org.jboss.test.JBossTestCase;
+import junit.extensions.TestSetup;
 import junit.framework.Test;
 
+import org.jboss.ejb3.test.common.EJB3TestCase;
+import org.jboss.ejb3.test.enventry.TestEnvEntry;
+
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  * @version <tt>$Revision$</tt>
  */
-public class EnvEntryTestCase extends JBossTestCase
+public class EnvEntryTestCase extends EJB3TestCase
 {
   
    public EnvEntryTestCase(String name)
@@ -117,7 +119,20 @@
    
    public static Test suite() throws Exception
    {
-      return getDeploySetup(EnvEntryTestCase.class, "enventrytest-service.xml,enventry.jar");
+      return new TestSetup(getDeploySetup(EnvEntryTestCase.class, "enventry.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("testEnvEntry");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("testEnvEntry");
+         } 
+      };
    }
 
 }

Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/enventry/enventrytest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/enventry/enventrytest-service.xml	2010-03-30 14:49:16 UTC (rev 103268)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/enventry/enventrytest-service.xml	2010-03-30 15:22:09 UTC (rev 103269)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testEnvEntry"
-      xmbean-dd="xmdesc/Queue-xmbean.xml">
-      <attribute name="JNDIName">queue/testEnvEntry</attribute>
-      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-      <depends>jboss.messaging:service=PostOffice</depends>
-   </mbean>
-</server>