diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java index bd57841894..49fddc7e34 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -71,24 +71,21 @@ public class BannerTests { @Test public void testDefaultBanner() { - SpringApplication application = new SpringApplication(Config.class); - application.setWebApplicationType(WebApplicationType.NONE); + SpringApplication application = createSpringApplication(); this.context = application.run(); assertThat(this.out.toString()).contains(":: Spring Boot ::"); } @Test public void testDefaultBannerInLog() { - SpringApplication application = new SpringApplication(Config.class); - application.setWebApplicationType(WebApplicationType.NONE); + SpringApplication application = createSpringApplication(); this.context = application.run(); assertThat(this.out.toString()).contains(":: Spring Boot ::"); } @Test public void testCustomBanner() { - SpringApplication application = new SpringApplication(Config.class); - application.setWebApplicationType(WebApplicationType.NONE); + SpringApplication application = createSpringApplication(); application.setBanner(new DummyBanner()); this.context = application.run(); assertThat(this.out.toString()).contains("My Banner"); @@ -96,16 +93,14 @@ public class BannerTests { @Test public void testBannerInContext() { - SpringApplication application = new SpringApplication(Config.class); - application.setWebApplicationType(WebApplicationType.NONE); + SpringApplication application = createSpringApplication(); this.context = application.run(); assertThat(this.context.containsBean("springBootBanner")).isTrue(); } @Test public void testCustomBannerInContext() { - SpringApplication application = new SpringApplication(Config.class); - application.setWebApplicationType(WebApplicationType.NONE); + SpringApplication application = createSpringApplication(); Banner banner = mock(Banner.class); application.setBanner(banner); this.context = application.run(); @@ -122,13 +117,18 @@ public class BannerTests { @Test public void testDisableBannerInContext() { - SpringApplication application = new SpringApplication(Config.class); + SpringApplication application = createSpringApplication(); application.setBannerMode(Mode.OFF); - application.setWebApplicationType(WebApplicationType.NONE); this.context = application.run(); 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 { @Override