Author: bvahdat Date: Sat Aug 25 12:03:22 2012 New Revision: 1377274 URL: http://svn.apache.org/viewvc?rev=1377274&view=rev Log: Merged revisions 1377273 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1377273 | bvahdat | 2012-08-25 14:00:21 +0200 (Sa, 25 Aug 2012) | 9 lines Merged revisions 1377272 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1377272 | bvahdat | 2012-08-25 13:52:56 +0200 (Sa, 25 Aug 2012) | 1 line Fixed CS error. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1377272 Merged /camel/branches/camel-2.10.x:r1377273 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java?rev=1377274&r1=1377273&r2=1377274&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java Sat Aug 25 12:03:22 2012 @@ -27,12 +27,12 @@ public class FileConsumeRootDirManualTes } // manual test - public void xxxTestPollRootDirectory() throws Exception { + public void xxxTestPollRootDirectory() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMinimumMessageCount(2); + mock.expectedMinimumMessageCount(2); - assertMockEndpointsSatisfied(); - } + assertMockEndpointsSatisfied(); + } @Override protected RouteBuilder createRouteBuilder() throws Exception { @@ -46,4 +46,3 @@ public class FileConsumeRootDirManualTes }; } } -
