svn commit: r1340636 - in /camel/trunk/camel-core/src/test/java/org/apache/camel/issues: SedaFileIdempotentIssueTest.java SedaFileIdempotentTimeoutIssueTest.java

[davsclaus]

Author: davsclaus
Date: Sun May 20 08:10:26 2012
New Revision: 1340636

URL: http://svn.apache.org/viewvc?rev=1340636&view=rev
Log:
CAMEL-5282: Added unit test

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java
      - copied, changed from r1340635, 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
Modified:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java?rev=1340636&r1=1340635&r2=1340636&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
 Sun May 20 08:10:26 2012
@@ -85,7 +85,7 @@ public class SedaFileIdempotentIssueTest
         assertEquals("No file should be reported consumed", 0, 
repository.getCache().keySet().size());
     }
 
-    private class ShutDown implements Processor {
+    protected class ShutDown implements Processor {
 
         @Override
         public void process(final Exchange exchange) throws Exception {

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java
 (from r1340635, 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java&r1=1340635&r2=1340636&rev=1340636&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentTimeoutIssueTest.java
 Sun May 20 08:10:26 2012
@@ -16,49 +16,12 @@
  */
 package org.apache.camel.issues;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.processor.idempotent.FileIdempotentRepository;
 
 /**
  *
  */
-public class SedaFileIdempotentIssueTest extends ContextTestSupport {
-
-    private final CountDownLatch latch = new CountDownLatch(1);
-    private FileIdempotentRepository repository = new 
FileIdempotentRepository();
-
-    @Override
-    protected void setUp() throws Exception {
-        deleteDirectory("target/inbox");
-        createDirectory("target/inbox");
-
-        // create file without using Camel
-        File file = new File("target/inbox/hello.txt");
-        FileOutputStream fos = new FileOutputStream(file, true);
-        fos.write("Hello World".getBytes());
-        fos.flush();
-        fos.close();
-
-        super.setUp();
-    }
-
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry jndi = super.createRegistry();
-
-        repository.setFileStore(new File("target/repo.txt"));
-        jndi.bind("repo", repository);
-        return jndi;
-    }
+public class SedaFileIdempotentTimeoutIssueTest extends 
SedaFileIdempotentIssueTest {
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
@@ -69,7 +32,7 @@ public class SedaFileIdempotentIssueTest
 
                 
from("file:target/inbox?idempotent=true&noop=true&idempotentRepository=#repo&delay=1000")
                     .to("log:begin")
-                    .inOut("seda:process");
+                    .inOut("seda:process?timeout=100");
 
                 from("seda:process")
                     .delay(1000)
@@ -78,36 +41,4 @@ public class SedaFileIdempotentIssueTest
         };
     }
 
-    public void testRepo() throws Exception {
-        boolean done = latch.await(10, TimeUnit.SECONDS);
-        assertTrue("Should stop Camel", done);
-
-        assertEquals("No file should be reported consumed", 0, 
repository.getCache().keySet().size());
-    }
-
-    private class ShutDown implements Processor {
-
-        @Override
-        public void process(final Exchange exchange) throws Exception {
-            // shutdown route
-            Thread thread = new Thread() {
-                @Override
-                public void run() {
-                    // shutdown camel
-                    try {
-                        log.info("Stopping Camel");
-                        exchange.getContext().stop();
-                        log.info("Stopped Camel complete");
-                        latch.countDown();
-                    } catch (Exception e) {
-                        // ignore
-                        e.printStackTrace();
-                    }
-                }
-            };
-            // start shutdown in a separate thread
-            thread.start();
-        }
-    }
-
 }