Merge pull request spring-projects#84 from ghillert/INTSAMPLES-102-2

INTSAMPLES-102 - Fix intermittently failing tests
supermeng · Jan 11, 2013 · 9759373 · 9759373
2 parents 7928871 + f6e4f4d
commit 9759373
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/...c/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/...c/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java
@@ -38,11 +38,14 @@
 
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.support.converter.SimpleMessageConverter;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
 public class JmsMockTests {
 
 	private static final Logger LOGGER = Logger.getLogger(JmsMockTests.class);

diff --git a/...est/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/...est/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
@@ -22,7 +22,7 @@
 import java.net.UnknownHostException;
 
 import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
@@ -38,7 +38,7 @@ public class FtpOutboundChannelAdapterSample {
 
 	@Test
 	public void runDemo() throws Exception{
-		ApplicationContext ctx =
+		ConfigurableApplicationContext ctx =
 			new ClassPathXmlApplicationContext("META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml");
 		MessageChannel channel = ctx.getBean("toDynRouter", MessageChannel.class);
 		File file = File.createTempFile("temp", "txt");
@@ -89,5 +89,7 @@ public void runDemo() throws Exception{
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
 			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
 		}
+
+		ctx.close();
 	}
 }
diff --git a/...test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java b/...test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java
@@ -54,6 +54,7 @@ public void runDemo() throws Exception{
 		assertNotNull(message2);
 		assertNull("Was NOT expecting a third message.", message3);
 
+		ctx.close();
 	}
 
 }
diff --git a/...p/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java b/...p/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java
@@ -66,6 +66,7 @@ public void testLsGetRm() throws Exception {
 
 		assertTrue("Expected FTP remote directory to be empty",  new File(TestSuite.FTP_ROOT_DIR).delete());
 
+		ctx.close();
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,7 @@ public void testLsGetRm() throws Exception { @@
     		assertTrue("Expected FTP remote directory to be empty",  new File(TestSuite.FTP_ROOT_DIR).delete());
+    		ctx.close();
     	}
     }