From 384dfc91e3b4791f2c462ab84d75341f3cace00f Mon Sep 17 00:00:00 2001
From: Christian Dupuis <cdupuis@gopivotal.com>
Date: Thu, 26 Dec 2013 15:46:11 +0100
Subject: [PATCH] Fix some tests to prevent JMX registration issues

---
 .../SpringApplicationHierarchyTests.java            |  2 +-
 .../web/BasicErrorControllerIntegrationTests.java   |  4 +++-
 ...BasicErrorControllerSpecialIntegrationTests.java | 13 +++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java
index d7d3a373a2..43eedfe21d 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java
@@ -61,7 +61,7 @@ public class SpringApplicationHierarchyTests {
 	}
 
 	@EnableAutoConfiguration(exclude = { ServerPropertiesAutoConfiguration.class,
-			JolokiaAutoConfiguration.class })
+			JolokiaAutoConfiguration.class, EndpointMBeanExportAutoConfiguration.class })
 	public static class Parent {
 	}
 
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerIntegrationTests.java
index d23b10a670..b1d1b9a8ad 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerIntegrationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerIntegrationTests.java
@@ -26,6 +26,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration;
 import org.springframework.boot.actuate.web.BasicErrorControllerIntegrationTests.TestConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -84,7 +85,8 @@ public class BasicErrorControllerIntegrationTests {
 
 	@Configuration
 	@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
-			ManagementSecurityAutoConfiguration.class })
+			ManagementSecurityAutoConfiguration.class,
+			EndpointMBeanExportAutoConfiguration.class })
 	public static class TestConfiguration {
 
 		// For manual testing
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerSpecialIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerSpecialIntegrationTests.java
index 5e358c6751..49fa1b739d 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerSpecialIntegrationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerSpecialIntegrationTests.java
@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.web;
 import org.junit.After;
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
@@ -80,14 +81,16 @@ public class BasicErrorControllerSpecialIntegrationTests {
 
 	@Configuration
 	@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
-			ManagementSecurityAutoConfiguration.class })
+			ManagementSecurityAutoConfiguration.class,
+			EndpointMBeanExportAutoConfiguration.class })
 	protected static class ParentConfiguration {
 
 	}
 
 	@Configuration
 	@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
-			ManagementSecurityAutoConfiguration.class })
+			ManagementSecurityAutoConfiguration.class,
+			EndpointMBeanExportAutoConfiguration.class })
 	@EnableWebMvc
 	protected static class WebMvcIncludedConfiguration {
 		// For manual testing
@@ -99,7 +102,8 @@ public class BasicErrorControllerSpecialIntegrationTests {
 
 	@Configuration
 	@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
-			ManagementSecurityAutoConfiguration.class })
+			ManagementSecurityAutoConfiguration.class,
+			EndpointMBeanExportAutoConfiguration.class })
 	protected static class VanillaConfiguration {
 		// For manual testing
 		public static void main(String[] args) {
@@ -110,7 +114,8 @@ public class BasicErrorControllerSpecialIntegrationTests {
 
 	@Configuration
 	@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class,
-			ManagementSecurityAutoConfiguration.class })
+			ManagementSecurityAutoConfiguration.class,
+			EndpointMBeanExportAutoConfiguration.class })
 	protected static class ChildConfiguration {
 		// For manual testing
 		public static void main(String[] args) {