camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r810408 - in /camel/trunk/tests/camel-itest/src/test: java/org/apache/camel/itest/jms/ resources/org/apache/camel/itest/greeter/ resources/org/apache/camel/itest/jetty/ resources/org/apache/camel/itest/jms/
Date Wed, 02 Sep 2009 08:12:21 GMT
Author: davsclaus
Date: Wed Sep  2 08:12:20 2009
New Revision: 810408

URL: http://svn.apache.org/viewvc?rev=810408&view=rev
Log:
Using AMQ vm protocol when possible to avoid unit tests error with port number already in
use.

Modified:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java
Wed Sep  2 08:12:20 2009
@@ -36,8 +36,6 @@
 
         Thread.sleep(2000);
 
-        // TODO now start the route!
-
         System.out.println("Now testing!");
         timedSendLoop(mediumQueueCount, expected);
 

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
Wed Sep  2 08:12:20 2009
@@ -34,6 +34,8 @@
     public void testPollEnrichJms() throws Exception {
         template.sendBody("jms:queue:foo", "Bye World");
 
+        Thread.sleep(500);
+
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Bye World");
 

Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
Wed Sep  2 08:12:20 2009
@@ -48,7 +48,7 @@
   	<property name="connectionFactory">
   		<bean class="org.apache.activemq.ActiveMQConnectionFactory">
   			<property name="brokerURL"
-  				value="tcp://localhost:61616" />
+  				value="vm://localhost?broker.persistent=false" />
   		</bean>
   	</property>
   </bean>

Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
Wed Sep  2 08:12:20 2009
@@ -48,7 +48,7 @@
   	<property name="connectionFactory">
   		<bean class="org.apache.activemq.ActiveMQConnectionFactory">
   			<property name="brokerURL"
-  				value="tcp://localhost:61616" />
+  				value="vm://localhost?broker.persistent=false" />
   		</bean>
   	</property>
   </bean>

Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
Wed Sep  2 08:12:20 2009
@@ -29,7 +29,7 @@
   	<property name="connectionFactory">
   		<bean class="org.apache.activemq.ActiveMQConnectionFactory">
   			<property name="brokerURL"
-  				value="tcp://localhost:61616" />
+  				value="vm://localhost?broker.persistent=false" />
   		</bean>
   	</property>
   </bean>

Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
Wed Sep  2 08:12:20 2009
@@ -29,7 +29,7 @@
   	<property name="connectionFactory">
   		<bean class="org.apache.activemq.ActiveMQConnectionFactory">
   			<property name="brokerURL"
-  				value="tcp://localhost:61616" />
+  				value="vm://localhost?broker.persistent=false" />
   		</bean>
   	</property>
   </bean>

Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml?rev=810408&r1=810407&r2=810408&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
Wed Sep  2 08:12:20 2009
@@ -26,13 +26,13 @@
     <!-- activemq broker -->
     <broker:broker useJmx="false" persistent="false" brokerName="localhost">
         <broker:transportConnectors>
-            <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
+            <broker:transportConnector name="tcp" uri="vm://localhost?broker.persistent=false"/>
         </broker:transportConnectors>
     </broker:broker>
 
     <!-- camel stuff below to send and listen to broker with a spring JMS transaction
manager -->
     <bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-        <property name="brokerURL" value="tcp://localhost:61616"/>
+        <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
     </bean>
 
     <bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">



Mime
View raw message