From 7084270d4e555928a1504be1d5357aa7b6f45721 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 19 Sep 2016 12:33:12 -0400 Subject: [PATCH] Upgrade to SF-4.3.3 and some timing fixes Also upgrade to SA-1.6.2 and Retry-1.1.3 --- build.gradle | 6 ++--- .../RedisQueueMessageDrivenEndpointTests.java | 26 +++++++++---------- ...hReceivingMessageSourceWithRedisTests.java | 8 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 0ddeca18b6..6a3ef123b4 100644 --- a/build.gradle +++ b/build.gradle @@ -129,15 +129,15 @@ subprojects { subproject -> slf4jVersion = "1.7.21" tomcatVersion = "8.0.33" smackVersion = '4.1.7' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.1.RELEASE' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.2.RELEASE' springDataJpaVersion = '1.10.1.RELEASE' springDataMongoVersion = '1.9.1.RELEASE' springDataRedisVersion = '1.7.1.RELEASE' springGemfireVersion = '1.8.1.RELEASE' springSecurityVersion = '4.1.0.RELEASE' springSocialTwitterVersion = '1.1.2.RELEASE' - springRetryVersion = '1.1.2.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.2.RELEASE' + springRetryVersion = '1.1.3.RELEASE' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.3.RELEASE' springWsVersion = '2.3.0.RELEASE' xmlUnitVersion = '1.6' xstreamVersion = '1.4.7' diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java index a9aaffb30f..96a957ae32 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java @@ -121,15 +121,15 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { new RedisQueueMessageDrivenEndpoint(queueName, this.connectionFactory); endpoint.setBeanFactory(Mockito.mock(BeanFactory.class)); endpoint.setOutputChannel(channel); - endpoint.setReceiveTimeout(1000); + endpoint.setReceiveTimeout(10000); endpoint.afterPropertiesSet(); endpoint.start(); - Message receive = (Message) channel.receive(2000); + Message receive = (Message) channel.receive(10000); assertNotNull(receive); assertEquals(payload, receive.getPayload()); - receive = (Message) channel.receive(2000); + receive = (Message) channel.receive(10000); assertNotNull(receive); assertEquals(payload2, receive.getPayload()); @@ -166,16 +166,16 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { endpoint.setExpectMessage(true); endpoint.setOutputChannel(channel); endpoint.setErrorChannel(errorChannel); - endpoint.setReceiveTimeout(1000); + endpoint.setReceiveTimeout(10000); endpoint.afterPropertiesSet(); endpoint.start(); - Message receive = (Message) channel.receive(2000); + Message receive = (Message) channel.receive(10000); assertNotNull(receive); assertEquals(message, receive); - receive = (Message) errorChannel.receive(2000); + receive = (Message) errorChannel.receive(10000); assertNotNull(receive); assertThat(receive, Matchers.instanceOf(ErrorMessage.class)); assertThat(receive.getPayload(), Matchers.instanceOf(MessagingException.class)); @@ -201,7 +201,7 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { redisTemplate.boundListOps("si.test.Int3017IntegrationInbound") .leftPush("{\"payload\":\"" + payload + "\",\"headers\":{}}"); - Message receive = this.fromChannel.receive(2000); + Message receive = this.fromChannel.receive(10000); assertNotNull(receive); assertEquals(payload, receive.getPayload()); } @@ -216,7 +216,7 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { this.symmetricalInputChannel.send(message); - Message receive = this.symmetricalOutputChannel.receive(2000); + Message receive = this.symmetricalOutputChannel.receive(10000); assertNotNull(receive); assertEquals(payload, receive.getPayload()); } @@ -247,7 +247,7 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { dfa.setPropertyValue("boundListOperations", boundListOperations); endpoint.setBeanFactory(Mockito.mock(BeanFactory.class)); endpoint.setOutputChannel(new DirectChannel()); - endpoint.setReceiveTimeout(1000); + endpoint.setReceiveTimeout(10000); ExecutorService executorService = Executors.newCachedThreadPool(); endpoint.setTaskExecutor(executorService); @@ -340,7 +340,7 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { redisTemplate.boundListOps(queueName).leftPush(payload); - Message receive = channel.receive(1000); + Message receive = channel.receive(10000); assertNotNull(receive); assertEquals(payload, receive.getPayload()); @@ -375,16 +375,16 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { new RedisQueueMessageDrivenEndpoint(queueName, this.connectionFactory); endpoint.setBeanFactory(Mockito.mock(BeanFactory.class)); endpoint.setOutputChannel(channel); - endpoint.setReceiveTimeout(1000); + endpoint.setReceiveTimeout(10000); endpoint.setRightPop(false); endpoint.afterPropertiesSet(); endpoint.start(); - Message receive = (Message) channel.receive(2000); + Message receive = (Message) channel.receive(10000); assertNotNull(receive); assertEquals(payload, receive.getPayload()); - receive = (Message) channel.receive(2000); + receive = (Message) channel.receive(10000); assertNotNull(receive); assertEquals(payload2, receive.getPayload()); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java index 9a0f89925b..140db861e4 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java @@ -109,8 +109,8 @@ public class SearchReceivingMessageSourceWithRedisTests extends RedisAvailableTe this.twitterSearchAdapter.start(); assertNotNull(this.tweets.receive(10000)); - assertNotNull(this.tweets.receive(1000)); - assertNotNull(this.tweets.receive(1000)); + assertNotNull(this.tweets.receive(10000)); + assertNotNull(this.tweets.receive(10000)); /* We received 3 messages so far. When invoking receive() again the search * will return again the 3 test Tweets but as we already processed them @@ -129,8 +129,8 @@ public class SearchReceivingMessageSourceWithRedisTests extends RedisAvailableTe this.twitterSearchAdapter.start(); - assertNotNull(this.tweets.receive(1000)); - assertNotNull(this.tweets.receive(1000)); + assertNotNull(this.tweets.receive(10000)); + assertNotNull(this.tweets.receive(10000)); assertNull(this.tweets.receive(0));