You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/04/16 09:44:57 UTC

svn commit: r648587 - in /geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms: JMSTest.java MessageSenderTest.java

Author: djencks
Date: Wed Apr 16 00:44:54 2008
New Revision: 648587

URL: http://svn.apache.org/viewvc?rev=648587&view=rev
Log:
Enable jms tests now that we are using amq 4.1.2

Modified:
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java?rev=648587&r1=648586&r2=648587&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java Wed Apr 16 00:44:54 2008
@@ -28,12 +28,11 @@
  *
  * @version $Rev$ $Date$
  */
-//@Test
+@Test
 public class JMSTest
 extends SeleniumTestSupport {
-//    @Test
+    @Test
     public void testIndexContent() throws Exception {
-/*
         selenium.open("/testjms/JMSQueueSender");
         selenium.waitForPageToLoad("30000");
         assertEquals("JMS Sender", selenium.getTitle());
@@ -48,7 +47,6 @@
         selenium.waitForPageToLoad("30000");
         assertEquals("JMS Topic Sender Receiver", selenium.getTitle());
         assertEquals("Received JMS Topic Message", selenium.getText("xpath=/html/body"));
-*/
 
     }
 }

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java?rev=648587&r1=648586&r2=648587&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java Wed Apr 16 00:44:54 2008
@@ -28,11 +28,6 @@
 public class MessageSenderTest {
 
     /**
-     * Initial context
-     */
-    private InitialContext ctx;
-
-    /**
      * Initialize test configuration
      *
      * @throws Exception if exception occurs
@@ -47,14 +42,14 @@
      */
     @Test
     public void sendRequests() throws Exception {
-        this.ctx = new InitialContext();
+        InitialContext ctx = new InitialContext();
         String totalShipStr = System.getProperty("total-shipment");
         String msgsPerShipStr = System.getProperty("requests-per-shipment");
 
         int totalShip = (totalShipStr == null ? 10 : Integer.parseInt(totalShipStr));
-        int msgsPerShip = (msgsPerShipStr == null ? 10 : Integer.parseInt(msgsPerShipStr));
+        int msgsPerShip = (msgsPerShipStr == null ? 20 : Integer.parseInt(msgsPerShipStr));
 
-        JmsSenderRemote jmsSender = (JmsSenderRemote) this.ctx.lookup("JmsSenderRemote");
+        JmsSenderRemote jmsSender = (JmsSenderRemote) ctx.lookup("JmsSenderRemote");
         if (jmsSender != null) {
             System.out.println("JmsSender initialized");
             for (int i = 0; i < totalShip; ++i) {
@@ -73,7 +68,6 @@
             }
 */
             //uncomment to actually run test
-/*
             for (int i = 0; i < totalShip * msgsPerShip; i++) {
                 Integer id = jmsSender.receiveMessage();
                 if (id == null) {
@@ -82,7 +76,6 @@
 //                    Thread.sleep(10000);
                 }
             }
-*/
         } else {
             throw new Exception("Sender is null");
         }