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/15 15:31:54 UTC
svn commit: r584784 - in
/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel: ./
component/file/
Author: jstrachan
Date: Mon Oct 15 06:31:53 2007
New Revision: 584784
URL: http://svn.apache.org/viewvc?rev=584784&view=rev
Log:
fixed up some intermittently failing test cases due to accidental reuse of directory names
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/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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -248,7 +248,21 @@
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();
@@ -258,4 +272,5 @@
}
file.delete();
}
+
}
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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -39,6 +39,12 @@
AtomicReference<File> file = new AtomicReference<File>();
@Override
+ protected void setUp() throws Exception {
+ recursiveDelete("target/test-async-inbox");
+ super.setUp();
+ }
+
+ @Override
protected void tearDown() throws Exception {
processingLatch.countDown();
receivedLatch.countDown();
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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -33,6 +33,12 @@
}
@Override
+ protected void setUp() throws Exception {
+ recursiveDelete("target/test-consumer-produer-inbox");
+ super.setUp();
+ }
+
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -22,7 +22,8 @@
public class FileDeleteRouteTest extends FileRouteTest {
@Override
protected void setUp() throws Exception {
- uri = "file:target/test-rename-inbox?delete=true";
+ uri = "file:target/test-delete-inbox?delete=true";
+ recursiveDelete("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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -25,17 +25,7 @@
@Override
protected void setUp() throws Exception {
uri = "file:target/test-noop-inbox?noop=true";
-
- // lets delete all the files
- File oldDir = new File("target/test-noop-inbox");
- if (oldDir.exists()) {
- File parentDir = oldDir.getParentFile();
- File[] files = parentDir.listFiles();
- File newName = new File(parentDir, oldDir.getName() + "-" + (files.length + 1));
- log.debug("renaming old output: " + oldDir + " to: " + newName);
- oldDir.renameTo(newName);
- }
-
+ recursiveDelete("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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -24,7 +24,7 @@
public class FileRenameRouteTest extends FileRouteTest {
@Override
protected void setUp() throws Exception {
- recursiveDelete(new File("target/test-rename-inbox"));
+ recursiveDelete("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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -26,7 +26,7 @@
*/
public class FileRouteGenerateEmptyExchangeWhenIdleTest extends ContextTestSupport {
protected Object expectedBody = "Hello there!";
- protected String uri = "file:target/test-default-inbox?consumer.generateEmptyExchangeWhenIdle=true";
+ protected String uri = "file:target/test-inbox2?consumer.generateEmptyExchangeWhenIdle=true";
public void testFileRoute() throws Exception {
MockEndpoint result = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
@@ -52,6 +52,12 @@
assertEquals(1, fileCount);
assertTrue( nullCount > 0 );
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ recursiveDelete("target/test-inbox2");
+ super.setUp();
}
@Override
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=584784&r1=584783&r2=584784&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 Mon Oct 15 06:31:53 2007
@@ -16,6 +16,8 @@
*/
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;
@@ -35,6 +37,12 @@
template.sendBodyAndHeader(uri, expectedBody, "cheese", 123);
result.assertIsSatisfied();
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ recursiveDelete("target/test-default-inbox");
+ super.setUp();
}
@Override