From 7c764dcb174d8260613e2ad84d3e21dd8faabbd8 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@ibm.com>
Date: Fri, 12 Jun 2026 14:15:22 +0200
Subject: [PATCH] Replace hand-written JPA test mocks with Mockito

---
 .../resources/InjectResourcesTest.java        | 884 +-----------------
 .../junit4/resources/InjectResourcesTest.java | 884 +-----------------
 2 files changed, 8 insertions(+), 1760 deletions(-)

diff --git a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java
index 6ceb4cc2..650949ca 100644
--- a/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java
+++ b/junit-jupiter/src/test/java/org/jboss/weld/junit/jupiter/resources/InjectResourcesTest.java
@@ -19,62 +19,25 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
 import jakarta.enterprise.inject.spi.InjectionPoint;
-import jakarta.persistence.Cache;
-import jakarta.persistence.CacheRetrieveMode;
-import jakarta.persistence.CacheStoreMode;
-import jakarta.persistence.ConnectionConsumer;
-import jakarta.persistence.ConnectionFunction;
 import jakarta.persistence.EntityAgent;
-import jakarta.persistence.EntityGraph;
-import jakarta.persistence.EntityHandler;
-import jakarta.persistence.EntityListenerRegistration;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.FindOption;
-import jakarta.persistence.FlushModeType;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.LockOption;
-import jakarta.persistence.PersistenceUnitTransactionType;
-import jakarta.persistence.PersistenceUnitUtil;
-import jakarta.persistence.Query;
-import jakarta.persistence.RefreshOption;
-import jakarta.persistence.SchemaManager;
-import jakarta.persistence.Statement;
-import jakarta.persistence.StatementOrTypedQuery;
-import jakarta.persistence.StatementReference;
-import jakarta.persistence.StoredProcedureQuery;
-import jakarta.persistence.SynchronizationType;
-import jakarta.persistence.TypedQuery;
-import jakarta.persistence.TypedQueryReference;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaSelect;
-import jakarta.persistence.criteria.CriteriaStatement;
-import jakarta.persistence.metamodel.Metamodel;
-import jakarta.persistence.sql.ResultSetMapping;
 
 import org.jboss.weld.junit.jupiter.EnableWeld;
 import org.jboss.weld.junit.jupiter.WeldInitiator;
 import org.jboss.weld.junit.jupiter.WeldSetup;
 import org.junit.jupiter.api.Test;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  *
  * @author Martin Kouba
  */
 @EnableWeld
