Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some latest test failures

Browse Source 
https://build.spring.io/browse/INT-B43-164/

* Fix CheckStyle for `System. out .println(` expression commenting out such a code line
* Fix generics in the `JdbcMessageStoreTests`
* Increase receive timeout in the `FileMessageHistoryTests`
* Change the `AsyncAmqpGatewayTests` logic to deal with the same channel for both `ack/nack`.
The `timeout` case without reply may end up with the `Consumer cancel`, therefore `nack` not `ack` like we expected
This commit is contained in:
Artem Bilan
2016-04-21 19:03:35 -04:00
parent 286c421c1a
commit cfdfa62745
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java
View File

@@ -30,7 +30,6 @@ import java.util.Properties;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.test.util.TestUtils;
@@ -41,13 +40,16 @@ import org.springframework.messaging.PollableChannel;
* @author Oleg Zhurakousky
* @author Iwein Fuld
* @author Gunnar Hillert
* @author Artem Bilan
*/
public class FileMessageHistoryTests {
@Test
public void testMessageHistory() throws Exception {
ApplicationContext context = new ClassPathXmlApplicationContext("file-message-history-context.xml", this.getClass());
ClassPathXmlApplicationContext context =
new ClassPathXmlApplicationContext("file-message-history-context.xml", getClass());
TemporaryFolder input = context.getBean(TemporaryFolder.class);
File file = input.newFile("FileMessageHistoryTest.txt");
BufferedWriter out = new BufferedWriter(new FileWriter(file));
@@ -55,12 +57,15 @@ public class FileMessageHistoryTests {
out.close();
PollableChannel outChannel = context.getBean("outChannel", PollableChannel.class);
Message<?> message = outChannel.receive(1000);
Message<?> message = outChannel.receive(10000);
assertThat(message, is(notNullValue()));
MessageHistory history = MessageHistory.read(message);
assertThat(history, is(notNullValue()));
Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "fileAdapter", 0);
assertNotNull(componentHistoryRecord);
assertEquals("file:inbound-channel-adapter", componentHistoryRecord.get("type"));
context.close();
}
}