Merge branch '2.5.x'

Closes gh-28160
This commit is contained in:
Stephane Nicoll 2021-10-01 08:14:03 +02:00
commit 1b7536fda4
2 changed files with 5 additions and 2 deletions

View File

@ -490,7 +490,10 @@ include::{docs-java}/features/testing/springbootapplications/autoconfiguredsprin
----
Data JPA tests may also inject a {spring-boot-test-autoconfigure-module-code}/orm/jpa/TestEntityManager.java[`TestEntityManager`] bean, which provides an alternative to the standard JPA `EntityManager` that is specifically designed for tests.
If you want to use `TestEntityManager` outside of `@DataJpaTest` instances, you can also use the `@AutoConfigureTestEntityManager` annotation.
TIP: `TestEntityManager` can also be auto-configured to any of your Spring-based test class by adding `@AutoConfigureTestEntityManager`.
When doing so, make sure that your test is running in a transaction, for instance by adding `@Transactional` on your test class or method.
A `JdbcTemplate` is also available if you need that.
The following example shows the `@DataJpaTest` annotation in use:

View File

@ -234,7 +234,7 @@ public class TestEntityManager {
*/
public final EntityManager getEntityManager() {
EntityManager manager = EntityManagerFactoryUtils.getTransactionalEntityManager(this.entityManagerFactory);
Assert.state(manager != null, "No transactional EntityManager found");
Assert.state(manager != null, "No transactional EntityManager found, is your test running in a transactional?");
return manager;
}