Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-17335
Closes gh-17292
This commit is contained in:
Andy Wilkinson
2019-06-27 11:46:52 +01:00
parent 867c35a2f6 91786bc712
commit 66f1344f7c
11 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
View File

@@ -32,12 +32,12 @@ import static org.assertj.core.api.Assertions.assertThat;
class AnsiOutputTests {
@BeforeAll
public static void enable() {
static void enable() {
AnsiOutput.setEnabled(Enabled.ALWAYS);
}
@AfterAll
public static void reset() {
static void reset() {
AnsiOutput.setEnabled(Enabled.DETECT);
}

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java
View File

@@ -42,12 +42,12 @@ class ColorConverterTests {
private final String in = "in";
@BeforeAll
public static void setupAnsi() {
static void setupAnsi() {
AnsiOutput.setEnabled(AnsiOutput.Enabled.ALWAYS);
}
@AfterAll
public static void resetAnsi() {
static void resetAnsi() {
AnsiOutput.setEnabled(AnsiOutput.Enabled.DETECT);
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
View File

@@ -52,7 +52,7 @@ class RootUriTemplateHandlerTests {
@BeforeEach
@SuppressWarnings("unchecked")
public void setup() throws URISyntaxException {
void setup() throws URISyntaxException {
MockitoAnnotations.initMocks(this);
this.uri = new URI("https://example.com/hello");
this.handler = new RootUriTemplateHandler("https://example.com", this.delegate);