Skip to content

Commit 82d0e49

Browse files
philwebbphilwebb
committed
Inline methods from TransactionTestUtils
Delete `TransactionTestUtils` and inline AssertJ assertions instead. Closes gh-23022
1 parent 9d74da0 commit 82d0e49

26 files changed

+121
-203
lines changed

‎spring-test/src/test/java/org/springframework/test/context/jdbc/DataSourceOnlySqlScriptsTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import org.springframework.test.context.ContextConfiguration;
3333
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3434
import org.springframework.test.jdbc.JdbcTestUtils;
35+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3838

3939
/**
4040
* Integration tests for {@link Sql @Sql} support with only a {@link DataSource}
@@ -61,15 +61,15 @@ public void setDataSource(DataSource dataSource) {
6161
@Test
6262
// test##_ prefix is required for @FixMethodOrder.
6363
public void test01_classLevelScripts() {
64-
assertInTransaction(false);
64+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
6565
assertNumUsers(1);
6666
}
6767

6868
@Test
6969
@Sql({ "drop-schema.sql", "schema.sql", "data.sql", "data-add-dogbert.sql" })
7070
// test##_ prefix is required for @FixMethodOrder.
7171
public void test02_methodLevelScripts() {
72-
assertInTransaction(false);
72+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
7373
assertNumUsers(2);
7474
}
7575

‎spring-test/src/test/java/org/springframework/test/context/jdbc/InferredDataSourceSqlScriptsTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import org.springframework.test.context.ContextConfiguration;
3535
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3636
import org.springframework.transaction.PlatformTransactionManager;
37+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3738

3839
import static org.assertj.core.api.Assertions.assertThat;
39-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
4040

4141
/**
4242
* Integration tests for {@link Sql @Sql} that verify support for inferring
@@ -61,14 +61,14 @@ public class InferredDataSourceSqlScriptsTests {
6161
@Test
6262
@Sql(scripts = "data-add-dogbert.sql", config = @SqlConfig(transactionManager = "txMgr1"))
6363
public void database1() {
64-
assertInTransaction(false);
64+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
6565
assertUsers(new JdbcTemplate(dataSource1), "Dilbert", "Dogbert");
6666
}
6767

6868
@Test
6969
@Sql(scripts = "data-add-catbert.sql", config = @SqlConfig(transactionManager = "txMgr2"))
7070
public void database2() {
71-
assertInTransaction(false);
71+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
7272
assertUsers(new JdbcTemplate(dataSource2), "Dilbert", "Catbert");
7373
}
7474

‎spring-test/src/test/java/org/springframework/test/context/jdbc/InferredDataSourceTransactionalSqlScriptsTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3636
import org.springframework.transaction.PlatformTransactionManager;
3737
import org.springframework.transaction.annotation.Transactional;
38+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3839

3940
import static org.assertj.core.api.Assertions.assertThat;
40-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
4141

4242
/**
4343
* Exact copy of {@link InferredDataSourceSqlScriptsTests}, except that test
@@ -63,15 +63,15 @@ public class InferredDataSourceTransactionalSqlScriptsTests {
6363
@Transactional("txMgr1")
6464
@Sql(scripts = "data-add-dogbert.sql", config = @SqlConfig(transactionManager = "txMgr1"))
6565
public void database1() {
66-
assertInTransaction(true);
66+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
6767
assertUsers(new JdbcTemplate(dataSource1), "Dilbert", "Dogbert");
6868
}
6969

7070
@Test
7171
@Transactional("txMgr2")
7272
@Sql(scripts = "data-add-catbert.sql", config = @SqlConfig(transactionManager = "txMgr2"))
7373
public void database2() {
74-
assertInTransaction(true);
74+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
7575
assertUsers(new JdbcTemplate(dataSource2), "Dilbert", "Catbert");
7676
}
7777

‎spring-test/src/test/java/org/springframework/test/context/jdbc/PrimaryDataSourceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.test.context.ContextConfiguration;
3232
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3333
import org.springframework.test.jdbc.JdbcTestUtils;
34-
import org.springframework.test.transaction.TransactionTestUtils;
34+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
3737

@@ -81,7 +81,7 @@ public void setDataSource(DataSource dataSource) {
8181
@Test
8282
@Sql("data.sql")
8383
public void dataSourceTest() {
84-
TransactionTestUtils.assertInTransaction(false);
84+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
8585
assertThat(JdbcTestUtils.countRowsInTable(this.jdbcTemplate, "user")).as("Number of rows in the 'user' table.").isEqualTo(1);
8686
}
8787

‎spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import org.springframework.test.context.transaction.BeforeTransaction;
3333
import org.springframework.transaction.annotation.Propagation;
3434
import org.springframework.transaction.annotation.Transactional;
35+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3838

3939
/**
4040
* JUnit 4 based integration test which verifies
@@ -79,7 +79,7 @@ public static void afterClass() {
7979

8080
@BeforeTransaction
8181
void beforeTransaction() {
82-
assertInTransaction(false);
82+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
8383
this.inTransaction = true;
8484
BeforeAndAfterTransactionAnnotationTests.numBeforeTransactionCalls++;
8585
clearPersonTable(jdbcTemplate);
@@ -88,7 +88,7 @@ void beforeTransaction() {
8888

8989
@AfterTransaction
9090
void afterTransaction() {
91-
assertInTransaction(false);
91+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
9292
this.inTransaction = false;
9393
BeforeAndAfterTransactionAnnotationTests.numAfterTransactionCalls++;
9494
assertThat(deletePerson(jdbcTemplate, YODA)).as("Deleting yoda").isEqualTo(1);
@@ -105,7 +105,7 @@ public void before() {
105105

106106
private void assertShouldBeInTransaction() {
107107
boolean shouldBeInTransaction = !testName.getMethodName().equals("nonTransactionalMethod");
108-
assertInTransaction(shouldBeInTransaction);
108+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isEqualTo(shouldBeInTransaction);
109109
}
110110

111111
@After
@@ -115,14 +115,14 @@ public void after() {
115115

116116
@Test
117117
public void transactionalMethod1() {
118-
assertInTransaction(true);
118+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
119119
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
120120
assertThat(countRowsInPersonTable(jdbcTemplate)).as("Verifying the number of rows in the person table within transactionalMethod1().").isEqualTo(2);
121121
}
122122

123123
@Test
124124
public void transactionalMethod2() {
125-
assertInTransaction(true);
125+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
126126
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
127127
assertThat(addPerson(jdbcTemplate, SUE)).as("Adding sue").isEqualTo(1);
128128
assertThat(countRowsInPersonTable(jdbcTemplate)).as("Verifying the number of rows in the person table within transactionalMethod2().").isEqualTo(3);
@@ -131,7 +131,7 @@ public void transactionalMethod2() {
131131
@Test
132132
@Transactional(propagation = Propagation.NOT_SUPPORTED)
133133
public void nonTransactionalMethod() {
134-
assertInTransaction(false);
134+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
135135
assertThat(addPerson(jdbcTemplate, LUKE)).as("Adding luke").isEqualTo(1);
136136
assertThat(addPerson(jdbcTemplate, LEIA)).as("Adding leia").isEqualTo(1);
137137
assertThat(addPerson(jdbcTemplate, YODA)).as("Adding yoda").isEqualTo(1);

‎spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
3333
import org.springframework.transaction.annotation.Propagation;
3434
import org.springframework.transaction.annotation.Transactional;
35+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3838

3939
/**
4040
* JUnit 4 based integration test which verifies support of Spring's
@@ -82,7 +82,7 @@ public void verifyInitialTestData() {
8282

8383
@Test
8484
public void modifyTestDataWithinTransaction() {
85-
assertInTransaction(true);
85+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
8686
assertThat(deletePerson(jdbcTemplate, BOB)).as("Deleting bob").isEqualTo(1);
8787
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
8888
assertThat(addPerson(jdbcTemplate, SUE)).as("Adding sue").isEqualTo(1);
@@ -92,7 +92,7 @@ public void modifyTestDataWithinTransaction() {
9292
@Test
9393
@Transactional(propagation = Propagation.NOT_SUPPORTED)
9494
public void modifyTestDataWithoutTransaction() {
95-
assertInTransaction(false);
95+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
9696
assertThat(addPerson(jdbcTemplate, LUKE)).as("Adding luke").isEqualTo(1);
9797
assertThat(addPerson(jdbcTemplate, LEIA)).as("Adding leia").isEqualTo(1);
9898
assertThat(addPerson(jdbcTemplate, YODA)).as("Adding yoda").isEqualTo(1);

‎spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
import org.springframework.tests.sample.beans.Pet;
3333
import org.springframework.transaction.annotation.Propagation;
3434
import org.springframework.transaction.annotation.Transactional;
35+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
38-
import static org.springframework.test.transaction.TransactionTestUtils.inTransaction;
3938

4039
/**
4140
* Combined integration test for {@link AbstractJUnit4SpringContextTests} and
@@ -93,13 +92,13 @@ public void afterPropertiesSet() {
9392

9493
@Before
9594
public void setUp() {
96-
long expected = (inTransaction() ? 2 : 1);
95+
long expected = (TransactionSynchronizationManager.isActualTransactionActive() ? 2 : 1);
9796
assertThat(countRowsInPersonTable()).as("Verifying the number of rows in the person table before a test method.").isEqualTo(expected);
9897
}
9998

10099
@After
101100
public void tearDown() {
102-
long expected = (inTransaction() ? 4 : 1);
101+
long expected = (TransactionSynchronizationManager.isActualTransactionActive() ? 4 : 1);
103102
assertThat(countRowsInPersonTable()).as("Verifying the number of rows in the person table after a test method.").isEqualTo(expected);
104103
}
105104

@@ -119,29 +118,29 @@ public void afterTransaction() {
119118
@Test
120119
@Transactional(propagation = Propagation.NOT_SUPPORTED)
121120
public void verifyBeanNameSet() {
122-
assertInTransaction(false);
121+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
123122
assertThat(this.beanName.startsWith(getClass().getName())).as("The bean name of this test instance should have been set to the fully qualified class name " +
124123
"due to BeanNameAware semantics.").isTrue();
125124
}
126125

127126
@Test
128127
@Transactional(propagation = Propagation.NOT_SUPPORTED)
129128
public void verifyApplicationContext() {
130-
assertInTransaction(false);
129+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
131130
assertThat(super.applicationContext).as("The application context should have been set due to ApplicationContextAware semantics.").isNotNull();
132131
}
133132

134133
@Test
135134
@Transactional(propagation = Propagation.NOT_SUPPORTED)
136135
public void verifyBeanInitialized() {
137-
assertInTransaction(false);
136+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
138137
assertThat(this.beanInitialized).as("This test bean should have been initialized due to InitializingBean semantics.").isTrue();
139138
}
140139

141140
@Test
142141
@Transactional(propagation = Propagation.NOT_SUPPORTED)
143142
public void verifyAnnotationAutowiredFields() {
144-
assertInTransaction(false);
143+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
145144
assertThat(this.nonrequiredLong).as("The nonrequiredLong property should NOT have been autowired.").isNull();
146145
assertThat(this.pet).as("The pet field should have been autowired.").isNotNull();
147146
assertThat(this.pet.getName()).isEqualTo("Fido");
@@ -150,28 +149,28 @@ public void verifyAnnotationAutowiredFields() {
150149
@Test
151150
@Transactional(propagation = Propagation.NOT_SUPPORTED)
152151
public void verifyAnnotationAutowiredMethods() {
153-
assertInTransaction(false);
152+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
154153
assertThat(this.employee).as("The employee setter method should have been autowired.").isNotNull();
155154
assertThat(this.employee.getName()).isEqualTo("John Smith");
156155
}
157156

158157
@Test
159158
@Transactional(propagation = Propagation.NOT_SUPPORTED)
160159
public void verifyResourceAnnotationWiredFields() {
161-
assertInTransaction(false);
160+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
162161
assertThat(this.foo).as("The foo field should have been wired via @Resource.").isEqualTo("Foo");
163162
}
164163

165164
@Test
166165
@Transactional(propagation = Propagation.NOT_SUPPORTED)
167166
public void verifyResourceAnnotationWiredMethods() {
168-
assertInTransaction(false);
167+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
169168
assertThat(this.bar).as("The bar method should have been wired via @Resource.").isEqualTo("Bar");
170169
}
171170

172171
@Test
173172
public void modifyTestDataWithinTransaction() {
174-
assertInTransaction(true);
173+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
175174
assertThat(addPerson(JANE)).as("Adding jane").isEqualTo(1);
176175
assertThat(addPerson(SUE)).as("Adding sue").isEqualTo(1);
177176
assertThat(countRowsInPersonTable()).as("Verifying the number of rows in the person table in modifyTestDataWithinTransaction().").isEqualTo(4);

‎spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseRollbackAnnotationTransactionalTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import org.springframework.test.annotation.Rollback;
2929
import org.springframework.test.context.ContextConfiguration;
3030
import org.springframework.transaction.annotation.Transactional;
31+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3132

3233
import static org.assertj.core.api.Assertions.assertThat;
33-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3434

3535
/**
3636
* Integration test which verifies proper transactional behavior when the
@@ -69,7 +69,7 @@ public void verifyInitialTestData() {
6969

7070
@Test
7171
public void modifyTestDataWithinTransaction() {
72-
assertInTransaction(true);
72+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
7373
assertThat(deletePerson(jdbcTemplate, BOB)).as("Deleting bob").isEqualTo(1);
7474
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
7575
assertThat(addPerson(jdbcTemplate, SUE)).as("Adding sue").isEqualTo(1);

‎spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueRollbackAnnotationTransactionalTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import org.springframework.test.annotation.Rollback;
2929
import org.springframework.test.context.ContextConfiguration;
3030
import org.springframework.transaction.annotation.Transactional;
31+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3132

3233
import static org.assertj.core.api.Assertions.assertThat;
33-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3434

3535
/**
3636
* Integration test which verifies proper transactional behavior when the default
@@ -71,7 +71,7 @@ public void verifyInitialTestData() {
7171

7272
@Test(timeout = 1000)
7373
public void modifyTestDataWithinTransaction() {
74-
assertInTransaction(true);
74+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
7575
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
7676
assertThat(addPerson(jdbcTemplate, SUE)).as("Adding sue").isEqualTo(1);
7777
assertThat(countRowsInPersonTable(jdbcTemplate)).as("Verifying the number of rows in the person table within a transaction.").isEqualTo(3);

‎spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
3333
import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
3434
import org.springframework.transaction.annotation.Transactional;
35+
import org.springframework.transaction.support.TransactionSynchronizationManager;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3838

3939
/**
4040
* JUnit 4 based integration test which verifies support of Spring's
@@ -85,7 +85,7 @@ public void verifyInitialTestData() {
8585
@Test
8686
@Transactional("transactionManager2")
8787
public void modifyTestDataWithinTransaction() {
88-
assertInTransaction(true);
88+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
8989
assertThat(deletePerson(jdbcTemplate, BOB)).as("Deleting bob").isEqualTo(1);
9090
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
9191
assertThat(addPerson(jdbcTemplate, SUE)).as("Adding sue").isEqualTo(1);
@@ -94,7 +94,7 @@ public void modifyTestDataWithinTransaction() {
9494

9595
@Test
9696
public void modifyTestDataWithoutTransaction() {
97-
assertInTransaction(false);
97+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
9898
assertThat(addPerson(jdbcTemplate, LUKE)).as("Adding luke").isEqualTo(1);
9999
assertThat(addPerson(jdbcTemplate, LEIA)).as("Adding leia").isEqualTo(1);
100100
assertThat(addPerson(jdbcTemplate, YODA)).as("Adding yoda").isEqualTo(1);

‎spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseRollbackAnnotationTransactionalTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.jdbc.core.JdbcTemplate;
2727
import org.springframework.test.annotation.Rollback;
28+
import org.springframework.transaction.support.TransactionSynchronizationManager;
2829

2930
import static org.assertj.core.api.Assertions.assertThat;
30-
import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
3131

3232
/**
3333
* Extension of {@link DefaultRollbackFalseRollbackAnnotationTransactionalTests}
@@ -64,7 +64,7 @@ public void verifyInitialTestData() {
6464
@Rollback
6565
@Override
6666
public void modifyTestDataWithinTransaction() {
67-
assertInTransaction(true);
67+
assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
6868
assertThat(deletePerson(jdbcTemplate, BOB)).as("Deleting bob").isEqualTo(1);
6969
assertThat(addPerson(jdbcTemplate, JANE)).as("Adding jane").isEqualTo(1);
7070
assertThat(addPerson(jdbcTemplate, SUE)).as("Adding sue").isEqualTo(1);

0 commit comments

Comments
 (0)