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

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

Author: wolfc
Date: 2011-02-10 13:36:41 -0500 (Thu, 10 Feb 2011)
New Revision: 110601

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
   projects/ejb3/trunk/testsuite/src/test/resources/test-configs/clusteredjms/deploy/mdbtest-service.xml
Log:
Renamed queue of clusteredjms test


Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java	2011-02-10 18:05:08 UTC (rev 110600)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java	2011-02-10 18:36:41 UTC (rev 110601)
@@ -34,7 +34,7 @@
 @MessageDriven(activationConfig =
         {
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/queuetest")
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/clusteredqueuetest")
         })
 public class QueueTestMDB
 implements MessageListener

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java	2011-02-10 18:05:08 UTC (rev 110600)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java	2011-02-10 18:36:41 UTC (rev 110601)
@@ -21,13 +21,13 @@
  */
 package org.jboss.ejb3.test.clusteredjms;
 
+import org.jboss.logging.Logger;
+
 import javax.annotation.Resource;
+import javax.ejb.Remote;
 import javax.ejb.Stateless;
-import javax.ejb.Remote;
 import javax.jms.Queue;
 
-import org.jboss.logging.Logger;
-
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
@@ -39,7 +39,7 @@
    
    public static int queueRan = 0;
    
-   @Resource(mappedName="queue/queuetest") Queue queue;
+   @Resource(mappedName="queue/clusteredqueuetest") Queue queue;
 
    public void clear()
    {

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2011-02-10 18:05:08 UTC (rev 110600)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2011-02-10 18:36:41 UTC (rev 110601)
@@ -21,30 +21,21 @@
  */
 package org.jboss.ejb3.test.clusteredjms.unit;
 
-import java.util.Properties;
+import junit.framework.Test;
+import org.jboss.ejb3.test.clusteredjms.TestStatus;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
 
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.TextMessage;
-import javax.jms.TopicConnectionFactory;
+import javax.jms.*;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import java.util.Properties;
 
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.clusteredjms.TestStatus;
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossJMSTestCase;
-
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
-public class MDBUnitTestCase extends JBossJMSTestCase
+public class MDBUnitTestCase extends JBossTestCase
 {
    private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
 
@@ -63,7 +54,7 @@
       QueueSender sender = null;
       QueueSession session = null;
 
-      Queue queue = (Queue) getInitialContext().lookup("queue/queuetest");
+      Queue queue = (Queue) getInitialContext().lookup("queue/clusteredqueuetest");
       QueueConnectionFactory factory = getQueueConnectionFactory();
       cnn = factory.createQueueConnection();
       session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
@@ -82,7 +73,7 @@
       Thread.sleep(2000);
       assertEquals(5, status.queueFired());
       
-      assertEquals("queuetest", status.testInjection());
+      assertEquals("clusteredqueuetest", status.testInjection());
    }
 
    protected QueueConnectionFactory getQueueConnectionFactory()
@@ -130,22 +121,7 @@
 
    public static Test suite() throws Exception
    {
-      return new TestSetup(getDeploySetup(MDBUnitTestCase.class,  "clusteredjms-test.jar"))
-      {
-         @Override
-         protected void setUp() throws Exception
-         {
-            deployQueue("queuetest");
-         }
-
-         @Override
-         protected void tearDown() throws Exception
-         {
-            undeployQueue("queuetest");
-         }
-      };
-      
+      return getDeploySetup(MDBUnitTestCase.class, "clusteredjms-test.jar");
    }
-   
 
 }
\ No newline at end of file

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test-configs/clusteredjms/deploy/mdbtest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test-configs/clusteredjms/deploy/mdbtest-service.xml	2011-02-10 18:05:08 UTC (rev 110600)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test-configs/clusteredjms/deploy/mdbtest-service.xml	2011-02-10 18:36:41 UTC (rev 110601)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
    <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=queuetest"
+      name="jboss.messaging.destination:service=Queue,name=clusteredqueuetest"
       xmbean-dd="xmdesc/Queue-xmbean.xml">
       <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
       <depends>jboss.messaging:service=PostOffice</depends>
-   </mbean>
-</server>
+   </mbean>
+</server>