svn commit: r737697 - in /camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream: ScanStreamFileTest.java StreamFileTest.java

[davsclaus]

Author: davsclaus
Date: Mon Jan 26 14:12:11 2009
New Revision: 737697

URL: http://svn.apache.org/viewvc?rev=737697&view=rev
Log:
Fixed failing unit test reported by teamcity

Modified:
    
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
    
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java

Modified: 
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java?rev=737697&r1=737696&r2=737697&view=diff
==============================================================================
--- 
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
 (original)
+++ 
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
 Mon Jan 26 14:12:11 2009
@@ -35,7 +35,7 @@
         deleteDirectory("./target/stream");
         createDirectory("./target/stream");
 
-        file = new File("./target/stream/streamfile.txt");
+        file = new File("./target/stream/scanstreamfile.txt");
         file = file.getAbsoluteFile();
         file.createNewFile();
 
@@ -59,7 +59,7 @@
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                
from("stream:file?fileName=./target/stream/streamfile.txt&scanStream=true&scanStreamDelay=100").to("mock:result");
+                
from("stream:file?fileName=./target/stream/scanstreamfile.txt&scanStream=true&scanStreamDelay=100").to("mock:result");
             }
         };
     }

Modified: 
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java?rev=737697&r1=737696&r2=737697&view=diff
==============================================================================
--- 
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
 (original)
+++ 
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
 Mon Jan 26 14:12:11 2009
@@ -19,8 +19,11 @@
 import java.io.File;
 import java.io.FileOutputStream;
 
+import org.apache.camel.Consumer;
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
 
 /**
@@ -28,15 +31,19 @@
  */
 public class StreamFileTest extends ContextTestSupport {
 
-    private File file;
     private FileOutputStream fos;
 
     @Override
+    public boolean isUseRouteBuilder() {
+        return false;
+    }
+
+    @Override
     protected void setUp() throws Exception {
         deleteDirectory("./target/stream");
         createDirectory("./target/stream");
 
-        file = new File("./target/stream/streamfile.txt");
+        File file = new File("./target/stream/streamfile.txt");
         file = file.getAbsoluteFile();
         file.createNewFile();
 
@@ -47,20 +54,25 @@
     }
 
     public void testFile() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedBodiesReceived("Hello");
-
-        assertMockEndpointsSatisfied();
-
-        fos.close();
-    }
-
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            public void configure() {
-                
from("stream:file?fileName=./target/stream/streamfile.txt").to("mock:result");
-            }
-        };
+        try {
+            MockEndpoint mock = getMockEndpoint("mock:result");
+            mock.expectedBodiesReceived("Hello");
+
+            // can not use route builder as we need to have the file created 
in the setup before route builder starts
+            Endpoint endpoint = 
context.getEndpoint("stream:file?fileName=./target/stream/streamfile.txt&delay=100");
+            Consumer consumer = endpoint.createConsumer(new Processor() {
+                public void process(Exchange exchange) throws Exception {
+                    template.send("mock:result", exchange);
+                }
+            });
+            consumer.start();
+
+            assertMockEndpointsSatisfied();
+
+            consumer.stop();
+        } finally {
+            fos.close();
+        }
     }
 
 }
\ No newline at end of file