From ef29d6b2a2d882621cb8d3284f8b722d40f8a17a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 1 Feb 2013 18:58:27 -0500 Subject: [PATCH] INT-2913 Fix Looping Mail Tests Causes excessive CPU utilization and OOM Errors with Gradle 1.4 (and 1.2 on some platforms). Stop adapters when tests complete. --- .../integration/mail/ImapMailReceiverTests.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java index 2562ab0409..1e1817cbbc 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java @@ -28,17 +28,14 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.Field; import java.util.Properties; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.concurrent.ExecutorService; -import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.mail.BodyPart; import javax.mail.Flags; import javax.mail.Flags.Flag; import javax.mail.Folder; @@ -345,6 +342,7 @@ public class ImapMailReceiverTests { Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "simpleAdapter", 0); assertNotNull(componentHistoryRecord); assertEquals("mail:imap-idle-channel-adapter", componentHistoryRecord.get("type")); + adapter.stop(); } @Test @@ -414,6 +412,7 @@ public class ImapMailReceiverTests { org.springframework.integration.Message replMessage = errorChannel.receive(10000); assertNotNull(replMessage); assertEquals("Failed", ((Exception) replMessage.getPayload()).getCause().getMessage()); + adapter.stop(); } @Test @@ -497,6 +496,7 @@ public class ImapMailReceiverTests { // We should not receive any more until the next idle elapses assertNull(channel.receive(3000)); assertNotNull(channel.receive(6000)); + adapter.stop(); } @Test @@ -568,6 +568,7 @@ public class ImapMailReceiverTests { assertNull(channel.receive(3000)); assertNotNull(channel.receive(5000)); assertTrue(idles.await(5, TimeUnit.SECONDS)); + adapter.stop(); } @Test // see INT-1801