Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 27099 invoked from network); 16 Apr 2008 07:45:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Apr 2008 07:45:25 -0000 Received: (qmail 29566 invoked by uid 500); 16 Apr 2008 07:45:26 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 29430 invoked by uid 500); 16 Apr 2008 07:45:26 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 29420 invoked by uid 99); 16 Apr 2008 07:45:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Apr 2008 00:45:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Apr 2008 07:44:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0B1B1A9832; Wed, 16 Apr 2008 00:45:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Wed, 16 Apr 2008 07:44:57 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080416074501.F0B1B1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"); }