[jboss-cvs] JBossAS SVN: r94592 - in branches/JBPAPP_5_0/testsuite/src: main/org/jboss/test/timer/test and 1 other directories.

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

Author: istudens at redhat.com
Date: 2009-10-09 08:31:14 -0400 (Fri, 09 Oct 2009)
New Revision: 94592

Modified:
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/TimerMessageBean.java
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java
   branches/JBPAPP_5_0/testsuite/src/resources/timer/ejb/jboss.xml
Log:
timer tests now use only their own queues and do not rely on the example ones, JBPAPP-2729

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java	2009-10-09 12:29:37 UTC (rev 94591)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java	2009-10-09 12:31:14 UTC (rev 94592)
@@ -53,7 +53,7 @@
  * destination-type="javax.jms.Queue"
  * acknowledge-mode="Auto-acknowledge" 
  * @ejb.resource-ref res-ref-name="jms/QCF" res-type="javax.jms.QueueConnectionFactory" res-auth="Container"
- * @jboss.destination-jndi-name name="queue/C"
+ * @jboss.destination-jndi-name name="queue/QueueC"
  * @jboss.resource-ref res-ref-name="jms/QCF" jndi-name="ConnectionFactory"
  * 
  * @author Scott.Stark at jboss.org

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/TimerMessageBean.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/TimerMessageBean.java	2009-10-09 12:29:37 UTC (rev 94591)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/ejb/TimerMessageBean.java	2009-10-09 12:31:14 UTC (rev 94592)
@@ -51,7 +51,7 @@
  * destination-type="javax.jms.Queue"
  * acknowledge-mode="Auto-acknowledge" 
  * @ejb.resource-ref res-ref-name="jms/QCF" res-type="javax.jms.QueueConnectionFactory" res-auth="Container"
- * @jboss.destination-jndi-name name="queue/A"
+ * @jboss.destination-jndi-name name="queue/QueueA"
  * @jboss.resource-ref res-ref-name="jms/QCF" jndi-name="ConnectionFactory"
  * 
  * @author Scott.Stark at jboss.org

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java	2009-10-09 12:29:37 UTC (rev 94591)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java	2009-10-09 12:31:14 UTC (rev 94592)
@@ -42,9 +42,7 @@
 import javax.security.auth.login.LoginContext;
 
 import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.jboss.test.JBossTestCase;
-import org.jboss.test.JBossTestSetup;
 import org.jboss.test.util.AppCallbackHandler;
 import org.jboss.test.timer.interfaces.TimerEntity;
 import org.jboss.test.timer.interfaces.TimerEntityHome;
@@ -70,27 +68,7 @@
     */
    public static Test suite() throws Exception
    {
-      TestSuite suite = new TestSuite();
-
-      suite.addTest(new JBossTestSetup(new TestSuite(BasicTimerUnitTestCase.class))
-      {
-         protected void setUp() throws Exception
-         {
-            super.setUp();
-            ClassLoader loader = Thread.currentThread().getContextClassLoader();
-            deploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
-            deploy (EJB_TIMER_XAR);
-         }
-         protected void tearDown() throws Exception
-         {
-            super.tearDown();
-            ClassLoader loader = Thread.currentThread().getContextClassLoader();
-            undeploy (EJB_TIMER_XAR);
-            undeploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
-         }
-      });
-
-      return suite;
+      return JBossTestCase.getDeploySetup(BasicTimerUnitTestCase.class, EJB_TIMER_XAR);
    }
 
    /**
@@ -348,8 +326,8 @@
          queConn = factory.createQueueConnection();
          queConn.start();
 
-         Queue queueA = (Queue) ctx.lookup("queue/A");
-         Queue queueB = (Queue) ctx.lookup("queue/B");
+         Queue queueA = (Queue) ctx.lookup("queue/QueueA");
+         Queue queueB = (Queue) ctx.lookup("queue/QueueB");
          
          session = queConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
          sender = session.createSender(queueA);
@@ -468,8 +446,8 @@
          queConn = factory.createQueueConnection();
          queConn.start();
 
-         Queue queueA = (Queue) ctx.lookup("queue/C");
-         Queue queueB = (Queue) ctx.lookup("queue/D");
+         Queue queueA = (Queue) ctx.lookup("queue/QueueC");
+         Queue queueB = (Queue) ctx.lookup("queue/QueueD");
 
          session = queConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
          sender = session.createSender(queueA);

Modified: branches/JBPAPP_5_0/testsuite/src/resources/timer/ejb/jboss.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/timer/ejb/jboss.xml	2009-10-09 12:29:37 UTC (rev 94591)
+++ branches/JBPAPP_5_0/testsuite/src/resources/timer/ejb/jboss.xml	2009-10-09 12:31:14 UTC (rev 94592)
@@ -58,7 +58,7 @@
 
       <message-driven>
          <ejb-name>TimerMDB</ejb-name>
-         <destination-jndi-name>queue/A</destination-jndi-name>
+         <destination-jndi-name>queue/QueueA</destination-jndi-name>
          <resource-ref>
             <res-ref-name>jms/QCF</res-ref-name>
             <jndi-name>ConnectionFactory</jndi-name>
@@ -66,7 +66,7 @@
       </message-driven>
       <message-driven>
          <ejb-name>OnCreateTimerMDB</ejb-name>
-         <destination-jndi-name>queue/C</destination-jndi-name>
+         <destination-jndi-name>queue/QueueC</destination-jndi-name>
          <timer-persistence>false</timer-persistence>         
          <resource-ref>
             <res-ref-name>jms/QCF</res-ref-name>