Author: ningjiang
Date: Fri Apr 23 09:39:24 2010
New Revision: 937213
URL: http://svn.apache.org/viewvc?rev=937213&view=rev
Log:
Merged revisions 937165 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r937165 | ningjiang | 2010-04-23 14:07:03 +0800 (Fri, 23 Apr 2010) | 1 line
Updated the PolicyPerRouteTest and PolicyPerProcessTest
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 23 09:39:24 2010
@@ -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,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096,924119,925739
+/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,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096,924119,925739,937165
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java?rev=937213&r1=937212&r2=937213&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java
Fri Apr 23 09:39:24 2010
@@ -33,9 +33,11 @@ public class PolicyPerProcessorTest exte
getMockEndpoint("mock:foo").expectedMessageCount(1);
getMockEndpoint("mock:foo").expectedHeaderReceived("foo", "was
wrapped");
getMockEndpoint("mock:bar").expectedMessageCount(1);
- getMockEndpoint("mock:bar").expectedHeaderReceived("foo", "was
wrapped");
+ getMockEndpoint("mock:bar").expectedHeaderReceived("foo", "police
finished excution");
getMockEndpoint("mock:bar").expectedHeaderReceived("bar", "was
wrapped");
getMockEndpoint("mock:result").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedHeaderReceived("foo", "police
finished excution");
+ getMockEndpoint("mock:result").expectedHeaderReceived("bar", "police
finished excution");
template.sendBody("direct:start", "Hello World");
@@ -97,6 +99,7 @@ public class PolicyPerProcessorTest exte
exchange.getIn().setHeader(name, "was wrapped");
// let the original processor continue routing
processor.process(exchange);
+ exchange.getIn().setHeader(name, "police finished
excution");
}
};
}
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java?rev=937213&r1=937212&r2=937213&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java
Fri Apr 23 09:39:24 2010
@@ -36,8 +36,10 @@ public class PolicyPerRouteTest extends
getMockEndpoint("mock:bar").expectedHeaderReceived("foo", "was
wrapped");
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedHeaderReceived("foo", "was
wrapped");
-
- template.sendBody("direct:start", "Hello World");
+
+ getMockEndpoint("mock:response").expectedMessageCount(1);
+ getMockEndpoint("mock:response").expectedHeaderReceived("foo", "policy
finished excution");
+ template.sendBody("direct:send", "Hello World");
assertMockEndpointsSatisfied();
@@ -68,6 +70,10 @@ public class PolicyPerRouteTest extends
.to("mock:bar")
.to("mock:result");
// END SNIPPET: e1
+
+ from("direct:send")
+ .to("direct:start")
+ .to("mock:response");
}
};
}
@@ -85,13 +91,13 @@ public class PolicyPerRouteTest extends
return new Processor() {
public void process(Exchange exchange) throws Exception {
invoked++;
-
+ // let the original processor continue routing
// ensure its started
ServiceHelper.startService(processor);
exchange.getIn().setHeader(name, "was wrapped");
- // let the original processor continue routing
processor.process(exchange);
+ exchange.getIn().setHeader(name, "policy finished
excution");
}
};
}