-@SuppressWarnings("rawtypes")
 public class InjectResourcesTest {
 
     @WeldSetup
@@ -114,853 +77,14 @@ public void testJpaInjection() {
     // Mock objects
 
     static Function<InjectionPoint, Object> getPCFactory() {
-        return ip -> new EntityManager() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public void setProperty(String propertyName, Object value) {
-            }
-
-            @Override
-            public void setFlushMode(FlushModeType flushMode) {
-            }
-
-            @Override
-            public void remove(Object entity) {
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity) {
-            }
-
-            @Override
-            public void persist(Object entity) {
-            }
-
-            @Override
-            public <T> T merge(T entity) {
-                return null;
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode) {
-            }
-
-            @Override
-            public void joinTransaction() {
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public boolean isJoinedToTransaction() {
-                return false;
-            }
-
-            @Deprecated(since = "4.0", forRemoval = true)
-            @Override
-            public Statement createQuery(CriteriaStatement<?> statement) {
-                return null;
-            }
-
-            @Override
-            public EntityTransaction getTransaction() {
-                return null;
-            }
-
-            @Override
-            public <T> T getReference(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(String qlString) {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public LockModeType getLockMode(Object entity) {
-                return null;
-            }
-
-            @Override
-            public FlushModeType getFlushMode() {
-                return null;
-            }
-
-            @Override
-            public EntityManagerFactory getEntityManagerFactory() {
-                return null;
-            }
-
-            @Override
-            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> getEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
-                return null;
-            }
-
-            @Override
-            public Object getDelegate() {
-                return null;
-            }
-
-            @Override
-            public void addOption(Option option) {
-
-            }
-
-            @Override
-            public Set<Option> getOptions() {
-                return Set.of();
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public void flush() {
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id, @Nullable FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(EntityGraph<T> graph, Object id, @Nullable FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public void detach(Object entity) {
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
-                return null;
-            }
-
-            @Override
-            public Statement createNamedStatement(String name) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createQuery(String qlString) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString, ResultSetMapping<T> resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(StatementReference reference) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNamedQuery(String name) {
-                return null;
-            }
-
-            @Deprecated(since = "4.0", forRemoval = true)
-            @Override
-            public EntityGraph<?> createEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-                return null;
-            }
-
-            @Override
-            public boolean contains(Object entity) {
-                return false;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void clear() {
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> T getReference(T entity) {
-                return null;
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode, LockOption... options) {
-            }
-
-            @Override
-            public void refresh(Object entity, RefreshOption... options) {
-            }
-
-            @Override
-            public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
-            }
-
-            @Override
-            public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
-            }
-
-            @Override
-            public CacheRetrieveMode getCacheRetrieveMode() {
-                return null;
-            }
-
-            @Override
-            public CacheStoreMode getCacheStoreMode() {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(CriteriaStatement<?> statement) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
-                return null;
-            }
-
-            @Override
-            public Statement createNativeStatement(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public <C> void runWithConnection(ConnectionConsumer<C> action) {
-            }
-
-            @Override
-            public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
-                return null;
-            }
-        };
+        return ip -> mock(EntityManager.class);
     }
 
     static Function<InjectionPoint, Object> getPUFactory() {
-        return ip -> new EntityManagerFactory() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public PersistenceUnitUtil getPersistenceUnitUtil() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(@Nullable EntityManager.CreationOption... options) {
-                return null;
-            }
-
-            @Override
-            public EntityAgent createEntityAgent(@Nullable EntityAgent.CreationOption... options) {
-                return null;
-            }
-
-            @Override
-            public EntityAgent createEntityAgent(@Nullable Map<?, ?> properties) {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public Cache getCache() {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map<?, ?> map) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(Map<?, ?> map) {
-                return null;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void addNamedQuery(String name, Query query) {
-            }
-
-            @Override
-            public <R> TypedQueryReference<R> addNamedQuery(String name, TypedQuery<R> query) {
-                return null;
-            }
-
-            @Override
-            public StatementReference addNamedStatement(String name, Statement statement) {
-                return null;
-            }
-
-            @Override
-            public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
-            }
-
-            @Override
-            public String getName() {
-                return null;
-            }
-
-            @Override
-            public PersistenceUnitTransactionType getTransactionType() {
-                return null;
-            }
-
-            @Override
-            public SchemaManager getSchemaManager() {
-                return null;
-            }
-
-            @Override
-            public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultType) {
-                return null;
-            }
-
-            @Override
-            public Map<String, StatementReference> getNamedStatements() {
-                return Map.of();
-            }
-
-            @Override
-            public <E> Map<String, EntityGraph<? extends E>> getNamedEntityGraphs(Class<E> entityType) {
-                return null;
-            }
-
-            @Override
-            public <R> Map<String, ResultSetMapping<R>> getResultSetMappings(Class<R> resultType) {
-                return Map.of();
-            }
-
-            @Override
-            public <E> EntityListenerRegistration addListener(Class<E> entityType, Class<? extends Annotation> callbackType,
-                    Consumer<? super E> listener) {
-                return null;
-            }
-
-            @Override
-            public void runInTransaction(Consumer<EntityManager> work) {
-            }
-
-            @Override
-            public <R> R callInTransaction(Function<EntityManager, R> work) {
-                return null;
-            }
-
-            @Override
-            public <H extends EntityHandler> void runInTransaction(Class<H> handlerClass, Consumer<H> work) {
-
-            }
-
-            @Override
-            public <R, H extends EntityHandler> R callInTransaction(Class<H> handlerClass, Function<H, R> work) {
-                return null;
-            }
-        };
+        return ip -> mock(EntityManagerFactory.class);
     }
 
     static Function<InjectionPoint, Object> getPAFactory() {
-        return ip -> new EntityAgent() {
-            @Override
-            public void insert(Object entity) {
-
-            }
-
-            @Override
-            public void insertMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void update(Object entity) {
-
-            }
-
-            @Override
-            public void updateMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void delete(Object entity) {
-
-            }
-
-            @Override
-            public void deleteMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void upsert(Object entity) {
-
-            }
-
-            @Override
-            public void upsertMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void refresh(Object entity) {
-
-            }
-
-            @Override
-            public void refreshMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode) {
-
-            }
-
-            @Override
-            public <T> T fetch(T association) {
-                return null;
-            }
-
-            @Override
-            public void addOption(Option option) {
-
-            }
-
-            @Override
-            public Set<Option> getOptions() {
-                return Set.of();
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(EntityGraph<T> graph, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object id) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(EntityGraph<T> graph, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
-
-            }
-
-            @Override
-            public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
-
-            }
-
-            @Override
-            public CacheRetrieveMode getCacheRetrieveMode() {
-                return null;
-            }
-
-            @Override
-            public CacheStoreMode getCacheStoreMode() {
-                return null;
-            }
-
-            @Override
-            public void setProperty(String propertyName, Object value) {
-
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return Map.of();
-            }
-
-            @Override
-            public Statement createStatement(String qlString) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createQuery(String qlString) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(CriteriaStatement<?> statement) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
-                return null;
-            }
-
-            @Override
-            public Statement createNamedStatement(String name) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNamedQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(StatementReference reference) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
-                return null;
-            }
-
-            @Override
-            public Statement createNativeStatement(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString,
-                    ResultSetMapping<T> resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
-                    Class<?>... resultClasses) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
-                    String... resultSetMappings) {
-                return null;
-            }
-
-            @Override
-            public <T> T unwrap(Class<T> type) {
-                return null;
-            }
-
-            @Override
-            public void close() {
-
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public EntityTransaction getTransaction() {
-                return null;
-            }
-
-            @Override
-            public EntityManagerFactory getEntityManagerFactory() {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> getEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-                return List.of();
-            }
-
-            @Override
-            public <C> void runWithConnection(ConnectionConsumer<C> action) {
-
-            }
-
-            @Override
-            public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
-                return null;
-            }
-
-            @Override
-            public String toString() {
-                return "MockEntityAgent";
-            }
-        };
+        return ip -> mock(EntityAgent.class, "MockEntityAgent");
     }
 }
