root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2016-03-29 21:45:11 -07:00
parent 1043239de0
commit 39140945b5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View File

@ -77,23 +77,25 @@ public class IntegrationAutoConfigurationTests {
"org.springframework.integration.monitor"); "org.springframework.integration.monitor");
} }
@Test @Test
public void parentContext() { public void parentContext() {
this.context = new AnnotationConfigApplicationContext(); this.context = new AnnotationConfigApplicationContext();
this.context.register(JmxAutoConfiguration.class, IntegrationAutoConfiguration.class); this.context.register(JmxAutoConfiguration.class,
IntegrationAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
AnnotationConfigApplicationContext parent = this.context; AnnotationConfigApplicationContext parent = this.context;
this.context = new AnnotationConfigApplicationContext(); this.context = new AnnotationConfigApplicationContext();
this.context.setParent(parent); this.context.setParent(parent);
this.context.register(JmxAutoConfiguration.class, IntegrationAutoConfiguration.class); this.context.register(JmxAutoConfiguration.class,
IntegrationAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
assertNotNull(this.context.getBean(HeaderChannelRegistry.class)); assertNotNull(this.context.getBean(HeaderChannelRegistry.class));
((ConfigurableApplicationContext) this.context.getParent()).close(); ((ConfigurableApplicationContext) this.context.getParent()).close();
this.context.close(); this.context.close();
} }
private static void assertDomains(MBeanServer mBeanServer, boolean expected, String... domains) { private static void assertDomains(MBeanServer mBeanServer, boolean expected,
String... domains) {
List<String> actual = Arrays.asList(mBeanServer.getDomains()); List<String> actual = Arrays.asList(mBeanServer.getDomains());
for (String domain : domains) { for (String domain : domains) {
assertEquals(expected, actual.contains(domain)); assertEquals(expected, actual.contains(domain));

1
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java
View File

@ -136,4 +136,5 @@ public class FindMainClassTask extends DefaultTask {
} }
return null; return null;
} }
} }