Merge branch '2.2.x'

This commit is contained in:
Spencer Gibb
2020-01-17 16:25:15 -05:00
2 changed files with 4 additions and 4 deletions

View File

@@ -23,7 +23,7 @@ import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.NestedExceptionUtils;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.BDDAssertions.then;
public class CompatibilityVerifierFailureAutoConfigurationTests {
@Rule
public OutputCapture outputCapture = new OutputCapture();
public OutputCaptureRule outputCapture = new OutputCaptureRule();
@Test
public void contextFailsToLoad() {

View File

@@ -23,7 +23,7 @@ import org.assertj.core.api.BDDAssertions;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import static org.assertj.core.api.BDDAssertions.then;
@@ -33,7 +33,7 @@ import static org.assertj.core.api.BDDAssertions.then;
public class CompatibilityVerifierTests {
@Rule
public OutputCapture outputCapture = new OutputCapture();
public OutputCaptureRule outputCapture = new OutputCaptureRule();
@Test
public void should_not_print_the_report_when_no_errors_were_found() {