Author: ningjiang
Date: Thu Jul 9 06:35:40 2009
New Revision: 792412
URL: http://svn.apache.org/viewvc?rev=792412&view=rev
Log:
Merged revisions 792381 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r792381 | ningjiang | 2009-07-09 10:21:24 +0800 (Thu, 09 Jul 2009) | 1 line
CAMEL-1813 fixed the issue of message header copy
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 9 06:35:40 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,791379,791476,791767,792038
+/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
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java?rev=792412&r1=792411&r2=792412&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
Thu Jul 9 06:35:40 2009
@@ -30,7 +30,7 @@
*/
public class HttpGetTest extends ContextTestSupport {
protected String expectedText = "activemq";
-
+
public void testHttpGet() throws Exception {
MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results",
MockEndpoint.class);
mockEndpoint.expectedMessageCount(1);
@@ -48,7 +48,7 @@
Map<String, Object> headers = in.getHeaders();
log.debug("Headers: " + headers);
- assertTrue("Should be more than one header but was: " + headers,
headers.size() > 0);
+ checkHeaders(headers);
String body = in.getBody(String.class);
@@ -57,6 +57,11 @@
assertTrue("body should contain: " + expectedText,
body.contains(expectedText));
}
+ protected void checkHeaders(Map<String, Object> headers) {
+ assertTrue("Should be more than one header but was: " + headers,
headers.size() > 0);
+
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
Modified:
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java?rev=792412&r1=792411&r2=792412&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
Thu Jul 9 06:35:40 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.http;
+import java.util.Map;
+
import org.apache.camel.builder.RouteBuilder;
public class HttpGetWithHeadersTest extends HttpGetTest {
@@ -25,6 +27,7 @@
return new RouteBuilder() {
public void configure() {
from("direct:start")
+ .setHeader("TestHeader", constant("test"))
.setHeader("Content-Length", constant(0))
.setHeader("Accept-Language", constant("pl"))
.to("http://www.google.com/search";)
@@ -39,5 +42,10 @@
expectedText = "Szukaj";
super.setUp();
}
+
+ protected void checkHeaders(Map<String, Object> headers) {
+ assertTrue("Should be more than one header but was: " + headers,
headers.size() > 0);
+ assertEquals("Should get the TestHeader", "test",
headers.get("TestHeader"));
+ }
}
