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

@@ -19,11 +19,11 @@ package sample.bitronix;
import bitronix.tm.resource.jms.PoolingConnectionFactory;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.SpringApplication;
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.context.ApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
@@ -33,18 +33,15 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Phillip Webb
*/
@ExtendWith(OutputCaptureExtension.class)
class SampleBitronixApplicationTests {
@RegisterExtension
CapturedOutput output = OutputExtension.capture();
@Test
void testTransactionRollback() throws Exception {
void testTransactionRollback(CapturedOutput capturedOutput) throws Exception {
SampleBitronixApplication.main(new String[] {});
assertThat(this.output.toString()).has(substring(1, "---->"));
assertThat(this.output.toString()).has(substring(1, "----> josh"));
assertThat(this.output.toString()).has(substring(2, "Count is 1"));
assertThat(this.output.toString()).has(substring(1, "Simulated error"));
assertThat(capturedOutput.toString()).has(substring(1, "---->"))
.has(substring(1, "----> josh")).has(substring(2, "Count is 1"))
.has(substring(1, "Simulated error"));
}
@Test