Author: davsclaus
Date: Mon Dec 5 13:22:29 2011
New Revision: 1210455
URL: http://svn.apache.org/viewvc?rev=1210455&view=rev
Log:
Prefer to delete dir in setup for unit tests.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerInterceptEmptyFileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerTemplateTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollingConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFilenameConstantTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/FilePollingConsumerIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/view/ModelFileGeneratorTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
Mon Dec 5 13:22:29 2011
@@ -40,6 +40,13 @@ import org.apache.camel.util.UnitOfWorkH
*/
public class XsltBuilderTest extends ContextTestSupport {
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/xslt");
+ createDirectory("target/xslt");
+ super.setUp();
+ }
+
public void testXsltUrl() throws Exception {
URL styleSheet = getClass().getResource("example.xsl");
@@ -195,10 +202,6 @@ public class XsltBuilderTest extends Con
}
public void testXsltOutputFile() throws Exception {
- // directory must exists
- deleteDirectory("target/xslt");
- createDirectory("target/xslt");
-
URL styleSheet = getClass().getResource("example.xsl");
XsltBuilder builder = XsltBuilder.xslt(styleSheet).outputFile();
@@ -218,10 +221,6 @@ public class XsltBuilderTest extends Con
}
public void testXsltOutputFileDelete() throws Exception {
- // directory must exists
- deleteDirectory("target/xslt");
- createDirectory("target/xslt");
-
URL styleSheet = getClass().getResource("example.xsl");
XsltBuilder builder =
XsltBuilder.xslt(styleSheet).outputFile().deleteOutputFile();
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
Mon Dec 5 13:22:29 2011
@@ -25,9 +25,13 @@ import org.apache.camel.builder.RouteBui
*/
public class FileConsumeRunLoggingLevelTest extends ContextTestSupport {
- public void testRunLoggingLevel() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/files");
+ super.setUp();
+ }
+ public void testRunLoggingLevel() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
template.sendBodyAndHeader("file:target/files", "Hello World",
Exchange.FILE_NAME, "hello.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
Mon Dec 5 13:22:29 2011
@@ -26,17 +26,23 @@ import org.apache.camel.component.mock.M
*/
public class FileConsumerIncludeAndExcludeNameTest extends ContextTestSupport {
- public void testIncludePreAndPostfixes() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("./target/includeexclude");
- prepareFiles();
+ super.setUp();
+ }
+ public void testIncludePreAndPostfixes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
mock.expectedBodiesReceivedInAnyOrder("Report 2", "Report 3");
+
+ sendFiles();
+
mock.assertIsSatisfied();
}
- private void prepareFiles() throws Exception {
+ private void sendFiles() throws Exception {
String url = "file://target/includeexclude";
template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME,
"hello.txt");
template.sendBodyAndHeader(url, "Report 1", Exchange.FILE_NAME,
"report1.xml");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
Mon Dec 5 13:22:29 2011
@@ -26,17 +26,23 @@ import org.apache.camel.component.mock.M
*/
public class FileConsumerIncludeNameTest extends ContextTestSupport {
- public void testIncludePreAndPostfixes() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("./target/include");
- prepareFiles();
+ super.setUp();
+ }
+ public void testIncludePreAndPostfixes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
mock.expectedBodiesReceived("Reports", "Reports");
+
+ sendFiles();
+
mock.assertIsSatisfied();
}
- private void prepareFiles() throws Exception {
+ private void sendFiles() throws Exception {
String url = "file://target/include";
template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME,
"hello.xml");
template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME,
"report1.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerInterceptEmptyFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerInterceptEmptyFileTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerInterceptEmptyFileTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerInterceptEmptyFileTest.java
Mon Dec 5 13:22:29 2011
@@ -26,21 +26,25 @@ import org.apache.camel.component.mock.M
*/
public class FileConsumerInterceptEmptyFileTest extends ContextTestSupport {
- public void testExcludeZeroLengthFiles() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("./target/exclude");
-
+ super.setUp();
+ }
+
+ public void testExcludeZeroLengthFiles() throws Exception {
MockEndpoint mock1 = getMockEndpoint("mock:result");
mock1.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
MockEndpoint mock2 = getMockEndpoint("mock:skip");
mock2.expectedMessageCount(2);
- prepareFiles();
+ sendFiles();
assertMockEndpointsSatisfied();
}
- private void prepareFiles() throws Exception {
+ private void sendFiles() throws Exception {
String url = "file://target/exclude";
template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME,
"hello.xml");
template.sendBodyAndHeader(url, "", Exchange.FILE_NAME, "empty1.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerTemplateTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerTemplateTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerTemplateTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerTemplateTest.java
Mon Dec 5 13:22:29 2011
@@ -27,12 +27,17 @@ import org.apache.camel.Exchange;
public class FileConsumerTemplateTest extends ContextTestSupport {
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/consumer");
+ super.setUp();
+ }
+
+ @Override
public boolean isUseRouteBuilder() {
return false;
}
public void testFileConsumerTemplate() throws Exception {
- deleteDirectory("target/consumer");
template.sendBodyAndHeader("file:target/consumer", "Hello World",
Exchange.FILE_NAME, "hello.txt");
String body = consumer.receiveBody("file:target/consumer?delete=true",
5000, String.class);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileContentBasedRouterTest.java
Mon Dec 5 13:22:29 2011
@@ -25,15 +25,20 @@ import org.apache.camel.component.mock.M
*/
public class FileContentBasedRouterTest extends ContextTestSupport {
- private void prepareFiles() {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/cbr");
+ super.setUp();
+ }
+
+ private void sendFiles() {
template.sendBodyAndHeader("file://target/cbr", "Hello London",
"CamelFileName", "london.txt");
template.sendBodyAndHeader("file://target/cbr", "Hello Paris",
"CamelFileName", "paris.txt");
template.sendBodyAndHeader("file://target/cbr", "Hello Copenhagen",
"CamelFileName", "copenhagen.txt");
}
public void testRouteLondon() throws Exception {
- prepareFiles();
+ sendFiles();
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
@@ -45,7 +50,7 @@ public class FileContentBasedRouterTest
}
public void testRouteParis() throws Exception {
- prepareFiles();
+ sendFiles();
MockEndpoint mock = getMockEndpoint("mock:paris");
mock.expectedMessageCount(1);
@@ -57,7 +62,7 @@ public class FileContentBasedRouterTest
}
public void testRouteOther() throws Exception {
- prepareFiles();
+ sendFiles();
MockEndpoint mock = getMockEndpoint("mock:other");
mock.expectedMessageCount(1);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java
Mon Dec 5 13:22:29 2011
@@ -29,12 +29,12 @@ public class FileExclusiveReadManuelTest
@Override
protected void setUp() throws Exception {
+ deleteDirectory("./target/exclusiveread");
disableJMX();
super.setUp();
}
public void testManually() throws Exception {
- deleteDirectory("./target/exclusiveread");
MockEndpoint mock = getMockEndpoint("mock:result");
// this is used for manual testing where you can copy/lock files etc.
while this test runs
//mock.setSleepForEmptyTest(10 * 1000L);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollingConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollingConsumerTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollingConsumerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollingConsumerTest.java
Mon Dec 5 13:22:29 2011
@@ -29,12 +29,17 @@ import org.apache.camel.PollingConsumer;
public class FilePollingConsumerTest extends ContextTestSupport {
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/enrich");
+ super.setUp();
+ }
+
+ @Override
public boolean isUseRouteBuilder() {
return false;
}
public void testPollingConsumer() throws Exception {
- deleteDirectory("target/enrich");
template.sendBodyAndHeader("file:target/enrich", "Hello World",
Exchange.FILE_NAME, "hello.txt");
PollingConsumer consumer =
context.getEndpoint("file:target/enrich").createPollingConsumer();
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
Mon Dec 5 13:22:29 2011
@@ -30,6 +30,12 @@ public class FileProduceTempFileNameTest
private String fileUrl =
"file://target/tempandrename/?tempFileName=inprogress-${file:name.noext}.tmp";
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/tempandrename");
+ super.setUp();
+ }
+
public void testCreateTempFileName() throws Exception {
Endpoint endpoint = context.getEndpoint(fileUrl);
GenericFileProducer producer = (GenericFileProducer)
endpoint.createProducer();
@@ -51,8 +57,6 @@ public class FileProduceTempFileNameTest
}
public void testTempFileName() throws Exception {
- deleteDirectory("target/tempandrename");
-
template.sendBodyAndHeader("direct:a", "Hello World",
Exchange.FILE_NAME, "hello.txt");
File file = new File("target/tempandrename/hello.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
Mon Dec 5 13:22:29 2011
@@ -30,6 +30,12 @@ public class FileProduceTempPrefixTest e
private String fileUrl =
"file://target/tempandrename/?tempPrefix=inprogress.";
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/tempandrename");
+ super.setUp();
+ }
+
public void testCreateTempFileName() throws Exception {
Endpoint endpoint = context.getEndpoint(fileUrl);
GenericFileProducer producer = (GenericFileProducer)
endpoint.createProducer();
@@ -61,8 +67,6 @@ public class FileProduceTempPrefixTest e
}
public void testTempPrefix() throws Exception {
- deleteDirectory("target/tempandrename");
-
template.sendBodyAndHeader("direct:a", "Hello World",
Exchange.FILE_NAME, "hello.txt");
File file = new File("target/tempandrename/hello.txt");
@@ -72,8 +76,6 @@ public class FileProduceTempPrefixTest e
}
public void testTempPrefixUUIDFilename() throws Exception {
- deleteDirectory("target/tempandrename");
-
template.sendBody("direct:a", "Bye World");
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFilenameConstantTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFilenameConstantTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFilenameConstantTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFilenameConstantTest.java
Mon Dec 5 13:22:29 2011
@@ -25,9 +25,13 @@ import org.apache.camel.ContextTestSuppo
*/
public class FileProducerFilenameConstantTest extends ContextTestSupport {
- public void testFileProducerFilenameConstant() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/constant");
+ super.setUp();
+ }
+ public void testFileProducerFilenameConstant() throws Exception {
template.sendBody("file://target/constant?fileName=header.txt", "Hello
World");
File file = new File("./target/constant/header.txt").getAbsoluteFile();
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
Mon Dec 5 13:22:29 2011
@@ -28,6 +28,12 @@ import org.apache.camel.Exchange;
public class FileProducerTempFileExistsIssueTest extends ContextTestSupport {
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/tempprefix");
+ super.setUp();
+ }
+
+ @Override
public boolean isUseRouteBuilder() {
return false;
}
@@ -41,8 +47,6 @@ public class FileProducerTempFileExistsI
}
public void testWriteUsingTempPrefixButFileExist() throws Exception {
- deleteDirectory("target/tempprefix");
-
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo",
"Bye World", Exchange.FILE_NAME, "hello.txt");
@@ -52,8 +56,6 @@ public class FileProducerTempFileExistsI
}
public void testWriteUsingTempPrefixButBothFileExist() throws Exception {
- deleteDirectory("target/tempprefix");
-
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "foohello.txt");
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo",
"Bye World", Exchange.FILE_NAME, "hello.txt");
@@ -64,8 +66,6 @@ public class FileProducerTempFileExistsI
}
public void testWriteUsingTempPrefixButFileExistOverride() throws
Exception {
- deleteDirectory("target/tempprefix");
-
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo&fileExist=Override",
"Bye World", Exchange.FILE_NAME, "hello.txt");
@@ -75,8 +75,6 @@ public class FileProducerTempFileExistsI
}
public void testWriteUsingTempPrefixButFileExistIgnore() throws Exception {
- deleteDirectory("target/tempprefix");
-
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo&fileExist=Ignore",
"Bye World", Exchange.FILE_NAME, "hello.txt");
@@ -87,8 +85,6 @@ public class FileProducerTempFileExistsI
}
public void testWriteUsingTempPrefixButFileExistFail() throws Exception {
- deleteDirectory("target/tempprefix");
-
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
try {
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo&fileExist=Fail",
"Bye World", Exchange.FILE_NAME, "hello.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
Mon Dec 5 13:22:29 2011
@@ -35,13 +35,17 @@ public class NewFileConsumeTest extends
private CountDownLatch latch = new CountDownLatch(1);
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/consumefile");
+ super.setUp();
+ }
+
+ @Override
public boolean isUseRouteBuilder() {
return false;
}
public void testNewFileConsumer() throws Exception {
- deleteDirectory("target/consumefile");
-
FileComponent comp = new FileComponent();
comp.setCamelContext(context);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java
Mon Dec 5 13:22:29 2011
@@ -29,13 +29,17 @@ import org.apache.camel.Processor;
public class NewFileProduceTest extends ContextTestSupport {
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/producefile");
+ super.setUp();
+ }
+
+ @Override
public boolean isUseRouteBuilder() {
return false;
}
public void testNewFileProducer() throws Exception {
- deleteDirectory("target/producefile");
-
FileComponent comp = new FileComponent();
comp.setCamelContext(context);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
Mon Dec 5 13:22:29 2011
@@ -32,10 +32,14 @@ public class FileChangedReadLockTest ext
private static final transient Logger LOG =
LoggerFactory.getLogger(FileChangedReadLockTest.class);
- public void testChangedReadLock() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/changed/");
createDirectory("target/changed/in");
+ super.setUp();
+ }
+ public void testChangedReadLock() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedFileExists("target/changed/out/slowfile.dat");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
Mon Dec 5 13:22:29 2011
@@ -37,10 +37,14 @@ public class MarkerFileExclusiveReadLock
private static final int NUMBER_OF_THREADS = 5;
private AtomicInteger numberOfFilesProcessed = new AtomicInteger(0);
- public void testMultithreadedLocking() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/marker/");
createDirectory("target/marker/in");
+ super.setUp();
+ }
+ public void testMultithreadedLocking() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
mock.expectedFileExists("target/marker/out/file1.dat");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
Mon Dec 5 13:22:29 2011
@@ -28,13 +28,17 @@ import org.apache.camel.ContextTestSuppo
public class PropertiesComponentLoadPropertiesFromFileTrimValuesTest extends
ContextTestSupport {
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/space");
+ createDirectory("target/space");
+ super.setUp();
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
// create space.properties file
- deleteDirectory("target/space");
- createDirectory("target/space");
-
File file = new File("target/space/space.properties");
file.createNewFile();
FileOutputStream fos = new FileOutputStream(file);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/FileSedaShutdownCompleteAllTasksTest.java
Mon Dec 5 13:22:29 2011
@@ -27,9 +27,13 @@ import org.apache.camel.component.mock.M
*/
public class FileSedaShutdownCompleteAllTasksTest extends ContextTestSupport {
- public void testShutdownCompleteAllTasks() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/seda");
+ super.setUp();
+ }
+ public void testShutdownCompleteAllTasks() throws Exception {
final String url = "file:target/seda";
template.sendBodyAndHeader(url, "A", Exchange.FILE_NAME, "a.txt");
template.sendBodyAndHeader(url, "B", Exchange.FILE_NAME, "b.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
Mon Dec 5 13:22:29 2011
@@ -46,6 +46,12 @@ import org.apache.camel.impl.DefaultExch
*/
public class XmlConverterTest extends ContextTestSupport {
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/xml");
+ super.setUp();
+ }
+
public void testToResultNoSource() throws Exception {
XmlConverter conv = new XmlConverter();
conv.toResult(null, null);
@@ -186,7 +192,6 @@ public class XmlConverterTest extends Co
public void testToSaxSourceFromFile() throws Exception {
XmlConverter conv = new XmlConverter();
- deleteDirectory("target/xml");
template.sendBodyAndHeader("file:target/xml", "<foo>bar</foo>",
Exchange.FILE_NAME, "myxml.xml");
File file = new File("target/xml/myxml.xml");
@@ -197,7 +202,6 @@ public class XmlConverterTest extends Co
public void testToStAXSourceFromFile() throws Exception {
XmlConverter conv = new XmlConverter();
- deleteDirectory("target/xml");
template.sendBodyAndHeader("file:target/xml", "<foo>bar</foo>",
Exchange.FILE_NAME, "myxml.xml");
File file = new File("target/xml/myxml.xml");
@@ -386,7 +390,6 @@ public class XmlConverterTest extends Co
public void testToDomSourceFromFile() throws Exception {
XmlConverter conv = new XmlConverter();
- deleteDirectory("target/xml");
template.sendBodyAndHeader("file:target/xml", "<foo>bar</foo>",
Exchange.FILE_NAME, "myxml.xml");
File file = new File("target/xml/myxml.xml");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/FilePollingConsumerIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/FilePollingConsumerIssueTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/FilePollingConsumerIssueTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/FilePollingConsumerIssueTest.java
Mon Dec 5 13:22:29 2011
@@ -26,8 +26,13 @@ import org.apache.camel.PollingConsumer;
*/
public class FilePollingConsumerIssueTest extends ContextTestSupport {
- public void testFilePollingConsumer() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/fpc");
+ super.setUp();
+ }
+
+ public void testFilePollingConsumer() throws Exception {
template.sendBodyAndHeader("file://target/fpc", "Hello World",
Exchange.FILE_NAME, "hello.txt");
Endpoint endpoint =
context.getEndpoint("file://target/fpc?fileName=hello.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
Mon Dec 5 13:22:29 2011
@@ -32,9 +32,13 @@ import org.apache.camel.impl.RoutePolicy
*/
public class ManagedSuspendedServiceTest extends ManagementTestSupport {
- public void testConsumeSuspendAndResumeFile() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/suspended");
+ super.setUp();
+ }
+ public void testConsumeSuspendAndResumeFile() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new
ObjectName("*:type=consumers,*"), null);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/view/ModelFileGeneratorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/view/ModelFileGeneratorTest.java?rev=1210455&r1=1210454&r2=1210455&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/view/ModelFileGeneratorTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/view/ModelFileGeneratorTest.java
Mon Dec 5 13:22:29 2011
@@ -28,9 +28,13 @@ import org.apache.camel.builder.RouteBui
public class ModelFileGeneratorTest extends ContextTestSupport {
protected String outputDirectory = "target/site/model";
- public void testGenerateModel() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory(outputDirectory);
+ super.setUp();
+ }
+ public void testGenerateModel() throws Exception {
try {
ModelFileGenerator generator = new
ModelFileGenerator(JAXBContext.newInstance("org.apache.camel.model"));
generator.marshalRoutesUsingJaxb(outputDirectory + "/route.xml",
context.getRouteDefinitions());
