Disable JMX autoconfig by default in user tests

pull/382/head
Dave Syer 11 years ago
parent b2b487ee5f
commit 2aa5623116

@ -116,6 +116,8 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
Map<String, Object> args = new LinkedHashMap<String, Object>(); Map<String, Object> args = new LinkedHashMap<String, Object>();
// Not running an embedded server, just setting up web context // Not running an embedded server, just setting up web context
args.put("server.port", "-1"); args.put("server.port", "-1");
// JMX bean names will clash if the same bean is used in multiple contexts
args.put("spring.jmx.enabled", "false");
return args; return args;
} }

@ -0,0 +1,56 @@
/*
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.junit.Assert.assertFalse;
/**
* Tests for disabling JMX by default
*
* @author Dave Syer
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration
public class SpringApplicationConfigurationJmxTests {
@Value("${spring.jmx.enabled}")
private boolean jmx;
@Test
public void disabledByDefault() {
assertFalse(this.jmx);
}
@Configuration
protected static class Config {
@Bean
public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
return new PropertySourcesPlaceholderConfigurer();
}
}
}
Loading…
Cancel
Save