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

19
spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java
View File

@@ -18,10 +18,10 @@ package sample.atomikos;
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.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;
@@ -30,18 +30,15 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Phillip Webb
*/
@ExtendWith(OutputCaptureExtension.class)
class SampleAtomikosApplicationTests {
@RegisterExtension
CapturedOutput output = OutputExtension.capture();
@Test
void testTransactionRollback() throws Exception {
void testTransactionRollback(CapturedOutput capturedOutput) throws Exception {
SampleAtomikosApplication.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"));
}
private Condition<String> substring(int times, String substring) {