svn commit: r696445 - in /synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms: JMSTransportDescriptionFactory.java JMSTransportTest.java

[veithen]

Author: veithen
Date: Wed Sep 17 13:55:47 2008
New Revision: 696445

URL: http://svn.apache.org/viewvc?rev=696445&view=rev
Log:
JMS transport tests:
* Added regression test for SYNAPSE-448.
* Reduced the number of test cases being executed (we don't need to test all 
possible combinations).

Modified:
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java?rev=696445&r1=696444&r2=696445&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
 Wed Sep 17 13:55:47 2008
@@ -39,6 +39,12 @@
     
     private final boolean cfOnSender;
     
+    /**
+     * Constructor.
+     * @param cfOnSender Determine whether the connection factories (JMS 
providers)
+     *                   should also be configured on the sender. This switch 
allows
+     *                   us to build regression tests for SYNAPSE-448. 
+     */
     public JMSTransportDescriptionFactory(boolean cfOnSender) {
         this.cfOnSender = cfOnSender;
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java?rev=696445&r1=696444&r2=696445&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
 Wed Sep 17 13:55:47 2008
@@ -24,7 +24,6 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
 import org.apache.synapse.transport.testkit.TransportTestSuite;
 import org.apache.synapse.transport.testkit.TransportTestSuiteBuilder;
 import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient;
@@ -42,6 +41,14 @@
         
         // SwA doesn't make sense with text messages
         suite.addExclude("(&(test=AsyncSwA)(client=jms)(jmsType=text))");
+        
+        // Don't execute all possible test combinations:
+        //  * Use a single setup to execute tests with all message types.
+        //  * Only use a small set of message types for the other setups.
+        
suite.addExclude("(!(|(&(broker=qpid)(cfOnSender=false)(!(|(destType=topic)(replyDestType=topic))))"
 +
+                                    
"(&(test=AsyncXML)(messageType=SOAP11)(data=ASCII))" +
+                                    
"(&(test=EchoXML)(messageType=POX)(data=ASCII))))");
+        
         // SYNAPSE-304:
         
suite.addExclude("(&(test=AsyncTextPlain)(client=jms)(jmsType=bytes))");
         // SYNAPSE-436:
@@ -49,11 +56,11 @@
         
         TransportTestSuiteBuilder builder = new 
TransportTestSuiteBuilder(suite);
 
-        TransportDescriptionFactory tdf = new 
JMSTransportDescriptionFactory(false);
         JMSTestEnvironment[] environments = new JMSTestEnvironment[] { new 
QpidTestEnvironment(), new ActiveMQTestEnvironment() };
-        
-        for (JMSTestEnvironment env : environments) {
-            builder.addEnvironment(env, tdf);
+        for (boolean cfOnSender : new boolean[] { false, true }) {
+            for (JMSTestEnvironment env : environments) {
+                builder.addEnvironment(env, new 
JMSTransportDescriptionFactory(cfOnSender));
+            }
         }
         
         builder.addAsyncChannel(new 
JMSAsyncChannel(JMSConstants.DESTINATION_TYPE_QUEUE, 
ContentTypeMode.TRANSPORT));
@@ -86,7 +93,7 @@
             suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new 
AsyncChannel[] {
                     new JMSAsyncChannel("endpoint1", 
JMSConstants.DESTINATION_TYPE_QUEUE, ContentTypeMode.TRANSPORT),
                     new JMSAsyncChannel("endpoint2", 
JMSConstants.DESTINATION_TYPE_QUEUE, ContentTypeMode.TRANSPORT) },
-                    2, false, env, tdf));
+                    2, false, env, new JMSTransportDescriptionFactory(false)));
         }