INT-2082 added support for evaluating payload expression in ContinuousQueryMessageProducer

spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests.java

@@ -23,7 +23,6 @@ import org.springframework.integration.MessagingException;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.SubscribableChannel;
 import org.springframework.integration.message.ErrorMessage;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/cq/ContinuousQueryMessageProducerTests-context.xml

@@ -23,14 +23,26 @@
 		<property name="cache" ref="client-cache"/>
 	</bean>
 	
-	<bean class="org.springframework.integration.gemfire.inbound.ContinuousQueryMessageProducer">
+	<bean id="cqMessageProducer" class="org.springframework.integration.gemfire.inbound.ContinuousQueryMessageProducer">
 		<constructor-arg ref="queryListenerContainer"/>
 		<constructor-arg value="select * from /test"/>
-		<property name="outputChannel" ref="outputChannel"/>
+		<property name="outputChannel" ref="outputChannel1"/>
 		<property name="durable" value="true"/>
 	</bean>
 	
-	<int:channel id="outputChannel">
+	<int:channel id="outputChannel1">
 		<int:queue/>
 	</int:channel>
+	
+	<bean id="spelCqMessageProducer" class="org.springframework.integration.gemfire.inbound.ContinuousQueryMessageProducer">
+		<constructor-arg ref="queryListenerContainer"/>
+		<constructor-arg value="select * from /test"/>
+		<property name="outputChannel" ref="outputChannel2"/>
+		<property name="payloadExpression" value="newValue"/>
+	</bean>
+	
+	<int:channel id="outputChannel2">
+		<int:queue/>
+	</int:channel>
+	
 </beans>

spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/cq/ContinuousQueryMessageProducerTests.java

@@ -12,6 +12,7 @@
  */
 package org.springframework.integration.gemfire.inbound.cq;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -19,6 +20,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,6 +43,8 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
 @ContextConfiguration
 public class ContinuousQueryMessageProducerTests {
 	
+	static ConfigurableApplicationContext staticCtx;
+	
 	@Autowired
 	LocalRegion region;
 	
@@ -48,7 +52,10 @@ public class ContinuousQueryMessageProducerTests {
 	ConfigurableApplicationContext applicationContext;
 	
 	@Autowired 
-	PollableChannel outputChannel;
+	PollableChannel outputChannel1;
+	
+	@Autowired 
+	PollableChannel outputChannel2;
 	
 	static OutputStream os;
 	@BeforeClass
@@ -56,30 +63,36 @@ public class ContinuousQueryMessageProducerTests {
 		os = ForkUtil.cacheServer();
 	}
 	
-	 
+	
+	@Before 
+	public void setUp() {
+		staticCtx = applicationContext;
+	}
 	
 	@Test
-	public void test()  throws InterruptedException {
+	public void testCqEvent()  throws InterruptedException {
 		region.put("one",1);
-		Message<?> msg = outputChannel.receive(1000);
+		Message<?> msg = outputChannel1.receive(1000);
 		assertNotNull(msg);
 		assertTrue(msg.getPayload() instanceof CqEvent);
-		/*
-		 * Avoid shutdown errors
-		 */
-		applicationContext.close();
+	}
+	
+	@Test
+	public void testPayloadExpression()  throws InterruptedException {
+		region.put("one",1);
+		Message<?> msg = outputChannel2.receive(1000);
+		assertNotNull(msg);
+		assertEquals(1,msg.getPayload());
+		
+		
 	}
 	
 	@AfterClass
 	public static void cleanUp()  { 
-		
-		try {
-			Thread.sleep(3000);
-		}
-		catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}	
+		/*
+		 * Avoid shutdown errors
+		 */
+		staticCtx.close();
 		sendSignal();
 	}