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

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

Author: jaikiran
Date: 2010-03-26 08:34:53 -0400 (Fri, 26 Mar 2010)
New Revision: 103040

Removed:
   projects/ejb3/trunk/testsuite/src/test/resources/test/ejbthree957/ejbthree957test-service.xml
Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree957/unit/MessageLinkTestCase.java
Log:
EJBTHREE-2057 Fixed the ejbthree957 testcase for hornetq changes. Also fixed the build script to remove references to (non-existent) ejbthree1123 resources in test folder

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2010-03-26 12:23:42 UTC (rev 103039)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2010-03-26 12:34:53 UTC (rev 103040)
@@ -2400,12 +2400,6 @@
 	
    <target name="ejbthree1123" >
       <build-simple-jar name="ejbthree1123"/>
-   
-   <copy todir="${build.lib}">
-      <fileset dir="${resources}/test/ejbthree1123">
-         <include name="*.xml"/>
-      </fileset>
-   </copy>
    	
    </target>
 	

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree957/unit/MessageLinkTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree957/unit/MessageLinkTestCase.java	2010-03-26 12:23:42 UTC (rev 103039)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree957/unit/MessageLinkTestCase.java	2010-03-26 12:34:53 UTC (rev 103040)
@@ -30,9 +30,10 @@
 import javax.jms.QueueSession;
 import javax.jms.TextMessage;
 
+import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-import org.jboss.test.JBossTestCase;
+import org.jboss.ejb3.test.common.EJB3TestCase;
 
 /**
  * Test message link.
@@ -40,7 +41,7 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public class MessageLinkTestCase extends JBossTestCase
+public class MessageLinkTestCase extends EJB3TestCase
 {
 
    public MessageLinkTestCase(String name)
@@ -79,7 +80,25 @@
    
    public static Test suite() throws Exception
    {
-      return getDeploySetup(MessageLinkTestCase.class, "ejbthree957test-service.xml,ejbthree957.ear");
+      return new TestSetup(getDeploySetup(MessageLinkTestCase.class, "ejbthree957.ear"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("ejbthree957In");
+            deployQueue("ejbthree957Out");
+            
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("ejbthree957In");
+            undeployQueue("ejbthree957Out");
+            
+            
+         }
+      };
    }
 
 }

Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/ejbthree957/ejbthree957test-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/ejbthree957/ejbthree957test-service.xml	2010-03-26 12:23:42 UTC (rev 103039)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/ejbthree957/ejbthree957test-service.xml	2010-03-26 12:34:53 UTC (rev 103040)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=ejbthree957">
-      <attribute name="JNDIName">queue/ejbthree957In</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=ejbthree957Out">
-      <attribute name="JNDIName">queue/ejbthree957Out</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>
\ No newline at end of file