From 096303c477a02c4f36c37a48375e4527da517008 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:51:09 +0100
Subject: [PATCH] =?UTF-8?q?Use=20@=E2=81=A0Autowired=20EntityManager=20in?=
 =?UTF-8?q?=20Jupiter=20JPA=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switching from @⁠PersistenceContext to @⁠Autowired for dependency
injection in tests allows such tests to participate in AOT processing.

Note, however, that we still have TestNG-based tests that use
@⁠PersistenceContext — for example, AbstractEjbTxDaoTestNGTests.

See gh-29122
See gh-31442
See gh-33414
---
 .../test/context/orm/jpa/JpaEntityListenerTests.java           | 3 +--
 .../test/context/orm/jpa/JpaPersonRepositoryTests.java         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaEntityListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaEntityListenerTests.java
index 5f1267c15d1..dbb360e03f8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaEntityListenerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaEntityListenerTests.java
@@ -19,7 +19,6 @@ package org.springframework.test.context.orm.jpa;
 import java.util.List;
 
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -48,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @Sql(statements = "insert into person(id, name) values(0, 'Jane')")
 class JpaEntityListenerTests {
 
-	@PersistenceContext
+	@Autowired
 	EntityManager entityManager;
 
 	@Autowired
diff --git a/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaPersonRepositoryTests.java b/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaPersonRepositoryTests.java
index 14eb4aa90ac..909a7350a5c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaPersonRepositoryTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaPersonRepositoryTests.java
@@ -17,7 +17,6 @@
 package org.springframework.test.context.orm.jpa;
 
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -44,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @Sql(statements = "insert into person(id, name) values(0, 'Jane')")
 class JpaPersonRepositoryTests {
 
-	@PersistenceContext
+	@Autowired
 	EntityManager em;
 
 	@Autowired