From 99fa064dda9704743fd4e7fbab77653811be2ef4 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@gopivotal.com>
Date: Tue, 3 Sep 2013 13:58:02 -0400
Subject: [PATCH] INT-3124 Make Test Domains Unique

Gradle build failed with InstanceAlreadyExistsException.

Make domains unique in new tests and the one that failed.
---
 .../jmx/MBeanAttributeFilterTests-context.xml          | 10 +++++++---
 .../integration/jmx/MBeanAttributeFilterTests.java     |  7 +++++--
 ...tionPublishingChannelAdapterParserTests-context.xml |  2 +-
 ...otificationPublishingChannelAdapterParserTests.java |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests-context.xml
index 0a3cc9b813..c50125252f 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests-context.xml
@@ -13,11 +13,15 @@
 
 	<context:mbean-server/>
 
-	<int-jmx:mbean-export/>
+	<int-jmx:mbean-export default-domain="#{@domain}" />
+
+	<bean id="domain" class="java.lang.String">
+		<constructor-arg value="#{T(java.util.UUID).randomUUID().toString()}"/>
+	</bean>
 
 	<int-jmx:tree-polling-channel-adapter id="adapter"
 		channel="in"
-		query-expression="org.springframework.integration:type=MessageChannel,name=*"
+		query-expression="#{domain}:type=MessageChannel,name=*"
 		auto-startup="false">
 		<int:poller max-messages-per-poll="1" fixed-rate="5000"/>
 		<bean class="org.springframework.integration.jmx.DefaultMBeanObjectConverter">
@@ -48,7 +52,7 @@
 
 	<int-jmx:tree-polling-channel-adapter id="adapterNot"
 		channel="in"
-		query-expression="org.springframework.integration:type=MessageChannel,name=*"
+		query-expression="#{domain}:type=MessageChannel,name=*"
 		auto-startup="false">
 		<int:poller max-messages-per-poll="1" fixed-rate="5000"/>
 		<bean class="org.springframework.integration.jmx.DefaultMBeanObjectConverter">
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java
index 1fa4f09a3d..2692ab4ddc 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java
@@ -52,6 +52,9 @@ public class MBeanAttributeFilterTests {
 	@Autowired
 	private SourcePollingChannelAdapter adapterNot;
 
+	@Autowired
+	private String domain;
+
 	private final long testTimeout = 1000L;
 
 	@Test
@@ -71,7 +74,7 @@ public class MBeanAttributeFilterTests {
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> bean = (Map<String, Object>) payload
-				.get("org.springframework.integration:name=in,type=MessageChannel");
+				.get(domain + ":name=in,type=MessageChannel");
 
 		assertEquals(2, bean.size());
 		assertTrue(bean.containsKey("SendCount"));
@@ -97,7 +100,7 @@ public class MBeanAttributeFilterTests {
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> bean = (Map<String, Object>) payload
-				.get("org.springframework.integration:name=in,type=MessageChannel");
+				.get(domain + ":name=in,type=MessageChannel");
 
 		assertEquals(8, bean.size());
 		assertFalse(bean.containsKey("SendCount"));
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests-context.xml
index 6100b8ac76..4c99f3a89a 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests-context.xml
@@ -15,7 +15,7 @@
 
 	<context:mbean-export/>
 	<context:mbean-server/>
-	<jmx:mbean-export/>
+	<jmx:mbean-export default-domain="#{T(java.util.UUID).randomUUID().toString()}"/>
 
 	<si:channel id="channel"/>
 
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
index 848d36c654..af0a1522aa 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
@@ -126,7 +126,7 @@ public class NotificationPublishingChannelAdapterParserTests {
 		assertEquals("test.type", notification.getType());
 		assertNull(notification.getUserData());
 		Set<ObjectName> names = server.queryNames(
-				new ObjectName("org.springframework.integration:type=MessageHandler," +
+				new ObjectName("*:type=MessageHandler," +
 						"name=chainWithJmxNotificationPublishing$child.jmx-notification-publishing-channel-adapter-within-chain,*")
 				, null);
 		assertEquals(1, names.size());