root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix Windows Atomikos/Bitronix ApplicationTests 

Update SampleAtomikosApplicationTests and SampleBitronixApplicationTests
to not depend on any specific System.out order.

Fixes gh-1472
This commit is contained in:
Phillip Webb 2014-09-01 17:45:30 -07:00
parent ba5c3526da
commit 104b724446
2 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,16 +16,12 @@
package sample.atomikos;
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 static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
/**
@ -41,23 +37,19 @@ public class SampleAtomikosApplicationTests {
@Test
public void testTransactionRollback() throws Exception {
SampleAtomikosApplication.main(new String[] {});
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("---->"));
String output = this.outputCapture.toString();
assertThat(output, containsString(1, "---->"));
assertThat(output, containsString(1, "----> josh"));
assertThat(output, containsString(2, "Count is 1"));
assertThat(output, containsString(1, "Simulated error"));
}
private Matcher<? super String> containsStringOnce(String s) {
private Matcher<? super String> containsString(final int times, String s) {
return new SubstringMatcher(s) {
@Override
protected String relationship() {
return "containing once";
return "containing " + times + " times";
}
@Override
@ -67,7 +59,7 @@ public class SampleAtomikosApplicationTests {
s = s.substring(s.indexOf(this.substring) + this.substring.length());
i++;
}
return i == 1;
return i == times;
}
};

24
spring-boot-samples/spring-boot-sample-jta-bitronix/src/test/java/sample/bitronix/SampleBitronixApplicationTests.java
View File

@ -16,16 +16,12 @@
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 static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
/**
@ -41,23 +37,19 @@ public class SampleBitronixApplicationTests {
@Test
public void testTransactionRollback() throws Exception {
SampleBitronixApplication.main(new String[] {});
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("---->"));
String output = this.outputCapture.toString();
assertThat(output, containsString(1, "---->"));
assertThat(output, containsString(1, "----> josh"));
assertThat(output, containsString(2, "Count is 1"));
assertThat(output, containsString(1, "Simulated error"));
}
private Matcher<? super String> containsStringOnce(String s) {
private Matcher<? super String> containsString(final int times, String s) {
return new SubstringMatcher(s) {
@Override
protected String relationship() {
return "containing once";
return "containing " + times + " times";
}
@Override
@ -67,7 +59,7 @@ public class SampleBitronixApplicationTests {
s = s.substring(s.indexOf(this.substring) + this.substring.length());
i++;
}
return i == 1;
return i == times;
}
};