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

Polish BannerTests 

Closes gh-12029
This commit is contained in:
dreis2211 2018-02-13 20:36:46 +01:00 committed by Phillip Webb
parent a9eefaedcf
commit cd0c5ba4d5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -71,24 +71,21 @@ public class BannerTests {
@Test @Test
public void testDefaultBanner() { public void testDefaultBanner() {
SpringApplication application = new SpringApplication(Config.class); SpringApplication application = createSpringApplication();
application.setWebApplicationType(WebApplicationType.NONE);
this.context = application.run(); this.context = application.run();
assertThat(this.out.toString()).contains(":: Spring Boot ::"); assertThat(this.out.toString()).contains(":: Spring Boot ::");
} }
@Test @Test
public void testDefaultBannerInLog() { public void testDefaultBannerInLog() {
SpringApplication application = new SpringApplication(Config.class); SpringApplication application = createSpringApplication();
application.setWebApplicationType(WebApplicationType.NONE);
this.context = application.run(); this.context = application.run();
assertThat(this.out.toString()).contains(":: Spring Boot ::"); assertThat(this.out.toString()).contains(":: Spring Boot ::");
} }
@Test @Test
public void testCustomBanner() { public void testCustomBanner() {
SpringApplication application = new SpringApplication(Config.class); SpringApplication application = createSpringApplication();
application.setWebApplicationType(WebApplicationType.NONE);
application.setBanner(new DummyBanner()); application.setBanner(new DummyBanner());
this.context = application.run(); this.context = application.run();
assertThat(this.out.toString()).contains("My Banner"); assertThat(this.out.toString()).contains("My Banner");
@ -96,16 +93,14 @@ public class BannerTests {
@Test @Test
public void testBannerInContext() { public void testBannerInContext() {
SpringApplication application = new SpringApplication(Config.class); SpringApplication application = createSpringApplication();
application.setWebApplicationType(WebApplicationType.NONE);
this.context = application.run(); this.context = application.run();
assertThat(this.context.containsBean("springBootBanner")).isTrue(); assertThat(this.context.containsBean("springBootBanner")).isTrue();
} }
@Test @Test
public void testCustomBannerInContext() { public void testCustomBannerInContext() {
SpringApplication application = new SpringApplication(Config.class); SpringApplication application = createSpringApplication();
application.setWebApplicationType(WebApplicationType.NONE);
Banner banner = mock(Banner.class); Banner banner = mock(Banner.class);
application.setBanner(banner); application.setBanner(banner);
this.context = application.run(); this.context = application.run();
@ -122,13 +117,18 @@ public class BannerTests {
@Test @Test
public void testDisableBannerInContext() { public void testDisableBannerInContext() {
SpringApplication application = new SpringApplication(Config.class); SpringApplication application = createSpringApplication();
application.setBannerMode(Mode.OFF); application.setBannerMode(Mode.OFF);
application.setWebApplicationType(WebApplicationType.NONE);
this.context = application.run(); this.context = application.run();
assertThat(this.context.containsBean("springBootBanner")).isFalse(); assertThat(this.context.containsBean("springBootBanner")).isFalse();
} }
private SpringApplication createSpringApplication() {
SpringApplication application = new SpringApplication(Config.class);
application.setWebApplicationType(WebApplicationType.NONE);
return application;
}
static class DummyBanner implements Banner { static class DummyBanner implements Banner {
@Override @Override