geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1348545 - in /geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests: jms-ear/pom.xml jms-ear/src/test/resources/testng.xml jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
Date Sun, 10 Jun 2012 07:58:01 GMT
Author: xiaming
Date: Sun Jun 10 07:58:01 2012
New Revision: 1348545

URL: http://svn.apache.org/viewvc?rev=1348545&view=rev
Log:
GERONIMO-4784 Recieving after rollback requires more time, so set second receive timeout to
2 seconds to make the pass; Also set the test counter smaller to save time

Modified:
    geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
    geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java

Modified: geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=1348545&r1=1348544&r2=1348545&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
Sun Jun 10 07:58:01 2012
@@ -141,7 +141,11 @@
                             <suiteXmlFiles>
                                 <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                             </suiteXmlFiles>
-                            <forkedProcessTimeoutInSeconds>60</forkedProcessTimeoutInSeconds>
+                            <!-- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
-->
+                            <systemPropertyVariables>
+                                <total-shipment>2</total-shipment>
+                                <requests-per-shipment>5</requests-per-shipment>
           
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
 

Modified: geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml?rev=1348545&r1=1348544&r2=1348545&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
Sun Jun 10 07:58:01 2012
@@ -24,16 +24,22 @@
 
 <suite name="Suite1" verbose="1">
     <test name="enterprise-testsuite.jms">
-        <!--<packages>
+        <packages>
             <package name="org.apache.geronimo.testsuite.enterprise.jms"/>
-        </packages>-->
-        <classes>
-            <class name="org.apache.geronimo.testsuite.enterprise.jms.JMSTest"/>
-            <class name="org.apache.geronimo.testsuite.enterprise.jms.MessageSenderTest"/>
-        </classes>
+        </packages>
+<!--         <classes> -->
+<!--             <class name="org.apache.geronimo.testsuite.enterprise.jms.JMSTest"/>
-->
+<!--             <class name="org.apache.geronimo.testsuite.enterprise.jms.MessageSenderTest"/>
-->
+<!--         </classes> -->
         <!-- reverse what is commented out to just run the GERONIMO-4784 failing test
-->
-        <!--<classes>-->
-            <!--<class name="org.apache.geronimo.testsuite.enterprise.jms.RollbackTest"/>-->
-        <!--</classes>-->
+        <!-- <classes>
+            <class name="org.apache.geronimo.testsuite.enterprise.jms.RollbackTest">
+                <methods>
+                    <include name="XXtestRollbackQUeueAndTopic"/>
+                    <include name="testRollbackQueue"/>
+                    <include name="testRollbackTopic"/>
+                </methods>
+            </class>
+        </classes> -->
     </test>
 </suite>

Modified: geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java?rev=1348545&r1=1348544&r2=1348545&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
Sun Jun 10 07:58:01 2012
@@ -102,11 +102,11 @@ public class JmsBmtBean implements JmsBm
         try {
             conn = this.connFactory.createConnection();
             c2 = connFactory.createConnection();
+            conn.start();
             sess = conn.createSession(true, Session.SESSION_TRANSACTED);
             s2 = c2.createSession(true, Session.SESSION_TRANSACTED);
             prod = sess.createProducer(destination);
             consumer = sess.createConsumer(destination);
-            conn.start();
 
             for (int i = 0; i < counter; ++i) {
                 SimpleTransferObject to = new SimpleTransferObject(requestName, i);
@@ -134,7 +134,7 @@ public class JmsBmtBean implements JmsBm
 
                 ut.begin();
                 try {
-                    received = consumer.receive(1000);
+                    received = consumer.receive(2000);
                     if (received == null) throw new JMSException("Not received second time");
                     if (!to.equals(((ObjectMessage)received).getObject())) throw new JMSException("Wrong
object inside: " + ((ObjectMessage)received).getObject());
                 } finally {



Mime
View raw message