diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandler.java index 41f4d9aeba..5f17ae0c5a 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandler.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandler.java @@ -365,7 +365,7 @@ public class RedisCollectionPopulatingMessageHandler extends AbstractMessageHand if (message.getHeaders().containsKey(RedisHeaders.ZSET_INCREMENT_SCORE)){ return this.zsetIncrementScoreExpression.getValue(this.evaluationContext, message, Boolean.class); } - return false; + return true; } @SuppressWarnings("unchecked") diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandlerTests.java index 6ce260c205..f1beda8eb9 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisCollectionPopulatingMessageHandlerTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.integration.redis.outbound; import static org.junit.Assert.assertEquals; @@ -32,6 +47,11 @@ import org.springframework.integration.redis.rules.RedisAvailableTests; import org.springframework.integration.redis.support.RedisHeaders; import org.springframework.integration.support.MessageBuilder; +/** + * @author Oleg Zhurakousky + * @author Gunnar Hillert + * + */ public class RedisCollectionPopulatingMessageHandlerTests extends RedisAvailableTests{ @SuppressWarnings("unchecked") @@ -183,9 +203,9 @@ public class RedisCollectionPopulatingMessageHandlerTests extends RedisAvailable handler.handleMessage(message); assertEquals(3, redisZset.size()); pepboys = redisZset.rangeByScoreWithScores(1, 2); - // should not have incremented + // should have incremented by 1 for (TypedTuple pepboy : pepboys) { - assertTrue(pepboy.getScore() == 1); + assertEquals(Double.valueOf(2), pepboy.getScore()); } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java index 3e643106fa..8abd67ecd7 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ */ package org.springframework.integration.redis.rules; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.rules.MethodRule; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.Statement; @@ -22,10 +24,15 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; /** * @author Oleg Zhurakousky + * @author Gunnar Hillert * */ public final class RedisAvailableRule implements MethodRule{ + private static final Log logger = LogFactory.getLog(RedisAvailableRule.class); + + public static final int REDIS_PORT = 7379; + public Statement apply(final Statement base, final FrameworkMethod method, Object target) { return new Statement(){ @@ -34,19 +41,23 @@ public final class RedisAvailableRule implements MethodRule{ RedisAvailable redisAvailable = method.getAnnotation(RedisAvailable.class); if (redisAvailable != null){ try { + JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); - connectionFactory.setPort(7379); + connectionFactory.setPort(REDIS_PORT); connectionFactory.afterPropertiesSet(); connectionFactory.getConnection(); } catch (Exception e) { - System.out.println("Redis is not available. Skipping the test."); + if (logger.isWarnEnabled()) { + logger.warn(String.format("Redis is not available on " + + "port '%s'. Skipping the test.", REDIS_PORT)); + } return; } } base.evaluate(); - } + } }; - + } }