Author: dkulp
Date: Fri Jul 8 19:25:16 2011
New Revision: 1144433
URL: http://svn.apache.org/viewvc?rev=1144433&view=rev
Log:
Merged revisions 1089348 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1089348 | davsclaus | 2011-04-06 04:26:11 -0400 (Wed, 06 Apr 2011) | 1 line
CAMEL-3838: Added unit test.
........
Added:
camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileIssueTest.java
- copied unchanged from r1089348,
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileIssueTest.java
camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileStopIssueTest.java
- copied unchanged from r1089348,
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileStopIssueTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:25:16 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java?rev=1144433&r1=1144432&r2=1144433&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
Fri Jul 8 19:25:16 2011
@@ -47,9 +47,6 @@ public class HttpStreamCacheFileTest ext
String out = template.requestBody("direct:start", "Hello World",
String.class);
assertEquals("Bye World", out);
- // give time for files to be deleted etc.
- Thread.sleep(2000);
-
// the temporary files should have been deleted
File file = new File("./target/cachedir");
String[] files = file.list();
@@ -67,9 +64,6 @@ public class HttpStreamCacheFileTest ext
assertEquals("Response body", body, s);
}
- // give time for files to be deleted etc.
- Thread.sleep(2000);
-
// the temporary files should have been deleted
File file = new File("./target/cachedir");
String[] files = file.list();
@@ -93,7 +87,7 @@ public class HttpStreamCacheFileTest ext
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
if (exchange.getIn().getBody() == null) {
-
exchange.getOut().setBody("12345678901234567890123456789012345678901234567890");
+ exchange.getOut().setBody(body);
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
} else {
exchange.getOut().setBody("Bye World");
