Commit 384dfc91 authored by Christian Dupuis's avatar Christian Dupuis

Fix some tests to prevent JMX registration issues

parent 4ed4ed90
......@@ -61,7 +61,7 @@ public class SpringApplicationHierarchyTests {
}
@EnableAutoConfiguration(exclude = { ServerPropertiesAutoConfiguration.class,
JolokiaAutoConfiguration.class })
JolokiaAutoConfiguration.class, EndpointMBeanExportAutoConfiguration.class })
public static class Parent {
}
......
......@@ -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
......
......@@ -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) {
......
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