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

Repackage output capture and always use extension declaratively

Browse Source 
Closes gh-17029
This commit is contained in:
Andy Wilkinson
2019-05-31 10:03:02 +01:00
parent d11d5ceb29
commit 0644a79401
69 changed files with 584 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java
View File

@@ -17,10 +17,10 @@
package org.springframework.boot.actuate.endpoint;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.extension.CapturedOutput;
import org.springframework.boot.test.extension.OutputExtension;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -30,11 +30,9 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
*
* @author Phillip Webb
*/
@ExtendWith(OutputCaptureExtension.class)
public class EndpointIdTests {
@RegisterExtension
CapturedOutput output = OutputExtension.capture();
@Test
public void ofWhenNullThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of(null))
@@ -88,10 +86,10 @@ public class EndpointIdTests {
}
@Test
public void ofWhenContainsDeprecatedCharsLogsWarning() {
public void ofWhenContainsDeprecatedCharsLogsWarning(CapturedOutput capturedOutput) {
EndpointId.resetLoggedWarnings();
EndpointId.of("foo-bar");
assertThat(this.output.toString()).contains(
assertThat(capturedOutput.toString()).contains(
"Endpoint ID 'foo-bar' contains invalid characters, please migrate to a valid format");
}