diff --git a/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java b/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
index 40f0c8b7..7596974f 100644
--- a/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
+++ b/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
@@ -19,60 +19,23 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
 import jakarta.enterprise.inject.spi.InjectionPoint;
-import jakarta.persistence.Cache;
-import jakarta.persistence.CacheRetrieveMode;
-import jakarta.persistence.CacheStoreMode;
-import jakarta.persistence.ConnectionConsumer;
-import jakarta.persistence.ConnectionFunction;
 import jakarta.persistence.EntityAgent;
-import jakarta.persistence.EntityGraph;
-import jakarta.persistence.EntityHandler;
-import jakarta.persistence.EntityListenerRegistration;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.FindOption;
-import jakarta.persistence.FlushModeType;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.LockOption;
-import jakarta.persistence.PersistenceUnitTransactionType;
-import jakarta.persistence.PersistenceUnitUtil;
-import jakarta.persistence.Query;
-import jakarta.persistence.RefreshOption;
-import jakarta.persistence.SchemaManager;
-import jakarta.persistence.Statement;
-import jakarta.persistence.StatementOrTypedQuery;
-import jakarta.persistence.StatementReference;
-import jakarta.persistence.StoredProcedureQuery;
-import jakarta.persistence.SynchronizationType;
-import jakarta.persistence.TypedQuery;
-import jakarta.persistence.TypedQueryReference;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaSelect;
-import jakarta.persistence.criteria.CriteriaStatement;
-import jakarta.persistence.metamodel.Metamodel;
-import jakarta.persistence.sql.ResultSetMapping;
 
 import org.jboss.weld.junit4.WeldInitiator;
 import org.junit.Rule;
 import org.junit.Test;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  *
  * @author Martin Kouba
  */
