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

Honor TxMgmtConfigurer when @Primary tx mgr is present in TCF

Browse Source 
Prior to this commit, the Spring TestContext Framework (TCF) favored a
@Primary transaction manger over one configured via the
TransactionManagementConfigurer API, and this contradicts the behavior
in production Spring applications.

This commit aligns the transaction manger lookup within the TCF so that
a transaction manger configured via the TransactionManagementConfigurer
API is properly favored over a @Primary transaction manager.

Closes gh-24869
This commit is contained in:
Sam Brannen
2020-05-09 20:09:27 +02:00
parent 745cfcb161
commit 613bd3be1d
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-test/src/test/java/org/springframework/test/context/transaction/manager/LookUpTxMgrViaTransactionManagementConfigurerWithPrimaryTxMgrTests.java
View File

@@ -34,9 +34,9 @@ import org.springframework.transaction.testfixture.CallCountingTransactionManage
import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration test that verifies the current behavior for transaction manager
* lookups when one transaction manager is {@link Primary @Primary} and an
* additional transaction manager is configured via the
* Integration test that verifies the behavior for transaction manager lookups
* when one transaction manager is {@link Primary @Primary} and an additional
* transaction manager is configured via the
* {@link TransactionManagementConfigurer} API.
*
* @author Sam Brannen
@@ -44,7 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@SpringJUnitConfig
@Transactional
// TODO Update assertions once https://github.com/spring-projects/spring-framework/issues/24869 is fixed.
class LookUpTxMgrViaTransactionManagementConfigurerWithPrimaryTxMgrTests {
@Autowired
@@ -57,28 +56,28 @@ class LookUpTxMgrViaTransactionManagementConfigurerWithPrimaryTxMgrTests {
@Test
void transactionalTest() {
assertThat(primary.begun).isEqualTo(1);
assertThat(primary.inflight).isEqualTo(1);
assertThat(primary.begun).isEqualTo(0);
assertThat(primary.inflight).isEqualTo(0);
assertThat(primary.commits).isEqualTo(0);
assertThat(primary.rollbacks).isEqualTo(0);
assertThat(annotationDriven.begun).isEqualTo(0);
assertThat(annotationDriven.inflight).isEqualTo(0);
assertThat(annotationDriven.begun).isEqualTo(1);
assertThat(annotationDriven.inflight).isEqualTo(1);
assertThat(annotationDriven.commits).isEqualTo(0);
assertThat(annotationDriven.rollbacks).isEqualTo(0);
}
@AfterTransaction
void afterTransaction() {
assertThat(primary.begun).isEqualTo(1);
assertThat(primary.begun).isEqualTo(0);
assertThat(primary.inflight).isEqualTo(0);
assertThat(primary.commits).isEqualTo(0);
assertThat(primary.rollbacks).isEqualTo(1);
assertThat(primary.rollbacks).isEqualTo(0);
assertThat(annotationDriven.begun).isEqualTo(0);
assertThat(annotationDriven.begun).isEqualTo(1);
assertThat(annotationDriven.inflight).isEqualTo(0);
assertThat(annotationDriven.commits).isEqualTo(0);
assertThat(annotationDriven.rollbacks).isEqualTo(0);
assertThat(annotationDriven.rollbacks).isEqualTo(1);
}