Commit 2cacc19c authored by Stephane Nicoll's avatar Stephane Nicoll

Polish

See gh-5901
parent a4ba8f61
...@@ -30,7 +30,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext ...@@ -30,7 +30,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.integration.support.channel.HeaderChannelRegistry; import org.springframework.integration.support.channel.HeaderChannelRegistry;
import org.springframework.test.context.support.TestPropertySourceUtils; import org.springframework.test.context.support.TestPropertySourceUtils;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
...@@ -57,27 +56,9 @@ public class IntegrationAutoConfigurationTests { ...@@ -57,27 +56,9 @@ public class IntegrationAutoConfigurationTests {
@Test @Test
public void integrationIsAvailable() { public void integrationIsAvailable() {
load(); load();
MBeanServer mBeanServer = this.context.getBean(MBeanServer.class);
assertDomains(mBeanServer, true, "org.springframework.integration",
"org.springframework.integration.monitor");
assertNotNull(this.context.getBean(HeaderChannelRegistry.class)); assertNotNull(this.context.getBean(HeaderChannelRegistry.class));
} }
@Test
public void disableIntegration() {
load("spring.jmx.enabled=false");
assertEquals(0, this.context.getBeansOfType(MBeanServer.class).size());
}
@Test
public void customizeDomain() {
load("spring.jmx.default-domain=org.foo");
MBeanServer mBeanServer = this.context.getBean(MBeanServer.class);
assertDomains(mBeanServer, true, "org.foo");
assertDomains(mBeanServer, false, "org.springframework.integration",
"org.springframework.integration.monitor");
}
@Test @Test
public void parentContext() { public void parentContext() {
this.context = new AnnotationConfigApplicationContext(); this.context = new AnnotationConfigApplicationContext();
...@@ -106,7 +87,7 @@ public class IntegrationAutoConfigurationTests { ...@@ -106,7 +87,7 @@ public class IntegrationAutoConfigurationTests {
@Test @Test
public void disableJmxIntegration() { public void disableJmxIntegration() {
load("spring.jmx.enabled=false"); load("spring.jmx.enabled=false");
assertEquals(this.context.getBeansOfType(MBeanServer.class), hasSize(0)); assertEquals(0, this.context.getBeansOfType(MBeanServer.class).size());
} }
@Test @Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment