Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 14933 invoked from network); 16 Apr 2011 17:11:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Apr 2011 17:11:06 -0000 Received: (qmail 63078 invoked by uid 500); 16 Apr 2011 17:11:06 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 63040 invoked by uid 500); 16 Apr 2011 17:11:06 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 63032 invoked by uid 99); 16 Apr 2011 17:11:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Apr 2011 17:11:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Apr 2011 17:11:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 132DF2388994; Sat, 16 Apr 2011 17:10:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Sat, 16 Apr 2011 17:10:38 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110416171039.132DF2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(""); + error.expectedMessageCount(1); + error.message(0).body(String.class).contains(""); getMockEndpoint("mock:invalid").expectedMessageCount(0); getMockEndpoint("mock:result").expectedMessageCount(0);