DATAREDIS-77

+ improved method detection

src/test/java/org/springframework/data/redis/listener/PubSubTests.java

@@ -15,7 +15,8 @@
  */
 package org.springframework.data.redis.listener;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -34,8 +35,6 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.springframework.data.redis.ConnectionFactoryTracker;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.listener.ChannelTopic;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 import org.springframework.data.redis.support.collections.ObjectFactory;
 
@@ -56,7 +55,7 @@ public class PubSubTests<T> {
 	private final BlockingDeque<String> bag = new LinkedBlockingDeque<String>(99);
 
 	private final Object handler = new Object() {
-		void handleMessage(String message) {
+		public void handleMessage(String message) {
 			bag.add(message);
 		}
 	};
@@ -66,6 +65,7 @@ public class PubSubTests<T> {
 	@Before
 	public void setUp() throws Exception {
 		adapter.setSerializer(template.getValueSerializer());
+		adapter.afterPropertiesSet();
 
 		container = new RedisMessageListenerContainer();
 		container.setConnectionFactory(template.getConnectionFactory());

src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java

@@ -15,8 +15,10 @@
  */
 package org.springframework.data.redis.listener.adapter;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -25,7 +27,6 @@ import org.mockito.MockitoAnnotations;
 import org.springframework.data.redis.connection.DefaultMessage;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
@@ -97,6 +98,7 @@ public class MessageListenerTest {
 	@Test
 	public void testRawMessage() throws Exception {
 		MessageListenerAdapter adapter = new MessageListenerAdapter(target);
+		adapter.afterPropertiesSet();
 		adapter.onMessage(STRING_MSG, null);
 
 		verify(target).handleMessage(PAYLOAD);
@@ -106,6 +108,8 @@ public class MessageListenerTest {
 	public void testCustomMethod() throws Exception {
 		MessageListenerAdapter adapter = new MessageListenerAdapter(target);
 		adapter.setDefaultListenerMethod("customMethod");
+		adapter.afterPropertiesSet();
+
 		adapter.onMessage(STRING_MSG, null);
 
 		verify(target).customMethod(PAYLOAD);
@@ -115,8 +119,10 @@ public class MessageListenerTest {
 	public void testCustomMethodWithChannel() throws Exception {
 		MessageListenerAdapter adapter = new MessageListenerAdapter(target);
 		adapter.setDefaultListenerMethod("customMethodWithChannel");
+		adapter.afterPropertiesSet();
+
 		adapter.onMessage(STRING_MSG, RAW_CHANNEL);
 
 		verify(target).customMethodWithChannel(PAYLOAD, CHANNEL);
 	}
-}
+}