Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
parent 5b2de5c81d 24925c3dae
commit aef92b9295
2799 changed files with 28402 additions and 47836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,27 +39,23 @@ class SampleBitronixApplicationTests {
@Test
void testTransactionRollback(CapturedOutput capturedOutput) throws Exception {
SampleBitronixApplication.main(new String[] {});
assertThat(capturedOutput.toString()).has(substring(1, "---->"))
.has(substring(1, "----> josh")).has(substring(2, "Count is 1"))
.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
void testExposesXaAndNonXa() {
ApplicationContext context = SpringApplication
.run(SampleBitronixApplication.class);
ApplicationContext context = SpringApplication.run(SampleBitronixApplication.class);
Object jmsConnectionFactory = context.getBean("jmsConnectionFactory");
Object xaJmsConnectionFactory = context.getBean("xaJmsConnectionFactory");
Object nonXaJmsConnectionFactory = context.getBean("nonXaJmsConnectionFactory");
assertThat(jmsConnectionFactory).isSameAs(xaJmsConnectionFactory);
assertThat(jmsConnectionFactory).isInstanceOf(PoolingConnectionFactory.class);
assertThat(nonXaJmsConnectionFactory)
.isNotInstanceOf(PoolingConnectionFactory.class);
assertThat(nonXaJmsConnectionFactory).isNotInstanceOf(PoolingConnectionFactory.class);
}
private Condition<String> substring(int times, String substring) {
return new Condition<String>(
"containing '" + substring + "' " + times + " times") {
return new Condition<String>("containing '" + substring + "' " + times + " times") {
@Override
public boolean matches(String value) {