From f9f2f8cd21c526fb9da494c7dacc8edb947b57ef Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 4 Feb 2011 19:33:54 -0500
Subject: [PATCH] INT-1727 added customizer tests

---
 .../GroovyServiceActivatorTests-context.xml   | 10 ++++++---
 .../config/GroovyServiceActivatorTests.java   | 21 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
index 4d6ce920b7..242b1075f1 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
@@ -10,7 +10,8 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<service-activator input-channel="referencedScriptInput">
-		<groovy:script location="org/springframework/integration/groovy/config/GroovyServiceActivatorTests.groovy">
+		<groovy:script location="org/springframework/integration/groovy/config/GroovyServiceActivatorTests.groovy" 
+					   customizer="groovyCustomizer">
 			<groovy:variable name="foo" value="foo"/>
 			<groovy:variable name="bar" value="bar"/>
 			<groovy:variable name="date" ref="date"/>
@@ -20,14 +21,17 @@
 	
 	<service-activator input-channel="withScriptVariableGenerator">
 		<groovy:script location="org/springframework/integration/groovy/config/GroovyServiceActivatorTests.groovy"
-					   script-variable-generator="scriptVarSource"/>
+					   script-variable-generator="scriptVarSource" customizer="groovyCustomizer"/>
 	</service-activator>
 	
+	<beans:bean id="groovyCustomizer" 
+			class="org.springframework.integration.groovy.config.GroovyServiceActivatorTests.MyGroovyCustomizer"/>
+	
 	<beans:bean id="scriptVarSource" 
 		class="org.springframework.integration.groovy.config.GroovyServiceActivatorTests.SampleScriptVariSource"/>
 
 	<service-activator input-channel="inlineScriptInput">
-		<groovy:script>
+		<groovy:script customizer="groovyCustomizer">
 			<![CDATA[
 				return "inline-$payload"
 			]]>
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
index a7ff70dc50..b56f50fa62 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
@@ -20,6 +20,7 @@ import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import groovy.lang.GroovyObject;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -36,6 +37,7 @@ import org.springframework.integration.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.scripting.ScriptVariableGenerator;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.scripting.groovy.GroovyObjectCustomizer;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -46,6 +48,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 public class GroovyServiceActivatorTests {
+	
+	private static boolean customizerExecuted;
 
 	@Autowired
 	private MessageChannel referencedScriptInput;
@@ -58,7 +62,8 @@ public class GroovyServiceActivatorTests {
 
 
 	@Test
-	public void referencedScript() throws Exception{
+	public void referencedScriptAndCustomiser() throws Exception{
+		customizerExecuted = false;
 		QueueChannel replyChannel = new QueueChannel();
 		replyChannel.setBeanName("returnAddress");
 		for (int i = 1; i <= 3; i++) {
@@ -78,11 +83,14 @@ public class GroovyServiceActivatorTests {
 		assertFalse(value1.substring(26).equals(value2.substring(26)));
 		assertFalse(value2.substring(26).equals(value3.substring(26)));
 		
+		assertTrue(customizerExecuted);
+		
 		assertNull(replyChannel.receive(0));
 	}
 	
 	@Test
 	public void withScriptVariableGenerator() throws Exception{
+		customizerExecuted = false;
 		QueueChannel replyChannel = new QueueChannel();
 		replyChannel.setBeanName("returnAddress");
 		for (int i = 1; i <= 3; i++) {
@@ -100,12 +108,14 @@ public class GroovyServiceActivatorTests {
 
 		assertFalse(value1.substring(26).equals(value2.substring(26)));
 		assertFalse(value2.substring(26).equals(value3.substring(26)));
+		assertTrue(customizerExecuted);
 		
 		assertNull(replyChannel.receive(0));
 	}
 
 	@Test
 	public void inlineScript() throws Exception{
+		customizerExecuted = false;
 		QueueChannel replyChannel = new QueueChannel();
 		replyChannel.setBeanName("returnAddress");
 		for (int i = 1; i <= 3; i++) {
@@ -116,6 +126,7 @@ public class GroovyServiceActivatorTests {
 		assertEquals("inline-test-2", replyChannel.receive(0).getPayload());
 		assertEquals("inline-test-3", replyChannel.receive(0).getPayload());
 		assertNull(replyChannel.receive(0));
+		assertTrue(customizerExecuted);
 	}
 	
 	@Test(expected=BeanDefinitionParsingException.class)
@@ -139,4 +150,12 @@ public class GroovyServiceActivatorTests {
 			return variables;
 		}
 	}
+	
+	public static class MyGroovyCustomizer implements GroovyObjectCustomizer{
+
+		public void customize(GroovyObject goo) {
+			customizerExecuted = true;
+		}
+		
+	}
 }