camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r791381 - in /camel/branches/camel-1.x: ./ components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java etc/eclipse/Camel.importorder etc/eclipse/CamelCodeFormatter.xml
Date Mon, 06 Jul 2009 04:43:58 GMT
Author: davsclaus
Date: Mon Jul  6 04:43:58 2009
New Revision: 791381

URL: http://svn.apache.org/viewvc?rev=791381&view=rev
Log:
Merged revisions 791379 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r791379 | davsclaus | 2009-07-06 06:38:08 +0200 (Mon, 06 Jul 2009) | 1 line
  
  Fixed unit test reported by TC.
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
    camel/branches/camel-1.x/etc/eclipse/Camel.importorder   (props changed)
    camel/branches/camel-1.x/etc/eclipse/CamelCodeFormatter.xml   (props changed)

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  6 04:43:58 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java?rev=791381&r1=791380&r2=791381&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
(original)
+++ camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
Mon Jul  6 04:43:58 2009
@@ -18,7 +18,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.jms.ConnectionFactory;
 import javax.naming.Context;
 
@@ -26,6 +25,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
 import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
 
 /**
@@ -35,16 +35,13 @@
     protected MyRegistry registry = new MyRegistry();
 
     public void testDiscovery() throws Exception {
-        // lets wait to see if we get 3 services
-        for (int i = 0; i < 15; i++) {
-            Thread.sleep(1000);
-            if (registry.getServices().size() == 3) {
-                break;
-            }
-        }
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMinimumMessageCount(3);
+
+        assertMockEndpointsSatisfied();
 
         Map<String, Map> map = new HashMap<String, Map>(registry.getServices());
-        assertEquals("Size of map: " + map, 3, map.size());
+        assertTrue("There should be 3 or more, was: " + map.size(), map.size() >= 3);
     }
 
     protected CamelContext createCamelContext() throws Exception {
@@ -74,7 +71,7 @@
                 from("bean:service2?method=status").to("activemq:topic:registry.heartbeats");
                 from("bean:service3?method=status").to("activemq:topic:registry.heartbeats");
 
-                from("activemq:topic:registry.heartbeats?cacheLevelName=CACHE_CONSUMER").to("bean:registry?method=onEvent");
+                from("activemq:topic:registry.heartbeats").to("bean:registry?method=onEvent",
"mock:result");
             }
         };
     }

Propchange: camel/branches/camel-1.x/etc/eclipse/Camel.importorder
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  6 04:43:58 2009
@@ -1 +1 @@
-/camel/trunk/etc/eclipse/Camel.importorder:790560,790936
+/camel/trunk/etc/eclipse/Camel.importorder:790560,790936,791379

Propchange: camel/branches/camel-1.x/etc/eclipse/CamelCodeFormatter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  6 04:43:58 2009
@@ -1 +1 @@
-/camel/trunk/etc/eclipse/CamelCodeFormatter.xml:790560,790936
+/camel/trunk/etc/eclipse/CamelCodeFormatter.xml:790560,790936,791379



Mime
View raw message