svn commit: r1094018 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java

[davsclaus]

Author: davsclaus
Date: Sat Apr 16 17:10:38 2011
New Revision: 1094018

URL: http://svn.apache.org/viewvc?rev=1094018&view=rev
Log:
Fixed test.

Modified:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java
    
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java?rev=1094018&r1=1094017&r2=1094018&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java
 Sat Apr 16 17:10:38 2011
@@ -43,7 +43,8 @@ public class RecipientListParallelAggreg
         int num2 = context.getTypeConverter().convertTo(int.class, after);
         int diff = num2 - num1;
         // should be 10 + 1 other threads (10 in parallel pool + 1 in 
aggregate pool)
-        assertTrue("There should be 12 threads in diff, was: " + diff, diff == 
12);
+        // we run unit test per jmv fork, so there may be a hanging thread
+        assertTrue("There should be 12 threads in diff, was: " + diff, diff >= 
12 && diff <= 13);
     }
 
     @Override

Modified: 
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java?rev=1094018&r1=1094017&r2=1094018&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
 (original)
+++ 
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
 Sat Apr 16 17:10:38 2011
@@ -46,7 +46,8 @@ public class RouteWithErrorHandlerTest e
     @Test
     public void testUnmarshalError() throws Exception {
         MockEndpoint error = getMockEndpoint("mock:error");
-        error.expectedBodiesReceived("<foo/>");
+        error.expectedMessageCount(1);
+        error.message(0).body(String.class).contains("<foo/>");
         getMockEndpoint("mock:invalid").expectedMessageCount(0);
         getMockEndpoint("mock:result").expectedMessageCount(0);