diff --git a/spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java b/spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java index 3950c3dfa86..f241bde5b1f 100644 --- a/spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java @@ -16,6 +16,9 @@ package sample.atomikos; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.hamcrest.Matcher; import org.hamcrest.core.SubstringMatcher; import org.junit.Rule; @@ -38,12 +41,14 @@ public class SampleAtomikosApplicationTests { @Test public void testTransactionRollback() throws Exception { SampleAtomikosApplication.main(new String[] {}); - String expected = ""; - expected += "----> josh\n"; - expected += "Count is 1\n"; - expected += "Simulated error\n"; - expected += "Count is 1\n"; - assertThat(this.outputCapture.toString(), containsString(expected)); + StringWriter expectedWriter = new StringWriter(); + PrintWriter printer = new PrintWriter(expectedWriter); + printer.println("----> josh"); + printer.println("Count is 1"); + printer.println("Simulated error"); + printer.println("Count is 1"); + assertThat(this.outputCapture.toString(), + containsString(expectedWriter.toString())); assertThat(this.outputCapture.toString(), containsStringOnce("---->")); } diff --git a/spring-boot-samples/spring-boot-sample-jta-bitronix/src/test/java/sample/bitronix/SampleBitronixApplicationTests.java b/spring-boot-samples/spring-boot-sample-jta-bitronix/src/test/java/sample/bitronix/SampleBitronixApplicationTests.java index 096d1719e27..a9466174e64 100644 --- a/spring-boot-samples/spring-boot-sample-jta-bitronix/src/test/java/sample/bitronix/SampleBitronixApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jta-bitronix/src/test/java/sample/bitronix/SampleBitronixApplicationTests.java @@ -16,14 +16,15 @@ package sample.bitronix; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.hamcrest.Matcher; import org.hamcrest.core.SubstringMatcher; import org.junit.Rule; import org.junit.Test; import org.springframework.boot.test.OutputCapture; -import sample.bitronix.SampleBitronixApplication; - import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; @@ -40,12 +41,14 @@ public class SampleBitronixApplicationTests { @Test public void testTransactionRollback() throws Exception { SampleBitronixApplication.main(new String[] {}); - String expected = ""; - expected += "----> josh\n"; - expected += "Count is 1\n"; - expected += "Simulated error\n"; - expected += "Count is 1\n"; - assertThat(this.outputCapture.toString(), containsString(expected)); + StringWriter expectedWriter = new StringWriter(); + PrintWriter printer = new PrintWriter(expectedWriter); + printer.println("----> josh"); + printer.println("Count is 1"); + printer.println("Simulated error"); + printer.println("Count is 1"); + assertThat(this.outputCapture.toString(), + containsString(expectedWriter.toString())); assertThat(this.outputCapture.toString(), containsStringOnce("---->")); }