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 

See gh-13078
This commit is contained in:
Stephane Nicoll 2018-05-07 14:48:56 +02:00
parent 6e428100d7
commit 9dccf5b895
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java
View File

@ -20,10 +20,7 @@ import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportMessage;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.testsupport.runner.classpath.ClassPathOverrides;
import org.springframework.boot.testsupport.runner.classpath.ModifiedClassPathRunner;
@ -47,10 +44,6 @@ public class MetricsAutoConfigurationWithLog4j2AndLogbackTests {
@Test
public void doesNotConfigureLogbackMetrics() {
this.contextRunner.run((context) -> {
System.out.println(
new ConditionEvaluationReportMessage(ConditionEvaluationReport
.get((ConfigurableListableBeanFactory) context
.getAutowireCapableBeanFactory())));
assertThat(context).doesNotHaveBean(LogbackMetrics.class);
});
}

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -266,7 +266,7 @@ behalf. The algorithm used to determine a `WebEnvironmentType` is fairly simple:
* If Spring MVC is present, an `AnnotationConfigServletWebServerApplicationContext` is
used
* If Spring MVC is not present and Spring WebFlux is present, an
`AnnotationConfigReactiveWebApplicationContext` is used
`AnnotationConfigReactiveWebServerApplicationContext` is used
* Otherwise, `AnnotationConfigApplicationContext` is used
This means that if you are using Spring MVC and the new `WebClient` from Spring WebFlux in

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java
View File

@ -91,7 +91,6 @@ public class BuildInfoIntegrationTests {
.getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
BuildResult result = this.gradleBuild.build("buildInfo", "-PnullTime",
"-PprojectVersion=0.2.0");
System.out.println(result.getOutput());
assertThat(result.task(":buildInfo").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
}

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcherTests.java
View File

@ -57,7 +57,7 @@ public class ApplicationContextServerWebExchangeMatcherTests {
@Test
public void matchesWhenContextClassIsApplicationContextShouldProvideContext() {
ServerWebExchange exchange = createHttpWebHandlerAdapter();
ServerWebExchange exchange = createExchange();
StaticApplicationContext context = (StaticApplicationContext) exchange
.getApplicationContext();
assertThat(new TestApplicationContextServerWebExchangeMatcher<>(
@ -67,7 +67,7 @@ public class ApplicationContextServerWebExchangeMatcherTests {
@Test
public void matchesWhenContextClassIsExistingBeanShouldProvideBean() {
ServerWebExchange exchange = createHttpWebHandlerAdapter();
ServerWebExchange exchange = createExchange();
StaticApplicationContext context = (StaticApplicationContext) exchange
.getApplicationContext();
context.registerSingleton("existingBean", ExistingBean.class);
@ -79,7 +79,7 @@ public class ApplicationContextServerWebExchangeMatcherTests {
@Test
public void matchesWhenContextClassIsMissingBeanShouldProvideException() {
ServerWebExchange exchange = createHttpWebHandlerAdapter();
ServerWebExchange exchange = createExchange();
Supplier<ExistingBean> supplier = new TestApplicationContextServerWebExchangeMatcher<>(
ExistingBean.class).callMatchesAndReturnProvidedContext(exchange);
this.thrown.expect(NoSuchBeanDefinitionException.class);
@ -96,7 +96,7 @@ public class ApplicationContextServerWebExchangeMatcherTests {
.callMatchesAndReturnProvidedContext(exchange);
}
private ServerWebExchange createHttpWebHandlerAdapter() {
private ServerWebExchange createExchange() {
StaticApplicationContext context = new StaticApplicationContext();
TestHttpWebHandlerAdapter adapter = new TestHttpWebHandlerAdapter(
mock(WebHandler.class));