From 12b293c1c7f3cfe93bb6a1fbb1b9f3feaacd884e Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 6 Jul 2012 12:36:45 -0400 Subject: [PATCH] INTSAMPLES-82 Fix Exception --- .../samples/ftp/FtpInboundChannelAdapterSample.java | 7 ------- .../integration/samples/ftp/FtpOutboundGatewaySample.java | 7 ------- .../springframework/integration/samples/ftp/TestSuite.java | 1 + 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java index e350f270..b021463f 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java @@ -18,10 +18,7 @@ package org.springframework.integration.samples.ftp; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.io.File; import org.apache.log4j.Logger; -import org.apache.commons.io.FileUtils; -import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -59,8 +56,4 @@ public class FtpInboundChannelAdapterSample { } - @After - public void cleanup() { - FileUtils.deleteQuietly(new File(TestSuite.LOCAL_FTP_TEMP_DIR)); - } } diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java index b6f421fe..703d5241 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java @@ -21,8 +21,6 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.util.List; -import org.apache.commons.io.FileUtils; -import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -70,9 +68,4 @@ public class FtpOutboundGatewaySample { } - @After - public void cleanup() { - FileUtils.deleteQuietly(new File(TestSuite.LOCAL_FTP_TEMP_DIR)); - } - } \ No newline at end of file diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java index a8610552..1e64842f 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java @@ -82,6 +82,7 @@ public class TestSuite { public static void shutDown() { server.stop(); FileUtils.deleteQuietly(new File(FTP_ROOT_DIR)); + FileUtils.deleteQuietly(new File(LOCAL_FTP_TEMP_DIR)); } }