From 2cacc19c91fcf67503d7c3962d11fe85db65c3ca Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 9 May 2016 17:49:55 +0200 Subject: [PATCH] Polish See gh-5901 --- .../IntegrationAutoConfigurationTests.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index f2c9297b85..f49ca1c9ec 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -30,7 +30,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.integration.support.channel.HeaderChannelRegistry; import org.springframework.test.context.support.TestPropertySourceUtils; -import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -57,27 +56,9 @@ public class IntegrationAutoConfigurationTests { @Test public void integrationIsAvailable() { load(); - MBeanServer mBeanServer = this.context.getBean(MBeanServer.class); - assertDomains(mBeanServer, true, "org.springframework.integration", - "org.springframework.integration.monitor"); 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 public void parentContext() { this.context = new AnnotationConfigApplicationContext(); @@ -106,7 +87,7 @@ public class IntegrationAutoConfigurationTests { @Test public void disableJmxIntegration() { load("spring.jmx.enabled=false"); - assertEquals(this.context.getBeansOfType(MBeanServer.class), hasSize(0)); + assertEquals(0, this.context.getBeansOfType(MBeanServer.class).size()); } @Test