svn commit: r1061672 - /camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java

[davsclaus]

Author: davsclaus
Date: Fri Jan 21 08:08:01 2011
New Revision: 1061672

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

Modified:
    
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java

Modified: 
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java?rev=1061672&r1=1061671&r2=1061672&view=diff
==============================================================================
--- 
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
 (original)
+++ 
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
 Fri Jan 21 08:08:01 2011
@@ -18,9 +18,7 @@ package org.apache.camel.component.file.
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -30,22 +28,19 @@ import org.junit.Test;
 public class FtpProducerRootFileExistFailTest extends FtpServerTestSupport {
 
     private String getFtpUrl() {
-        return "ftp://admin@localhost:"; + getPort() + 
"?password=admin&delay=2000&noop=true&fileExist=Fail";
+        return "ftp://admin@localhost:"; + getPort() + 
"?password=admin&fileExist=Fail";
     }
 
     @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
+        // create existing file on ftp server
         template.sendBodyAndHeader(getFtpUrl(), "Hello World", 
Exchange.FILE_NAME, "hello.txt");
     }
 
     @Test
     public void testFail() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello World");
-        mock.expectedFileExists(FTP_ROOT_DIR + "/hello.txt", "Hello World");
-
         try {
             template.sendBodyAndHeader(getFtpUrl(), "Bye World", 
Exchange.FILE_NAME, "hello.txt");
             fail("Should have thrown an exception");
@@ -54,16 +49,12 @@ public class FtpProducerRootFileExistFai
             assertEquals("File already exist: hello.txt. Cannot write new 
file.", cause.getMessage());
         }
 
-        assertMockEndpointsSatisfied();
+        // root file should still exist
+        assertFileExists(FTP_ROOT_DIR + "hello.txt");
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from(getFtpUrl()).to("mock:result");
-            }
-        };
+    public boolean isUseRouteBuilder() {
+        return false;
     }
 }
\ No newline at end of file