You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/10/31 15:36:01 UTC
svn commit: r590682 - in
/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel: ./
component/file/
Author: jstrachan
Date: Wed Oct 31 07:35:59 2007
New Revision: 590682
URL: http://svn.apache.org/viewvc?rev=590682&view=rev
Log:
adding a test case for this issue - and a minor refactor: http://www.nabble.com/Problem-with-concurrent-dir-file-access--tf4724448s22882.html#a13507397
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java (with props)
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Wed Oct 31 07:35:59 2007
@@ -248,29 +248,4 @@
protected void assertValidContext(CamelContext context) {
assertNotNull("No context found!", context);
}
-
- /**
- * Recursively delete a directory, useful to zapping test data
- *
- * @param file the directory to be deleted
- */
- protected static void recursiveDelete(String file) {
- recursiveDelete(new File(file));
- }
-
- /**
- * Recursively delete a directory, useful to zapping test data
- *
- * @param file the directory to be deleted
- */
- protected static void recursiveDelete(File file) {
- if (file.isDirectory()) {
- File[] files = file.listFiles();
- for (int i = 0; i < files.length; i++) {
- recursiveDelete(files[i]);
- }
- }
- file.delete();
- }
-
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Wed Oct 31 07:35:59 2007
@@ -17,6 +17,7 @@
package org.apache.camel;
import java.util.List;
+import java.io.File;
import junit.framework.TestCase;
@@ -317,4 +318,27 @@
}
}
+ /**
+ * Recursively delete a directory, useful to zapping test data
+ *
+ * @param file the directory to be deleted
+ */
+ protected static void deleteDirectory(String file) {
+ deleteDirectory(new File(file));
+ }
+
+ /**
+ * Recursively delete a directory, useful to zapping test data
+ *
+ * @param file the directory to be deleted
+ */
+ protected static void deleteDirectory(File file) {
+ if (file.isDirectory()) {
+ File[] files = file.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ deleteDirectory(files[i]);
+ }
+ }
+ file.delete();
+ }
}
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java?rev=590682&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java Wed Oct 31 07:35:59 2007
@@ -0,0 +1,100 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import java.io.File;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelTemplate;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.TestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+/**
+ * @author Albert Moraal
+ * @version $Revision: 1.1 $
+ */
+public class DirectoryCreateIssueTest extends TestSupport {
+ private static final Logger log = Logger.getLogger(DirectoryCreateIssueTest.class);
+ private CamelContext context;
+ private CamelTemplate template;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.DEBUG);
+ context = new DefaultCamelContext();
+ context.start();
+ template = new CamelTemplate(context);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ context.stop();
+ super.tearDown();
+ }
+
+ public void testFileCreatedAsDir() throws Exception {
+ log.debug("testFileCreatedAsDir");
+ final String path = "a/b/c/d/e/f/g/h";
+ final int numFiles = 10;
+
+ context.addRoutes(
+ new RouteBuilder() {
+ @Override
+ public void configure() {
+ String[] destinations = new String[numFiles];
+ for (int i = 0; i < numFiles; i++) {
+ destinations[i] = "seda:file" + i;
+
+ from("seda:file" + i)
+ .setHeader(FileComponent.HEADER_FILE_NAME,
+ constant("file" + i + ".txt"))
+ .to("file://" + path + "/?append=false&noop=true");
+ }
+
+ from("seda:testFileCreatedAsDir")
+ .to(destinations);
+ }
+ }
+ );
+
+ deleteDirectory(new File("a"));
+
+ template.send("seda:testFileCreatedAsDir", new Processor() {
+ public void process(Exchange exchange) {
+ Message in = exchange.getIn();
+ in.setBody("Contents of test file");
+ }
+ });
+
+ Thread.sleep(2 * 1000);
+ for (int i = 0; i < numFiles; i++) {
+ assertTrue((new File(path + "/file" + i + ".txt")).isFile());
+ }
+ }
+}
+
+
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java Wed Oct 31 07:35:59 2007
@@ -40,7 +40,7 @@
@Override
protected void setUp() throws Exception {
- recursiveDelete("target/test-async-inbox");
+ deleteDirectory("target/test-async-inbox");
super.setUp();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java Wed Oct 31 07:35:59 2007
@@ -34,7 +34,7 @@
@Override
protected void setUp() throws Exception {
- recursiveDelete("target/test-consumer-produer-inbox");
+ deleteDirectory("target/test-consumer-produer-inbox");
super.setUp();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java Wed Oct 31 07:35:59 2007
@@ -23,7 +23,7 @@
@Override
protected void setUp() throws Exception {
uri = "file:target/test-delete-inbox?delete=true";
- recursiveDelete("target/test-delete-inbox");
+ deleteDirectory("target/test-delete-inbox");
super.setUp();
}
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java Wed Oct 31 07:35:59 2007
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.file;
-import java.io.File;
-
/**
* @version $Revision: 1.1 $
*/
@@ -25,7 +23,7 @@
@Override
protected void setUp() throws Exception {
uri = "file:target/test-noop-inbox?noop=true";
- recursiveDelete("target/test-noop-inbox");
+ deleteDirectory("target/test-noop-inbox");
super.setUp();
}
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java Wed Oct 31 07:35:59 2007
@@ -16,15 +16,13 @@
*/
package org.apache.camel.component.file;
-import java.io.File;
-
/**
* @version $Revision: 1.1 $
*/
public class FileRenameRouteTest extends FileRouteTest {
@Override
protected void setUp() throws Exception {
- recursiveDelete("target/test-rename-inbox");
+ deleteDirectory("target/test-rename-inbox");
uri = "file:target/test-rename-inbox?moveNamePrefix=foo/";
super.setUp();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java Wed Oct 31 07:35:59 2007
@@ -56,7 +56,7 @@
@Override
protected void setUp() throws Exception {
- recursiveDelete("target/test-inbox2");
+ deleteDirectory("target/test-inbox2");
super.setUp();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java?rev=590682&r1=590681&r2=590682&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java Wed Oct 31 07:35:59 2007
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.file;
-import java.io.File;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -41,7 +39,7 @@
@Override
protected void setUp() throws Exception {
- recursiveDelete("target/test-default-inbox");
+ deleteDirectory("target/test-default-inbox");
super.setUp();
}