INT-1257, added tests and minor modification to support MessageHistory in MAIL, JDBC, IP, HTTP modules

spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java

@@ -15,12 +15,18 @@
  */
 package org.springframework.integration.mail;
 
-import java.util.ArrayList;
-import java.util.List;
+import static junit.framework.Assert.assertTrue;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import javax.mail.Flags;
+import javax.mail.Flags.Flag;
 import javax.mail.Folder;
 import javax.mail.Message;
-import javax.mail.Flags.Flag;
 import javax.mail.internet.MimeMessage;
 
 import org.junit.Test;
@@ -28,14 +34,13 @@ import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.history.MessageHistory;
+import org.springframework.integration.mail.config.ImapIdleChannelAdapterParserTests;
 
-import static junit.framework.Assert.assertEquals;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import com.sun.mail.imap.IMAPFolder;
 
 /**
  * @author Oleg Zhurakousky
@@ -188,4 +193,50 @@ public class ImapMailReceiverTests {
 		verify(msg2, times(1)).setFlag(Flag.SEEN, true);
 		verify(receiver, times(0)).deleteMessages((Message[]) Mockito.any());
 	}
+	@Test
+	public void testMessageHistory() throws Exception{
+		ApplicationContext context = 
+			new ClassPathXmlApplicationContext("ImapIdleChannelAdapterParserTests-context.xml", ImapIdleChannelAdapterParserTests.class);
+		ImapIdleChannelAdapter adapter = context.getBean("simpleAdapter", ImapIdleChannelAdapter.class);
+		
+		AbstractMailReceiver receiver = new ImapMailReceiver();
+		receiver = spy(receiver);
+		receiver.afterPropertiesSet();
+		DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
+		adapterAccessor.setPropertyValue("mailReceiver", receiver);
+	
+		MimeMessage mailMessage = mock(MimeMessage.class);
+		Flags flags = mock(Flags.class);
+		when(mailMessage.getFlags()).thenReturn(flags);
+		final Message[] messages = new Message[]{mailMessage};
+		
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				DirectFieldAccessor accesor = new DirectFieldAccessor((invocation.getMock()));
+                IMAPFolder folder = mock(IMAPFolder.class);
+				accesor.setPropertyValue("folder", folder);
+				when(folder.hasNewMessages()).thenReturn(true);
+				return null;
+			}
+		}).when(receiver).openFolder();
+		
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				return messages;
+			}
+		}).when(receiver).searchForNewMessages();
+		
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				return null;
+			}
+		}).when(receiver).fetchMessages(messages);
+		
+		PollableChannel channel = context.getBean("channel", PollableChannel.class);
+
+		adapter.start();
+		org.springframework.integration.Message<?> replMessage = channel.receive(10000);
+		MessageHistory history = MessageHistory.read(replMessage);
+		assertTrue(history.containsComponent("simpleAdapter"));
+	}
 }

spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml

@@ -15,9 +15,11 @@
 			http://www.springframework.org/schema/util
 			http://www.springframework.org/schema/util/spring-util.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
+			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 			http://www.springframework.org/schema/integration/mail
 			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
+	
+	<integration:message-history/>
 
 	<context:property-placeholder properties-ref="configProperties"/>
 
@@ -25,7 +27,9 @@
 		<prop key="mail.delete">false</prop>
 	</util:properties>
 
-	<integration:channel id="channel"/>
+	<integration:channel id="channel">
+		<integration:queue/>
+	</integration:channel>
 
 	<mail:imap-idle-channel-adapter id="simpleAdapter"
 			store-uri="imap:foo"

spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java

@@ -26,7 +26,6 @@ import javax.mail.URLName;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -125,5 +124,4 @@ public class ImapIdleChannelAdapterParserTests {
 		assertEquals("bar", properties.getProperty("foo"));
 		assertEquals(Boolean.FALSE, receiverAccessor.getPropertyValue("shouldDeleteMessages"));
 	}
-
 }