-@SuppressWarnings("rawtypes")
 public class InjectResourcesTest {
 
     @Rule
@@ -111,853 +74,14 @@ public void testJpaInjection() {
     // Mock objects
 
     static Function<InjectionPoint, Object> getPCFactory() {
-        return ip -> new EntityManager() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public void setProperty(String propertyName, Object value) {
-            }
-
-            @Override
-            public void setFlushMode(FlushModeType flushMode) {
-            }
-
-            @Override
-            public void remove(Object entity) {
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity) {
-            }
-
-            @Override
-            public void persist(Object entity) {
-            }
-
-            @Override
-            public <T> T merge(T entity) {
-                return null;
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode) {
-            }
-
-            @Override
-            public void joinTransaction() {
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public boolean isJoinedToTransaction() {
-                return false;
-            }
-
-            @Deprecated(since = "4.0", forRemoval = true)
-            @Override
-            public Statement createQuery(CriteriaStatement<?> statement) {
-                return null;
-            }
-
-            @Override
-            public EntityTransaction getTransaction() {
-                return null;
-            }
-
-            @Override
-            public <T> T getReference(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(String qlString) {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public LockModeType getLockMode(Object entity) {
-                return null;
-            }
-
-            @Override
-            public FlushModeType getFlushMode() {
-                return null;
-            }
-
-            @Override
-            public EntityManagerFactory getEntityManagerFactory() {
-                return null;
-            }
-
-            @Override
-            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> getEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
-                return null;
-            }
-
-            @Override
-            public Object getDelegate() {
-                return null;
-            }
-
-            @Override
-            public void addOption(Option option) {
-
-            }
-
-            @Override
-            public Set<Option> getOptions() {
-                return Set.of();
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public void flush() {
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id, @Nullable FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(EntityGraph<T> graph, Object id, @Nullable FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public void detach(Object entity) {
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
-                return null;
-            }
-
-            @Override
-            public Statement createNamedStatement(String name) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createQuery(String qlString) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString, ResultSetMapping<T> resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(StatementReference reference) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNamedQuery(String name) {
-                return null;
-            }
-
-            @Deprecated(since = "4.0", forRemoval = true)
-            @Override
-            public EntityGraph<?> createEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-                return null;
-            }
-
-            @Override
-            public boolean contains(Object entity) {
-                return false;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void clear() {
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids, @Nullable FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> T getReference(T entity) {
-                return null;
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode, LockOption... options) {
-            }
-
-            @Override
-            public void refresh(Object entity, RefreshOption... options) {
-            }
-
-            @Override
-            public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
-            }
-
-            @Override
-            public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
-            }
-
-            @Override
-            public CacheRetrieveMode getCacheRetrieveMode() {
-                return null;
-            }
-
-            @Override
-            public CacheStoreMode getCacheStoreMode() {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(CriteriaStatement<?> statement) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
-                return null;
-            }
-
-            @Override
-            public Statement createNativeStatement(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public <C> void runWithConnection(ConnectionConsumer<C> action) {
-            }
-
-            @Override
-            public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
-                return null;
-            }
-        };
+        return ip -> mock(EntityManager.class);
     }
 
     static Function<InjectionPoint, Object> getPUFactory() {
-        return ip -> new EntityManagerFactory() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public PersistenceUnitUtil getPersistenceUnitUtil() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(@Nullable EntityManager.CreationOption... options) {
-                return null;
-            }
-
-            @Override
-            public EntityAgent createEntityAgent(@Nullable EntityAgent.CreationOption... options) {
-                return null;
-            }
-
-            @Override
-            public EntityAgent createEntityAgent(@Nullable Map<?, ?> properties) {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public Cache getCache() {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map<?, ?> map) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(Map<?, ?> map) {
-                return null;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void addNamedQuery(String name, Query query) {
-            }
-
-            @Override
-            public <R> TypedQueryReference<R> addNamedQuery(String name, TypedQuery<R> query) {
-                return null;
-            }
-
-            @Override
-            public StatementReference addNamedStatement(String name, Statement statement) {
-                return null;
-            }
-
-            @Override
-            public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
-            }
-
-            @Override
-            public String getName() {
-                return null;
-            }
-
-            @Override
-            public PersistenceUnitTransactionType getTransactionType() {
-                return null;
-            }
-
-            @Override
-            public SchemaManager getSchemaManager() {
-                return null;
-            }
-
-            @Override
-            public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultType) {
-                return null;
-            }
-
-            @Override
-            public Map<String, StatementReference> getNamedStatements() {
-                return Map.of();
-            }
-
-            @Override
-            public <E> Map<String, EntityGraph<? extends E>> getNamedEntityGraphs(Class<E> entityType) {
-                return null;
-            }
-
-            @Override
-            public <R> Map<String, ResultSetMapping<R>> getResultSetMappings(Class<R> resultType) {
-                return Map.of();
-            }
-
-            @Override
-            public <E> EntityListenerRegistration addListener(Class<E> entityType, Class<? extends Annotation> callbackType,
-                    Consumer<? super E> listener) {
-                return null;
-            }
-
-            @Override
-            public void runInTransaction(Consumer<EntityManager> work) {
-            }
-
-            @Override
-            public <R> R callInTransaction(Function<EntityManager, R> work) {
-                return null;
-            }
-
-            @Override
-            public <H extends EntityHandler> void runInTransaction(Class<H> handlerClass, Consumer<H> work) {
-
-            }
-
-            @Override
-            public <R, H extends EntityHandler> R callInTransaction(Class<H> handlerClass, Function<H, R> work) {
-                return null;
-            }
-        };
+        return ip -> mock(EntityManagerFactory.class);
     }
 
     static Function<InjectionPoint, Object> getPAFactory() {
-        return ip -> new EntityAgent() {
-            @Override
-            public void insert(Object entity) {
-
-            }
-
-            @Override
-            public void insertMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void update(Object entity) {
-
-            }
-
-            @Override
-            public void updateMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void delete(Object entity) {
-
-            }
-
-            @Override
-            public void deleteMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void upsert(Object entity) {
-
-            }
-
-            @Override
-            public void upsertMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void refresh(Object entity) {
-
-            }
-
-            @Override
-            public void refreshMultiple(List<?> entities) {
-
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode) {
-
-            }
-
-            @Override
-            public <T> T fetch(T association) {
-                return null;
-            }
-
-            @Override
-            public void addOption(Option option) {
-
-            }
-
-            @Override
-            public Set<Option> getOptions() {
-                return Set.of();
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(Class<T> entityClass, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T get(EntityGraph<T> graph, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> getMultiple(EntityGraph<T> graph, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object id) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(EntityGraph<T> graph, Object id, FindOption... options) {
-                return null;
-            }
-
-            @Override
-            public <T> List<T> findMultiple(Class<T> entityClass, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public <T> List<T> findMultiple(EntityGraph<T> graph, List<?> ids,
-                    FindOption... options) {
-                return List.of();
-            }
-
-            @Override
-            public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
-
-            }
-
-            @Override
-            public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
-
-            }
-
-            @Override
-            public CacheRetrieveMode getCacheRetrieveMode() {
-                return null;
-            }
-
-            @Override
-            public CacheStoreMode getCacheStoreMode() {
-                return null;
-            }
-
-            @Override
-            public void setProperty(String propertyName, Object value) {
-
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return Map.of();
-            }
-
-            @Override
-            public Statement createStatement(String qlString) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createQuery(String qlString) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(CriteriaStatement<?> statement) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, EntityGraph<T> resultGraph) {
-                return null;
-            }
-
-            @Override
-            public Statement createNamedStatement(String name) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNamedQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Statement createStatement(StatementReference reference) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
-                return null;
-            }
-
-            @Override
-            public Statement createNativeStatement(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public StatementOrTypedQuery createNativeQuery(String sqlString, String resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNativeQuery(String sqlString,
-                    ResultSetMapping<T> resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
-                    Class<?>... resultClasses) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
-                    String... resultSetMappings) {
-                return null;
-            }
-
-            @Override
-            public <T> T unwrap(Class<T> type) {
-                return null;
-            }
-
-            @Override
-            public void close() {
-
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public EntityTransaction getTransaction() {
-                return null;
-            }
-
-            @Override
-            public EntityManagerFactory getEntityManagerFactory() {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> getEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> getEntityGraph(Class<T> rootType, String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-                return List.of();
-            }
-
-            @Override
-            public <C> void runWithConnection(ConnectionConsumer<C> action) {
-
-            }
-
-            @Override
-            public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
-                return null;
-            }
-
-            @Override
-            public String toString() {
-                return "MockEntityAgent";
-            }
-        };
+        return ip -> mock(EntityAgent.class, "MockEntityAgent");
     }
 }