Repackage output capture and always use extension declaratively

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

View File

@@ -17,10 +17,10 @@
package sample.data.redis;
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 org.springframework.data.redis.RedisConnectionFailureException;
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,13 +30,11 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Dave Syer
*/
@ExtendWith(OutputCaptureExtension.class)
class SampleRedisApplicationTests {
@RegisterExtension
CapturedOutput output = OutputExtension.capture();
@Test
void testDefaultSettings() {
void testDefaultSettings(CapturedOutput capturedOutput) {
try {
SampleRedisApplication.main(new String[0]);
}
@@ -45,7 +43,7 @@ class SampleRedisApplicationTests {
return;
}
}
assertThat(this.output).contains("Found key spring.boot.redis.test");
assertThat(capturedOutput).contains("Found key spring.boot.redis.test");
}
private boolean redisServerRunning(Throwable ex) {