Author: davsclaus
Date: Thu Jul 9 08:56:30 2009
New Revision: 792457
URL: http://svn.apache.org/viewvc?rev=792457&view=rev
Log:
Fixed unit test running on slower boxes. Debugger is @deprecated.
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Breakpoint.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Breakpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Breakpoint.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Breakpoint.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Breakpoint.java
Thu Jul 9 08:56:30 2009
@@ -19,6 +19,7 @@
import org.apache.camel.Exchange;
/**
+ * @deprecated will be removed in Camel 2.0
* @version $Revision$
*/
public class Breakpoint {
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
Thu Jul 9 08:56:30 2009
@@ -28,6 +28,7 @@
/**
* An interceptor for debugging and tracing routes
*
+ * @deprecated will be removed in Camel 2.0
* @version $Revision$
*/
public class DebugInterceptor extends DelegateProcessor {
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
Thu Jul 9 08:56:30 2009
@@ -33,6 +33,7 @@
/**
* An interceptor strategy for debugging and tracing routes
*
+ * @deprecated will be removed in Camel 2.0
* @version $Revision$
*/
public class Debugger implements InterceptStrategy {
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
Thu Jul 9 08:56:30 2009
@@ -21,6 +21,7 @@
/**
* Represents an exception that occurred when processing an exchange
*
+ * @deprecated will be removed in Camel 2.0
* @version $Revision$
*/
public class ExceptionEvent {
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
Thu Jul 9 08:56:30 2009
@@ -54,25 +54,24 @@
public void testFileRoute() throws Exception {
MockEndpoint result = resolveMandatoryEndpoint("mock:result",
MockEndpoint.class);
result.expectedBodiesReceived(expectedBody);
- result.setResultWaitTime(5000);
template.sendBodyAndHeader(uri, expectedBody, "cheese", 123);
// Wait till the exchange is delivered to the processor
- assertTrue("Async processor received exchange", receivedLatch.await(5,
TimeUnit.SECONDS));
+ assertTrue("Async processor received exchange",
receivedLatch.await(10, TimeUnit.SECONDS));
File file = this.file.get();
// The file consumer support async processing of the exchange,
// so the file should not get deleted until the exchange
// finishes being asynchronously processed.
- Thread.sleep(1000);
+ Thread.sleep(1500);
assertTrue("File should exist", file.exists());
// Release the async processing thread so that the exchange completes
// and the file
// gets deleted.
processingLatch.countDown();
- Thread.sleep(1000);
+ Thread.sleep(1500);
assertFalse("File should not exist", file.exists());
result.assertIsSatisfied();
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
Thu Jul 9 08:56:30 2009
@@ -31,7 +31,6 @@
public void testFileRoute() throws Exception {
MockEndpoint result = resolveMandatoryEndpoint("mock:result",
MockEndpoint.class);
result.expectedMinimumMessageCount(2);
- result.setResultWaitTime(5000);
template.sendBodyAndHeader(uri, expectedBody, "cheese", 123);
@@ -51,7 +50,6 @@
assertEquals(1, fileCount);
assertTrue(nullCount > 0);
-
}
@Override
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java?rev=792457&r1=792456&r2=792457&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
Thu Jul 9 08:56:30 2009
@@ -31,7 +31,7 @@
// START SNIPPET: e1
public void testToFile() throws Exception {
- template.sendBody("seda:reports", "This is a great report");
+ template.sendBody("direct:reports", "This is a great report");
// give time for the file to be written before assertions
Thread.sleep(1000);
@@ -54,7 +54,7 @@
public void configure() throws Exception {
// the reports from the seda queue is processed by our
processor
// before they are written to files in the target/reports
directory
-
from("seda:reports").processRef("processReport").to("file://target/test-reports");
+
from("direct:reports").processRef("processReport").to("file://target/test-reports");
}
};
}
