Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3124 Make Test Domains Unique

Browse Source 
Gradle build failed with InstanceAlreadyExistsException.

Make domains unique in new tests and the one that failed.
This commit is contained in:
Gary Russell
2013-09-03 13:58:02 -04:00
parent 5212ea13ef
commit 99fa064dda
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests-context.xml
View File

@@ -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">

7
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java
View File

@@ -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"));

2
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests-context.xml
View File

@@ -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"/>

2
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
View File

@@ -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());