[jboss-cvs] JBossAS SVN: r103343 - in projects/ejb3/trunk/testsuite/src/test: resources/test/consumer and 1 other directory.

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

Author: wolfc
Date: 2010-03-31 11:08:13 -0400 (Wed, 31 Mar 2010)
New Revision: 103343

Removed:
   projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/consumertest-service.xml
Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java
Log:
EJBTHREE-2057: modified consumer test (depends on JBAS-7880)

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java	2010-03-31 15:06:46 UTC (rev 103342)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java	2010-03-31 15:08:13 UTC (rev 103343)
@@ -21,13 +21,14 @@
  */
 package org.jboss.ejb3.test.consumer.unit;
 
+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;
+import org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote;
 import org.jboss.ejb3.test.consumer.QueueTestRemote;
-import org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestRemote;
 import org.jboss.ejb3.test.consumer.TestStatus;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 /**
  * Sample client for the jboss container.
@@ -37,7 +38,7 @@
  */
 
 public class ConsumerUnitTestCase
-        extends JBossTestCase
+        extends EJB3TestCase
 {
    org.jboss.logging.Logger log = getLog();
 
@@ -165,7 +166,22 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(ConsumerUnitTestCase.class, "consumertest-service.xml, consumer-test.jar");
+      return new TestSetup(getDeploySetup(ConsumerUnitTestCase.class, "consumer-test.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("consumertest");
+            deployQueue("mdbtest");
+            deployTopic("mdbtest");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployDestinations();
+         }
+      };
    }
 
 }

Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/consumertest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/consumertest-service.xml	2010-03-31 15:06:46 UTC (rev 103342)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/consumertest-service.xml	2010-03-31 15:08:13 UTC (rev 103343)
@@ -1,21 +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=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</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=consumerqueuetest">
-      <attribute name="JNDIName">queue/consumertest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Topic"
-      name="jboss.mq.destination:service=Topic,name=topictest">
-      <attribute name="JNDIName">topic/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>